diff options
| author | Jason Robinson <mail@jasonrobinson.me> | 2014-04-22 11:06:00 +0400 |
|---|---|---|
| committer | Jason Robinson <mail@jasonrobinson.me> | 2014-04-22 11:06:00 +0400 |
| commit | 15537e17c55a092ba4859557029a6282ca1af79d (patch) | |
| tree | a0772a061f119a81c1f0518bb01af3c36ae1436b | |
| parent | 4bf96ddcd4fe6c59f8bf61ff79d159e76f4088c4 (diff) | |
| parent | b1f59a9b534d2d4c3216034588997e4e1d06bd6b (diff) | |
Merge pull request #4922 from Flaburgan/from-roboto-to-helvetica
Switch back from Roboto to Helvetica on bootstrap pages
| -rw-r--r-- | app/assets/stylesheets/new_styles/_base.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/new_styles/_typography.scss | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/stylesheets/new_styles/_base.scss b/app/assets/stylesheets/new_styles/_base.scss index 279f521d0..cdf719030 100644 --- a/app/assets/stylesheets/new_styles/_base.scss +++ b/app/assets/stylesheets/new_styles/_base.scss @@ -40,7 +40,6 @@ a { color : $link-blue } } .author-name { - font-family : Roboto; color: inherit; } diff --git a/app/assets/stylesheets/new_styles/_typography.scss b/app/assets/stylesheets/new_styles/_typography.scss index af01b9bb4..7b91f548b 100644 --- a/app/assets/stylesheets/new_styles/_typography.scss +++ b/app/assets/stylesheets/new_styles/_typography.scss @@ -18,10 +18,10 @@ } body, p, h1, h2, h3, h4, h5, h6, textarea, input, * { - font-family : Roboto, Helvetica, sans-serif; + font-family : "Helvetica Neue", Helvetica, sans-serif; font-weight : normal; } a { font-family : inherit; -}
\ No newline at end of file +} |