summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-04 23:06:26 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-04 23:06:26 +0000
commit3a533d48c634b0affd285832bd8dbc24435e19bc (patch)
treec400cbc3a436f818a239be918927f5e39e693be4
parentc2c1630905c3aed1cf033c782386844617878c07 (diff)
parentc33d078f53244c5b2d4d6cd49f62befed8e2471a (diff)
downloadgitlab-ce-3a533d48c634b0affd285832bd8dbc24435e19bc.tar.gz
Merge branch 'font-variable' into 'master'
Removes the hard-coded font in the diff notes Removes the hard-coded font in the diff notes and switches to using the $regular_font variable. See merge request !259
-rw-r--r--app/assets/stylesheets/sections/notes.scss2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss
index a124d235783..5494845eb8c 100644
--- a/app/assets/stylesheets/sections/notes.scss
+++ b/app/assets/stylesheets/sections/notes.scss
@@ -81,7 +81,7 @@ ul.notes {
.diff-file .notes_holder {
font-size: 13px;
line-height: 18px;
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-family: $regular_font;
td {
border: 1px solid #ddd;