app/views/shared/_header_navbar.html.erb in arclight-0.2.0 vs app/views/shared/_header_navbar.html.erb in arclight-0.3.0
- old
+ new
@@ -19,47 +19,43 @@
<div class="col-md-8 masthead-center" >
<h1><%= t('arclight.masthead_heading') %></h1>
</div>
<div class="col-md-4 nav-links d-flex justify-content-end" >
- <span class="navbar-nav" aria-label="browse" role="navigation">
+ <ul class="navbar-nav" aria-label="browse" role="navigation">
<%= render 'shared/main_menu_links' %>
- </span>
+ </ul>
</div>
</div>
- </div>
- <div class='row justify-content-md-center'>
- <div class='col-md-6 col-sm-12'>
- <div class='navbar-search'>
- <%= render_search_bar %>
+
+ <div class='row justify-content-md-center'>
+ <div class='col-12'>
+ <div class='navbar-search'>
+ <%= render_search_bar %>
+ </div>
</div>
</div>
</div>
</div>
<% else %>
<div class='bg-faded al-masthead'>
<div class="container">
<div class="row align-items-center">
<div class="col-md-8" >
- <h1><%= t('arclight.masthead_heading') %></h1>
+ <span class="h1"><%= t('arclight.masthead_heading') %></span>
</div>
<div class="col-md-4 nav-links d-flex justify-content-end" >
- <span class="navbar-nav" aria-label="browse" role="navigation">
+ <ul class="navbar-nav" aria-label="browse" role="navigation">
<%= render 'shared/main_menu_links' %>
- </span>
+ </ul>
</div>
</div>
</div>
</div>
- <div class="navbar-search navbar navbar-expand-sm bg-faded">
+ <div class="navbar-search navbar">
<div class="<%= container_classes %>">
- <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">
- <%= render_search_bar %>
- </div>
+ <%= render_search_bar %>
</div>
</div>
<% end %>
</header>