mirror of
https://github.com/astuto/astuto.git
synced 2025-12-15 11:17:49 +01:00
Improve style, in particular forms
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
<% if notice %>
|
||||
<p class="notice alert alert-primary"><%= notice %></p>
|
||||
<p class="notice container alert alert-primary"><%= notice %></p>
|
||||
<% end %>
|
||||
|
||||
<% if alert %>
|
||||
<p class="alert alert-danger"><%= alert %></p>
|
||||
<p class="alert container alert-danger"><%= alert %></p>
|
||||
<% end %>
|
||||
@@ -1,27 +1,29 @@
|
||||
<nav class="navbar navbar-expand-lg navbar-light bg-light">
|
||||
<%= link_to "Astuto", "#", class: "navbar-brand" %>
|
||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
<nav class="navbar navbar-expand-lg navbar-light">
|
||||
<div class="container">
|
||||
<%= link_to "Astuto", "#", class: "navbar-brand" %>
|
||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
|
||||
<div class="collapse navbar-collapse" id="navbarSupportedContent">
|
||||
<ul class="navbar-nav ml-auto">
|
||||
<% if user_signed_in? %>
|
||||
<li class="nav-item dropdown">
|
||||
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||
<%= current_user.email %>
|
||||
</a>
|
||||
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
|
||||
<%= link_to "Profile", edit_user_registration_path, class: "dropdown-item" %>
|
||||
<div class="dropdown-divider"></div>
|
||||
<%= link_to "Sign out", destroy_user_session_path, method: :delete, class: "dropdown-item" %>
|
||||
</div>
|
||||
</li>
|
||||
<% else %>
|
||||
<li class="nav-item">
|
||||
<%= link_to "Sign in / Sign up", new_user_session_path, class: "nav-link" %>
|
||||
</li>
|
||||
<% end %>
|
||||
</ul>
|
||||
<div class="collapse navbar-collapse" id="navbarSupportedContent">
|
||||
<ul class="navbar-nav ml-auto">
|
||||
<% if user_signed_in? %>
|
||||
<li class="nav-item dropdown">
|
||||
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||
<%= current_user.full_name %>
|
||||
</a>
|
||||
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
|
||||
<%= link_to "Profile settings", edit_user_registration_path, class: "dropdown-item" %>
|
||||
<div class="dropdown-divider"></div>
|
||||
<%= link_to "Sign out", destroy_user_session_path, method: :delete, class: "dropdown-item" %>
|
||||
</div>
|
||||
</li>
|
||||
<% else %>
|
||||
<li class="nav-item">
|
||||
<%= link_to "Sign in / Sign up", new_user_session_path, class: "nav-link" %>
|
||||
</li>
|
||||
<% end %>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
@@ -12,7 +12,9 @@
|
||||
<body>
|
||||
<%= render "layouts/header" %>
|
||||
<%= render "layouts/alerts" %>
|
||||
|
||||
<%= yield %>
|
||||
|
||||
<div class="container">
|
||||
<%= yield %>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Reference in New Issue
Block a user