Skip to content

Commit

Permalink
Adds max width on header matching toolbar (#172)
Browse files Browse the repository at this point in the history
  • Loading branch information
cbothner authored Dec 11, 2017
1 parent 087ca14 commit 28ed958
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 15 deletions.
12 changes: 8 additions & 4 deletions app/assets/stylesheets/structure.sass
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,14 @@ main#EdgenoteGallery

header
background-color: $umichBlue
padding: 1em
display: flex
justify-content: space-between
align-items: center

.header__container
max-width: 1667px
margin: auto
padding: 1em
display: flex
justify-content: space-between
align-items: center

& > a:hover
background-color: inherit
Expand Down
24 changes: 13 additions & 11 deletions app/views/layouts/with_header.html.erb
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
<header>
<%= link_to root_path, id: "gala-logo" do %>
<%= inline_svg 'gala-logo.svg' %>
<% end %>
<div id="main-menu-app" class="pt-dark"></div>
<%= javascript_tag do %>
window.reader = <% if reader_signed_in? %>
<%= raw render partial: "readers/reader", formats: [:json], locals: {reader: current_reader}%>
<% else %>
undefined;
<div class="header__container">
<%= link_to root_path, id: "gala-logo" do %>
<%= inline_svg 'gala-logo.svg' %>
<% end %>
<% end %>
<%= javascript_pack_tag 'main-menu', async: true %>
<div id="main-menu-app" class="pt-dark"></div>
<%= javascript_tag do %>
window.reader = <% if reader_signed_in? %>
<%= raw render partial: "readers/reader", formats: [:json], locals: {reader: current_reader}%>
<% else %>
undefined;
<% end %>
<% end %>
<%= javascript_pack_tag 'main-menu', async: true %>
</div>
</header>

<% if flash[:notice] || flash[:alert] %>
Expand Down

0 comments on commit 28ed958

Please sign in to comment.