Skip to content

Commit

Permalink
Merge pull request #2607 from tulibraries/qa
Browse files Browse the repository at this point in the history
Week of 12-05-2022
  • Loading branch information
cdoyle-temple authored Dec 6, 2022
2 parents 35a0e3d + 13f011f commit bb6feff
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
Binary file modified app/assets/images/information_white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions app/assets/stylesheets/partials/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
font-family: "Roboto";
img {
display: inline-block;
height: 42px;
height: 32px;
float: left;
margin-right: 10px;
}
.container-lg {
.container-xl {
background-color: #F8EBD5;
padding: 17px;
height: auto;
vertical-align: middle;
a {
text-decoration: underline;
p {
a {
text-decoration: underline;
}
}
}
}
Expand Down
6 changes: 4 additions & 2 deletions app/views/application/_header_navbar.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,18 @@
<% unless @alert.blank? %>
<div id="header" class="row mx-0 mb-3">
<div class="container-xl">
<div class="col d-table">
<div class="d-table-cell" style="vertical-align:middle;">
<div class="row h-100">
<div class="col-12 align-self-center">
<%= image_tag "information.png", class: "decorative", alt: "" %>
<p class="mb-0">
<% @alert.each do |alert| %>
<% unless alert.link.blank? %>
<%= alert.scroll_text %> <%= link_to t("manifold.default.application.header_navbar.scroll_text"), alert.link %>
<% else %>
<%= alert.scroll_text %>
<% end %>
<% end %>
</p>
</div>
</div>
</div>
Expand Down
1 change: 0 additions & 1 deletion app/views/events/_events.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
<%= Date.parse(params[:date]).strftime("%m-%d-%Y") %>
<% else %>
<%= t("manifold.events.index.no_event_types") %>
"<%= params[:type] %>"
<% end %>

</h3>
Expand Down
2 changes: 1 addition & 1 deletion config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ en:
none: "- none -"
featured_events: Featured Events
event_types: Event Types
no_event_types: No events for
no_event_types: No events found.
calendar: Calendar
upcoming_events: Upcoming Events
events: Events
Expand Down

0 comments on commit bb6feff

Please sign in to comment.