summaryrefslogtreecommitdiff
path: root/web-ui/app/scss
diff options
context:
space:
mode:
authorChristoph Kluenter <ckluente@thoughtworks.com>2016-04-06 09:21:27 +0200
committerChristoph Kluenter <ckluente@thoughtworks.com>2016-04-06 09:21:27 +0200
commit151e9578c75507b227af35dcdd2256c068caaea1 (patch)
treead329e8b6f949cb426d3a118a62c69089bdeb99d /web-ui/app/scss
parent07d7476ac6b7a5ddcb0a8ab79e18caf2c8f7b35b (diff)
Revert "Remove special chars to validate pipeline failing"
This reverts commit 07d7476ac6b7a5ddcb0a8ab79e18caf2c8f7b35b.
Diffstat (limited to 'web-ui/app/scss')
-rw-r--r--web-ui/app/scss/sandbox.scss2
-rw-r--r--web-ui/app/scss/vendor/_foundation.scss4
2 files changed, 3 insertions, 3 deletions
diff --git a/web-ui/app/scss/sandbox.scss b/web-ui/app/scss/sandbox.scss
index 13fa6411..3c1be358 100644
--- a/web-ui/app/scss/sandbox.scss
+++ b/web-ui/app/scss/sandbox.scss
@@ -8,7 +8,7 @@ $search-highlight: #FFEF29;
}
body {
- font-family: "Open Sans", "Microsoft YaHei", "Hiragino Sans GB", "Hiragino Sans GB W3", "Helvetica Neue", Arial, sans-serif;
+ font-family: "Open Sans", "Microsoft YaHei", "Hiragino Sans GB", "Hiragino Sans GB W3", "微软雅黑", "Helvetica Neue", Arial, sans-serif;
font-size: 13px;
line-height: 1.2em;
background: white;
diff --git a/web-ui/app/scss/vendor/_foundation.scss b/web-ui/app/scss/vendor/_foundation.scss
index 45259dd1..7918cf26 100644
--- a/web-ui/app/scss/vendor/_foundation.scss
+++ b/web-ui/app/scss/vendor/_foundation.scss
@@ -49,7 +49,7 @@ html {
}
body {
- font-family: "Open Sans", "Microsoft YaHei", "Hiragino Sans GB", "Hiragino Sans GB W3", "Helvetica Neue", Arial, sans-serif;
+ font-family: "Open Sans", "Microsoft YaHei", "Hiragino Sans GB", "Hiragino Sans GB W3", "微软雅黑", "Helvetica Neue", Arial, sans-serif;
font-size: 13px;
line-height: 1.2em;
background: white;
@@ -1833,7 +1833,7 @@ button, .button, input[type=button] {
background-color: #2285a2;
outline: none;
color: white;
- }
+ }
&.large {
padding-top: 1.125rem;
padding-right: 2.25rem;