From 6373cc26952dd427a5687a41160318f17298c2f2 Mon Sep 17 00:00:00 2001
From: Jamie Little <jamie@jamielittle.org>
Date: Thu, 18 Oct 2018 08:57:57 -0500
Subject: [PATCH] Restore logo to header

Connected to UCLALibrary/ursus#15
Connected to UCLALibrary/amalgamated-samvera#132
---
 app/assets/stylesheets/ursus.scss         | 10 +++++-----
 app/assets/stylesheets/ursus/_footer.scss |  7 ++++---
 app/assets/stylesheets/ursus/_navbar.scss |  8 ++++++++
 app/views/_user_util_links.html.erb       |  4 ++++
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/ursus.scss b/app/assets/stylesheets/ursus.scss
index 34e4c455b..0b9e3d23b 100644
--- a/app/assets/stylesheets/ursus.scss
+++ b/app/assets/stylesheets/ursus.scss
@@ -1,9 +1,9 @@
-@import 'ursus/fonts';
-@import 'ursus/colors';
+@import 'ursus/body';
 @import 'ursus/buttons';
-@import 'ursus/navbar';
+@import 'ursus/colors';
 @import 'ursus/facets';
+@import 'ursus/facets';
+@import 'ursus/fonts';
 @import 'ursus/footer';
-@import 'ursus/body';
 @import 'ursus/logo';
-@import 'ursus/facets';
+@import 'ursus/navbar';
diff --git a/app/assets/stylesheets/ursus/_footer.scss b/app/assets/stylesheets/ursus/_footer.scss
index c6702579e..bbf04272c 100644
--- a/app/assets/stylesheets/ursus/_footer.scss
+++ b/app/assets/stylesheets/ursus/_footer.scss
@@ -1,3 +1,5 @@
+@import 'colors';
+
 .footer {
   background-color: $ucla-secondary-blue-dark;
   // height: 100px;
@@ -8,14 +10,13 @@
   }
 
   a:hover {
-    color: $ucla-gold;
+    color: $ucla-tertiary-yellow;
     text-decoration: none;
   }
 
   .footer-links {
     padding-top: 15px;
     text-align: center;
-    font-size: 12px;
   }
 
   hr {
@@ -37,4 +38,4 @@
 //   float: right;
 //   margin: 1em;
 //   margin-top: 2em;
-// }
\ No newline at end of file
+// }
diff --git a/app/assets/stylesheets/ursus/_navbar.scss b/app/assets/stylesheets/ursus/_navbar.scss
index 0defde2cc..6553ce32e 100644
--- a/app/assets/stylesheets/ursus/_navbar.scss
+++ b/app/assets/stylesheets/ursus/_navbar.scss
@@ -5,3 +5,11 @@
   margin-left: 0 !important;
   background: transparent image_url('logo.svg') no-repeat top left !important;
 }
+
+.nav-link:hover {
+  color: $ucla-tertiary-yellow !important;
+}
+
+.navbar-right {
+  margin-top:10px;
+}
diff --git a/app/views/_user_util_links.html.erb b/app/views/_user_util_links.html.erb
index e69de29bb..02ce3e9ee 100644
--- a/app/views/_user_util_links.html.erb
+++ b/app/views/_user_util_links.html.erb
@@ -0,0 +1,4 @@
+<ul class="navbar-nav navbar-right nav">
+  <li class="nav-item"><a class="nav-link" href="http://www.library.ucla.edu">UCLA Library</a></li>
+  <li class="nav-item"><a class="nav-link" href="http://digital2.library.ucla.edus">UCLA Library Digital Collections</a></li>
+</ul>