summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-10-22 13:52:09 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-10-22 13:52:09 +0000
commitd0296fc9151024ef7cc43ca6906b46cb9cd9c7f9 (patch)
tree98c8065180df1a6be8421c0c7914e92e913ca8bf /app
parent5e2a1c14eb03431c2019753603746a4e778f2e73 (diff)
parentca840e8769fa75f786bf01e1ac839a81bd8ac32b (diff)
downloadgitlab-ce-d0296fc9151024ef7cc43ca6906b46cb9cd9c7f9.tar.gz
Merge branch 'master' into 'master'
fonts: Added "DejaVu Sans Mono" and "Ubuntu Mono" Everything is better than "Courier New" ... See merge request !210
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/main/fonts.scss2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/main/fonts.scss b/app/assets/stylesheets/main/fonts.scss
index d90274a0db9..f945aaca848 100644
--- a/app/assets/stylesheets/main/fonts.scss
+++ b/app/assets/stylesheets/main/fonts.scss
@@ -1,3 +1,3 @@
/** Typo **/
-$monospace_font: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono', 'lucida console', monospace;
+$monospace_font: 'Menlo', 'Liberation Mono', 'Consolas', 'DejaVu Sans Mono', 'Ubuntu Mono', 'Courier New', 'andale mono', 'lucida console', monospace;
$regular_font: "Helvetica Neue", Helvetica, Arial, sans-serif;