bumi/tinyforms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into forms-index-page

Browse Source
This commit is contained in:
Arsene Karema
2020-04-09 19:46:55 +02:00
parent beabccbb79 5514372170
commit 5eff2042b3
31 changed files with 364 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
app/views/layouts/application.html.erb
View File

@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html>
<<<<<<< HEAD
<head>
<title>Tinyform</title>
<%= csrf_meta_tags %>
@@ -15,3 +16,64 @@
<script src="https://kit.fontawesome.com/221ac0e2fd.js" crossorigin="anonymous"></script>
</body>
</html>
=======
<head>
<title>Tinyform</title>
<%= csrf_meta_tags %>
<%= csp_meta_tag %>
<meta name="viewport" content="width=device-width, initial-scale=1">
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
</head>
<body>
<!-- Wrapper -->
<div id="wrapper" class="has-text-centered-mobile">
<!-- Hero -->
<section class="hero is-medium">
<div class="hero-head">
<div class="container">
<nav class="navbar" role="navigation" aria-label="main navigation">
<div class="navbar-brand">
<a class="navbar-item is-size-4 has-text-black has-text-weight-bold is-font-logo" href="/">
TinyForms
</a>
<a role="button" class="navbar-burger burger" aria-label="menu" aria-expanded="false"
data-target="navbar">
<span aria-hidden="true"></span>
<span aria-hidden="true"></span>
<span aria-hidden="true"></span>
</a>
</div>
<div id="navbar" class="navbar-menu">
<div class="navbar-end">
<div class="navbar-item">
<div class="buttons">
<% if !logged_in? -%>
<%= link_to "Login", login_url, { :class => "button is-primary"} %>
<% else -%>
<%= link_to "Logout", logout_url, { :class => "button is-light"} %>
<% end -%>
</div>
</div>
</div>
</div>
</nav>
</div>
</section>
<main>
<%= yield %>
</main>
</div>
<script src="https://kit.fontawesome.com/221ac0e2fd.js" crossorigin="anonymous"></script>
</body>
</html>
>>>>>>> master