Merge pull request #727 from sul-dlss/update-fonts

adds dejavusans extralight font
sul-dlss · Aug 14, 2014 · 6162013 · 6162013
2 parents 25c581e + e1e298f
commit 6162013
Show file tree

Hide file tree

Showing 12 changed files with 2,451 additions and 1 deletion.
diff --git a/app/assets/fonts/DejaVuSans-ExtraLight-webfont.eot b/app/assets/fonts/DejaVuSans-ExtraLight-webfont.eot
diff --git a/app/assets/fonts/DejaVuSans-ExtraLight-webfont.svg b/app/assets/fonts/DejaVuSans-ExtraLight-webfont.svg
diff --git a/app/assets/fonts/DejaVuSans-ExtraLight-webfont.ttf b/app/assets/fonts/DejaVuSans-ExtraLight-webfont.ttf
diff --git a/app/assets/fonts/DejaVuSans-ExtraLight-webfont.woff b/app/assets/fonts/DejaVuSans-ExtraLight-webfont.woff
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
@@ -6,6 +6,7 @@
 */
 
 // SUL Style Variables/Mixins
+@import 'deja-vu-font';
 @import 'sul-variables';
 @import 'searchworks-mixins';
 

diff --git a/app/assets/stylesheets/base.css.scss b/app/assets/stylesheets/base.css.scss
@@ -7,7 +7,7 @@ a {
 }
 
 body {
-  font-family: 'Source Sans Pro', sans-serif;
+  font-family: 'Source Sans Pro', 'Arial Unicode MS', Helvetica, sans-serif;
 }
 
 a, a:hover, a:focus {
@@ -16,6 +16,7 @@ a, a:hover, a:focus {
 }
 
 h1 {
+  font-family: 'dejavu_sansextralight';
   color: $sul-h1-font-color;
   padding: 10px 0;
 }

diff --git a/app/assets/stylesheets/deja-vu-font.css.scss b/app/assets/stylesheets/deja-vu-font.css.scss
@@ -0,0 +1,10 @@
+@font-face {
+  font-family: 'dejavu_sansextralight';
+  src: url('DejaVuSans-ExtraLight-webfont.eot');
+  src: url('DejaVuSans-ExtraLight-webfont.eot?#iefix') format('embedded-opentype'),
+       url('DejaVuSans-ExtraLight-webfont.woff') format('woff'),
+       url('DejaVuSans-ExtraLight-webfont.ttf') format('truetype'),
+       url('DejaVuSans-ExtraLight-webfont.svg#dejavu_sansextralight') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
diff --git a/app/assets/stylesheets/modules/brief-view.css.scss b/app/assets/stylesheets/modules/brief-view.css.scss
@@ -2,6 +2,7 @@
   @include document;
 
   h3.index_title {
+    @include h3-index-title-font;
     @include h3-index-title-small-font;
     text-indent: -20px;
   }

diff --git a/app/assets/stylesheets/modules/gallery-view.css.scss b/app/assets/stylesheets/modules/gallery-view.css.scss
@@ -39,6 +39,7 @@
     height: $gallery-document-height;
 
     h3.index_title {
+      @include h3-index-title-font;
       @include h3-index-title-small-font;
       margin: .5em;
       text-align: center;

diff --git a/app/assets/stylesheets/modules/item-preview.css.scss b/app/assets/stylesheets/modules/item-preview.css.scss
@@ -90,3 +90,7 @@
   display: inline-block;
   margin-bottom: 20px;
 }
+
+h3.preview-title{
+  @include h3-index-title-font;
+}
diff --git a/app/assets/stylesheets/modules/results-documents.css.scss b/app/assets/stylesheets/modules/results-documents.css.scss
@@ -4,6 +4,7 @@
     @include document;
 
     h3.index_title {
+      @include h3-index-title-font;
       @include h3-index-title-indent;
     }
 

diff --git a/app/assets/stylesheets/searchworks-mixins.css.scss b/app/assets/stylesheets/searchworks-mixins.css.scss
@@ -21,6 +21,10 @@
   line-height: 1.5em;
 }
 
+@mixin h3-index-title-font {
+  font-family: 'dejavu_sansextralight';
+}
+
 @mixin panel-borders {
   border: 1px solid $sul-panel-border;
 }