summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-12-02 19:21:57 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-12-02 19:21:57 +0000
commit3ebb815a38ba86e4133557f77b94c292c8fc2e7e (patch)
treefe05d6501035db2e22de0ce7637ed5b6d2565ffa /app/assets/stylesheets
parent739e21118795786fc023f9ef90e8107e9d072a22 (diff)
parent9b10cc16cb7b623a91a444d83d987173bfeb2d8c (diff)
downloadgitlab-ce-3ebb815a38ba86e4133557f77b94c292c8fc2e7e.tar.gz
Merge branch 'system-font-test' into 'master'
Use system font Just for fun.... ### macOS Chrome (San Francisco): ![Screen_Shot_2016-11-17_at_4.01.29_PM](/uploads/bfbab440ea0136314a6a7cffcd44f3ff/Screen_Shot_2016-11-17_at_4.01.29_PM.png) ### macOS Safari (San Francisco): ![Screen_Shot_2016-11-18_at_8.28.22_AM](/uploads/3adc05d7adf84ca726cbaaf36cb0567d/Screen_Shot_2016-11-18_at_8.28.22_AM.png) #### Ubuntu Firefox (Ubuntu): ![Screen_Shot_2016-11-18_at_8.31.08_AM](/uploads/0f0d581d2d79d5db3dba9b2200499dc7/Screen_Shot_2016-11-18_at_8.31.08_AM.png) #### Windows 7 IE 11 (Segoe UI): ![Screen_Shot_2016-11-18_at_8.35.05_AM](/uploads/88efc2c554252de03fb84cc3c3e2856e/Screen_Shot_2016-11-18_at_8.35.05_AM.png) See merge request !7545
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/framework.scss1
-rw-r--r--app/assets/stylesheets/framework/fonts.scss45
-rw-r--r--app/assets/stylesheets/framework/variables.scss2
3 files changed, 1 insertions, 47 deletions
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss
index 7c7f991dd87..4aaff7d04f1 100644
--- a/app/assets/stylesheets/framework.scss
+++ b/app/assets/stylesheets/framework.scss
@@ -1,4 +1,3 @@
-@import "framework/fonts";
@import "framework/variables";
@import "framework/mixins";
@import 'framework/tw_bootstrap_variables';
diff --git a/app/assets/stylesheets/framework/fonts.scss b/app/assets/stylesheets/framework/fonts.scss
deleted file mode 100644
index 5f9685bc71a..00000000000
--- a/app/assets/stylesheets/framework/fonts.scss
+++ /dev/null
@@ -1,45 +0,0 @@
-// Disabling "SpaceAfterPropertyColon" linter because the linter doesn't like
-// the way the `src` property is formatted in this file.
-// scss-lint:disable SpaceAfterPropertyColon
-
-/* latin-ext */
-@font-face {
- font-family: 'Source Sans Pro';
- font-style: normal;
- font-weight: 300;
- src:
- local('Source Sans Pro Light'),
- local('SourceSansPro-Light'),
- font-url('SourceSansPro-Light.ttf.woff2') format('woff2'),
- font-url('SourceSansPro-Light.ttf.woff') format('woff');
-}
-@font-face {
- font-family: 'Source Sans Pro';
- font-style: normal;
- font-weight: 400;
- src:
- local('Source Sans Pro'),
- local('SourceSansPro-Regular'),
- font-url('SourceSansPro-Regular.ttf.woff2') format('woff2'),
- font-url('SourceSansPro-Regular.ttf.woff') format('woff');
-}
-@font-face {
- font-family: 'Source Sans Pro';
- font-style: normal;
- font-weight: 600;
- src:
- local('Source Sans Pro Semibold'),
- local('SourceSansPro-Semibold'),
- font-url('SourceSansPro-Semibold.ttf.woff2') format('woff2'),
- font-url('SourceSansPro-Semibold.ttf.woff') format('woff');
-}
-@font-face {
- font-family: 'Source Sans Pro';
- font-style: normal;
- font-weight: 700;
- src:
- local('Source Sans Pro Bold'),
- local('SourceSansPro-Bold'),
- font-url('SourceSansPro-Bold.ttf.woff2') format('woff2'),
- font-url('SourceSansPro-Bold.ttf.woff') format('woff');
-}
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index cca5cf5b6b4..edfb2c33f4a 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -266,7 +266,7 @@ $diff-view-modes-border: #c1c1c1;
* Fonts
*/
$monospace_font: 'Menlo', 'Liberation Mono', 'Consolas', 'DejaVu Sans Mono', 'Ubuntu Mono', 'Courier New', 'andale mono', 'lucida console', monospace;
-$regular_font: 'Source Sans Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
+$regular_font: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
/*
* Dropdowns