Merge pull request #37 from UCLALibrary/css/restore-svg-logo

Restore logo to header
UCLALibrary · Oct 18, 2018 · fa9af87 · fa9af87
2 parents 6a6c4ca + 6373cc2
commit fa9af87
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git 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
@@ -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;
-// }
+// }
diff --git 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
@@ -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>