consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds main tag on layouts

Browse Source
This commit is contained in:
Alberto Garcia Cabeza
2016-03-14 12:28:32 +01:00
parent 3ec0971b37
commit e181206054
2 changed files with 45 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
app/views/layouts/admin.html.erb
View File

@@ -17,32 +17,33 @@
<%= render 'layouts/admin_header' %> <%= render 'layouts/admin_header' %>
<div class="row expanded"> <div class="row expanded">
<main>
<div class="small-12 medium-3 column">
<%= side_menu %>
</div>
<div class="small-12 medium-3 column"> <div class="admin-content small-12 medium-9 column">
<%= side_menu %> <% if notice %>
</div> <div data-alert class="callout success" data-closable>
<button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
<span aria-hidden="true">&times;</span>
</button>
<%= notice %>
</div>
<% end %>
<div class="admin-content small-12 medium-9 column"> <% if alert %>
<% if notice %> <div data-alert class="callout alert" data-closable>
<div data-alert class="callout success" data-closable> <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
<button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close> <span aria-hidden="true">&times;</span>
<span aria-hidden="true">&times;</span> </button>
</button> <%= alert %>
<%= notice %> </div>
</div> <% end %>
<% end %>
<% if alert %> <%= yield %>
<div data-alert class="callout alert" data-closable> </div>
<button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close> </main>
<span aria-hidden="true">&times;</span>
</button>
<%= alert %>
</div>
<% end %>
<%= yield %>
</div>
</div> </div>
</body> </body>
</html> </html>

40
app/views/layouts/devise.html.erb
View File

@@ -25,27 +25,29 @@
</div> </div>
<div class="row auth"> <div class="row auth">
<div class="small-12 medium-8 large-5 column small-centered panel padding margin-bottom"> <main>
<% if notice %> <div class="small-12 medium-8 large-5 column small-centered panel padding margin-bottom">
<div data-alert class="callout success" data-closable> <% if notice %>
<button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close> <div data-alert class="callout success" data-closable>
<span aria-hidden="true">&times;</span> <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
</button> <span aria-hidden="true">&times;</span>
<%= notice %> </button>
</div> <%= notice %>
<% end %> </div>
<% end %>
<% if alert %> <% if alert %>
<div data-alert class="callout warning" data-closable> <div data-alert class="callout warning" data-closable>
<button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close> <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
<%= alert %> <%= alert %>
</div> </div>
<% end %> <% end %>
<%= yield %> <%= yield %>
</div> </div>
</main>
</div> </div>
<div class="push"></div> <div class="push"></div>
</div> </div>