From 151e9578c75507b227af35dcdd2256c068caaea1 Mon Sep 17 00:00:00 2001 From: Christoph Kluenter Date: Wed, 6 Apr 2016 09:21:27 +0200 Subject: Revert "Remove special chars to validate pipeline failing" This reverts commit 07d7476ac6b7a5ddcb0a8ab79e18caf2c8f7b35b. --- web-ui/app/scss/sandbox.scss | 2 +- web-ui/app/scss/vendor/_foundation.scss | 4 ++-- 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; -- cgit v1.2.3