Skip to content

Commit

Permalink
Fluid for all other displays, xxl for document view
Browse files Browse the repository at this point in the history
  • Loading branch information
brittnylapierre committed Nov 6, 2023
1 parent 7fb885c commit 706d597
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion app/components/blacklight/search_navbar_component.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<%= tag.div class: 'navbar-search navbar navbar-light bg-light', role: 'navigation', aria: { label: t('blacklight.search.header') } do %>
<div class="<%= container_classes %>-xxl">
<div class="<%= container_classes %>-fluid">
<%= search_bar %>
</div>
<% end %>
2 changes: 1 addition & 1 deletion app/components/blacklight/top_navbar_component.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<nav class="navbar navbar-expand-md topbar" role="navigation">
<div class="<%= container_classes %>-xxl">
<div class="<%= container_classes %>-fluid">
<%= logo_link %>
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-bs-toggle="collapse" data-target="#user-util-collapse" data-bs-target="#user-util-collapse" aria-controls="user-util-collapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/blacklight/base.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</nav>
<%= render partial: 'shared/header_navbar' %>

<main id="main-container" class="<%= container_classes %>-xxl" role="main" aria-label="<%= t('blacklight.main.aria.main_container') %>">
<main id="main-container" class="<%= container_classes %>-fluid" role="main" aria-label="<%= t('blacklight.main.aria.main_container') %>">
<%= content_for(:container_header) %>

<%= render partial: 'shared/flash_msg', layout: 'shared/flash_messages' %>
Expand Down
8 changes: 5 additions & 3 deletions app/views/layouts/catalog_result.html.erb
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@

<% content_for(:content) do %>
<section>
<%= content_for(:sidebar) %>
<%= yield %>
<div class="container-xxl">
<%= content_for(:sidebar) %>
<%= yield %>
</div>
</section>
<% end %>

<%= render template: "layouts/blacklight/base" %>

0 comments on commit 706d597

Please sign in to comment.