Bring in bold fonts, fix links in brand header, fix hover color in br…

…anding header
emory-libraries · Feb 29, 2020 · ce3a706 · ce3a706
1 parent d231afe
commit ce3a706
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/app/assets/stylesheets/lux.scss b/app/assets/stylesheets/lux.scss
@@ -1,4 +1,4 @@
-@import url(https://fonts.googleapis.com/css?family=Cardo|Open+Sans&display=swap);
+@import url(https://fonts.googleapis.com/css?family=Cardo:400,700|Open+Sans:400,700&display=swap);
 @import 'lux/cards';
 @import 'lux/colors';
 @import 'lux/navbar';

diff --git a/app/assets/stylesheets/lux/_navbar.scss b/app/assets/stylesheets/lux/_navbar.scss
@@ -7,14 +7,21 @@
   color: $dark-blue;
   font-size: $font-size-sm;
   font-family: $font-family-serif;
+  &:hover { color: $mid-blue;
+            text-decoration: none;
+  }
 }
 
 .branding-header-division {
+  text-decoration: none;
   text-align: left;
   font-size: $h4-font-size;
   color: $dark-blue;
   font-family: $font-family-sans-serif;
   font-weight: $font-weight-bold;
+  &:hover { color: $mid-blue;
+            text-decoration: none;
+  }
 }
 
 // Navbar nav

diff --git a/app/assets/stylesheets/lux/_variables.scss b/app/assets/stylesheets/lux/_variables.scss
@@ -28,6 +28,7 @@ $font-weight-normal:          400 !default;
 $font-weight-bold:            700 !default;
 $font-weight-bolder:          bolder !default;
 
+$branding-hover-color:              $mid-blue;
 
 $navbar-light-color:                $mid-blue;
 $navbar-light-hover-color:          $bright-blue;

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -13,7 +13,7 @@
 
     <title>Lux</title>
     <!-- Fonts for Emory styling -->
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Cardo|Open+Sans&display=swap" type='text/css' >
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Cardo:400,700|Open+Sans:400,700&display=swap" type='text/css' >
 
     <%= csrf_meta_tags %>
     <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>

diff --git a/app/views/shared/_big_nav.html.erb b/app/views/shared/_big_nav.html.erb
@@ -1,13 +1,13 @@
 <div class="big-nav collapse navbar-collapse">
   <div class="navbar-brand">
-    <%= link_to root_path do %>
+    <%= link_to "https://libraries.emory.edu/" do %>
       <%= image_tag("shield.svg", :alt => "Emory Digital Collections") %>
     <% end %>
   </div>
   <div class="col-md-4">
     <div class="row">
       <div class="branding-header-organization">
-        <%= link_to "Emory University", "http://emory.edu", class: "branding-header-organization" %>
+        <%= link_to "Emory University", "https://libraries.emory.edu/", class: "branding-header-organization" %>
       </div>
     </div>
     <div class="row">