Avalon 7.4.0 styling

app/assets/stylesheets/application.scss

@@ -60,3 +60,4 @@
 @import 'avalon';
 
 @import "datatables";
+@import "tamu";

app/assets/stylesheets/avalon/_homepage.scss

@@ -112,7 +112,7 @@ main.homepage-main {
 
 #footer.homepage-footer {
   color: white;
-  background: $blueGreen;
+  background: $primary;
 
   a {
     color: white;

app/assets/stylesheets/avalon/_nav.scss

@@ -33,7 +33,7 @@ $state-info-border:              darken(adjust-hue($state-info-bg, -10), 7%) !de
   .navbar-brand {
     @extend .desktop-hidden;
     background-size: contain;
-    background-color: white;
+    background-color: $primary;
     background-position: 20%;
     margin-top: 0;
   }

app/assets/stylesheets/branding.scss

@@ -30,7 +30,8 @@ $sansFontFamily: Arial, Helvetica, sans-serif;
 $museoSlab: 'MuseoSlab';
 
 // Primary colors
-$primary: #2a5459;
+// $primary: #2a5459;
+$primary: #500000;
 $secondary: #80a590;
 $dark: #0a2326;
 

app/assets/stylesheets/tamu.scss

@@ -0,0 +1,87 @@
+#header-navbar {
+  @media screen and (min-width: 768px) {
+    border-top: 1px solid gray;
+  }
+}
+
+#header-navbar .navbar-brand {
+  background: transparent "tamu-logo-with-bar.png" no-repeat top left;
+  margin-top: 10px;
+  margin-bottom: -10px;
+}
+
+#header-navbar .navbar-toggle, #header-navbar .facets-toggle {
+  background: $yellow;
+}
+
+.container > .navbar-header, .container > .navbar-collapse, .container > #facet-panel-collapse, .container > div[id*='facet-panel-'], .container-fluid > .navbar-header, .container-fluid > .navbar-collapse, .container-fluid > #facet-panel-collapse, .container-fluid > div[id*='facet-panel-'] {
+  background-color: $primary;
+}
+
+.header-logo .desktop-hidden {
+  color: white;
+  margin-left: 10px;
+}
+
+.custom-header {
+  background-color: #3c0000;
+}
+
+.navbar-default {
+  background: $primary;
+}
+
+.navbar-right {
+  background: #3c0000;
+}
+
+.navbar-title {
+  background: #3c0000;
+  color: $white;
+}
+
+.header-wrapper .header-logo > a:hover {
+  text-decoration: none;
+}
+
+#footer.homepage-footer {
+  background: #3c0000;
+  padding: 0px 0px 0px 0px;
+}
+
+.navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
+  color: $primary;
+  background-color: $yellow;
+}
+
+.navbar-default .navbar-nav > li > a {
+  color: $white;
+  display: block;
+  padding: 15px 10px 15px 10px;
+}	
+
+.navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
+  color: $primary;
+  background-color: $yellow;
+  text-decoration: none;
+}
+
+.navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus {
+  color: #333333;
+}
+
+.btn-primary {
+  color: $white;
+  background-color: $primary;
+  border-color: $primary;
+}
+
+.btn-primary:hover {
+  color: $white;
+  background-color: #3c0000;
+  border-color: #3c0000;
+}
+
+.homepage-splash-search {
+  margin-top: 7px;
+}

app/views/layouts/avalon.html.erb

@@ -22,22 +22,22 @@ Unless required by applicable law or agreed to in writing, software distributed
   <title><%= render_page_title %></title>
 
   <meta property="og:title" content="<%= render_page_title %>" />
-  <meta property="og:type" content=<%= @page_type || "website" %> />
-  <meta property="og:url" content=<%= request.url %> />
-  <meta property="og:image" content=<%= @poster_url || request.base_url + image_path("AvalonMediaSystem_Logo_Large.png") %> />
-
+  <meta property="og:type" content="<%= @page_type || 'website' %>" />
+  <meta property="og:url" content="<%= request.url %>" />
+  <meta property="og:image" content="<%= @poster_url || request.base_url + image_path('tamu/tamu-logo-with-bar.png') %>" />
+  
   <%= csrf_meta_tags %>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <%= favicon_link_tag %>
-  <%= stylesheet_link_tag "application", media: "all" %>
+  <%= stylesheet_link_tag "application", media: "all", 'data-turbolinks-track': 'reload' %>
   <%= stylesheet_pack_tag 'application' %>
   <%= javascript_pack_tag 'application' %>
   <%= yield :page_styles %>
   <%= yield :additional_head_content %>
   <%= render "modules/google_analytics" %>
 </head>
 
-<body data-mountpoint="<%=main_app.root_path%>">
+<body data-mountpoint="<%= main_app.root_path %>">
 
   <% if Settings.google_analytics_tracking_id.present? %>
   <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=<%= Settings.google_analytics_tracking_id %>" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
@@ -51,7 +51,7 @@ Unless required by applicable law or agreed to in writing, software distributed
       <%= render partial: 'modules/become_message' %>
       <% end %>
       <%= render 'modules/header' %>
-      <%= render :partial => 'modules/global_navigation' %>
+      <%= render partial: 'modules/global_navigation' %>
       <main role="main" class="<%= "homepage-main" if current_page?(main_app.root_path) %>">
 
         <!-- Homepage -->

app/views/modules/_global_navigation.html.erb

@@ -13,12 +13,12 @@ Unless required by applicable law or agreed to in writing, software distributed
   specific language governing permissions and limitations under the License.
 ---  END LICENSE_HEADER BLOCK  ---
 %>
-<div id="header-navbar" class="navbar navbar-expand-md navbar-light bg-primary mb-3" role="navigation">
+<div id="header-navbar" class="navbar navbar-expand-md navbar-light bg-primary mb-2" role="navigation">
   <div class="container-md">
     <div class="navbar-header">
       <div class="row">
         <div class="col">
-          <%= link_to application_name, main_app.root_path, class: "navbar-brand navbar-logo desktop-hidden" %>
+          <%= link_to application_name, main_app.root_path, class: "navbar-brand header-logo desktop-hidden" %>
         </div>
         <div class="col">
           <button type="button" class="navbar-toggler navbar-toggler-right float-right" data-toggle="collapse" data-target="#user-util-collapse" aria-expanded="false" aria-label="Toggle navigation">

app/views/modules/_header.html.erb

@@ -14,13 +14,25 @@ Unless required by applicable law or agreed to in writing, software distributed
 ---  END LICENSE_HEADER BLOCK  ---
 %>
 <div class="custom-header">
-  <div class="container-md">
+  <div class="container">
     <header class="header-wrapper">
       <div class="header-logo">
         <%= link_to main_app.root_path do %>
-        <%= image_tag "Home.png", class: "img-fluid", alt: "Avalon Media System - #{t(:release_label)} #{Avalon::VERSION}" %>
+        <%= image_tag "tamu/tamu-logo-with-bar.png", class: "img-responvies", alt: "Texas A&amp;M University Libraries Logo" %>
+		      <span class="navbar-title">Texas A&amp;M University Libraries - Audio & Video Repository</span> 
         <% end %>
       </div>
+
+	  <div>
+		<div class="navbar-default navbar-right">
+			<ul class="nav navbar-nav">
+				<li>
+					<a href="http://askus.library.tamu.edu">Help</a>
+				</li>
+			</ul>
+		</div>
+	  </div>
+
     </header>
   </div>
 </div>

app/views/modules/_user_management.html.erb

@@ -21,5 +21,5 @@ Unless required by applicable law or agreed to in writing, software distributed
 	<% end %>
  | <%= link_to t('auth.sign_out'), main_app.destroy_user_session_path %>
 <% else %>
-	<%= link_to t('auth.sign_in'), main_app.new_user_session_path, :class => "btn btn-info" %>
+	<%= link_to t('auth.sign_in'), main_app.new_user_session_path, :class => "tamu-btn tamu-btn-info" %>
 <% end %>