diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-06-19 04:01:52 -0700 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-06-19 04:01:52 -0700 |
commit | 25f1a7ec8ab793438c49c933b96cf80ea1d89e51 (patch) | |
tree | d867d44255f4d6c8c92bf62ec18cbb88b00f2ced | |
parent | acdbc1b4c50c854be0be8977940aecfd0c354704 (diff) | |
parent | 19a9cd7f9d23e50609a719724143c34daa517723 (diff) | |
download | gitlab-ce-25f1a7ec8ab793438c49c933b96cf80ea1d89e51.tar.gz |
Merge pull request #940 from anoldguy/master
Update Fonts to include good Windows Default monospaced font, too.
-rw-r--r-- | app/assets/stylesheets/highlight/white.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/sections/commits.scss | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/highlight/white.scss b/app/assets/stylesheets/highlight/white.scss index e00da2d84b4..a08f05bdb54 100644 --- a/app/assets/stylesheets/highlight/white.scss +++ b/app/assets/stylesheets/highlight/white.scss @@ -51,7 +51,7 @@ td.code .highlight { table.highlighttable pre{ padding:0; margin:0; - font-family: 'Menlo', 'Liberation Mono', 'Courier New', 'andale mono','lucida console',monospace; + font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace; color: #333; text-align:left; } @@ -61,7 +61,7 @@ table.highlighttable pre{ padding:15px; line-height:2.0; margin:0; - font-family: 'Menlo', 'Courier New', 'andale mono','lucida console',monospace; + font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace; color: #333; text-align:left;} } diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/sections/commits.scss index a60540dbace..078709e2afc 100644 --- a/app/assets/stylesheets/sections/commits.scss +++ b/app/assets/stylesheets/sections/commits.scss @@ -81,7 +81,7 @@ background:#fff; color:#333; font-size: 12px; - font-family: 'Menlo', 'Liberation Mono', 'Courier New', 'andale mono','lucida console',monospace; + font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace; } .diff_file_content_image { background:#eee; |