Skip to content

Commit

Permalink
Tidy up font-family variables. This closes issue #17
Browse files Browse the repository at this point in the history
  • Loading branch information
jenbennings committed Apr 26, 2014
1 parent 0c407c6 commit 5c8e860
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
12 changes: 6 additions & 6 deletions app/assets/stylesheets/sass/_global/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


// Base style globally applied to elements on this project
// ------------------------------------------------------------------------------------
// ------------------------------------------------------------------------------------



Expand Down Expand Up @@ -49,12 +49,12 @@ em,i,cite,q,address,dfn,var {
abbr[title],dfn[title] {
cursor:help;
border-bottom-width: 1px;
border-bottom-style: dotted;
border-bottom-style: dotted;
}

ins {
border-bottom-width: 1px;
border-bottom-style: solid;
border-bottom-style: solid;
}

a,u,ins {
Expand All @@ -75,13 +75,13 @@ del,s {

html {
width: 100%;
height: 100%;
height: 100%;

font-size: $base_font_size;
line-height: $base_line_height;

font-family: $sans;
font-weight: $roman;
font-family: $whitney;
font-weight: $light;
font-style: normal;

-webkit-text-size-adjust: 100%;
Expand Down
5 changes: 1 addition & 4 deletions app/assets/stylesheets/sass/_global/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,8 @@

// font family - update these when external fonts are setup

$sans: sans-serif;
$serif: serif;

$whitney: 'Whitney';
$avenir 'AvenirLTPro';
$avenir: 'AvenirLTPro';


// font weights should be descriptive
Expand Down

0 comments on commit 5c8e860

Please sign in to comment.