From 146473ba2e6ca885e631e57e58be7ff79d15ba5a Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Thu, 16 Aug 2018 09:42:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E6=94=B9=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/bundle.css | 32 ++++++++++++++---- dist/bundle.js | 6 ++-- dist/core.css | 30 +++++++++++++---- dist/core_without_normalize.css | 30 +++++++++++++---- dist/fineui.css | 32 ++++++++++++++---- dist/fineui.js | 6 ++-- dist/resource.css | 2 +- dist/widget.js | 6 ++-- public/css/app.css | 2 +- src/css/core/utils/common.css | 30 +++++++++++++---- src/css/resource/app.css | 2 +- src/less/core/utils/common.less | 37 +++++++++++++++++---- src/less/lib/colors.less | 2 ++ src/less/resource/app.less | 2 +- src/widget/dynamicdate/dynamicdate.combo.js | 2 +- src/widget/timeinterval/dateinterval.js | 2 +- src/widget/timeinterval/timeinterval.js | 2 +- ui/css/app.css | 2 +- 18 files changed, 172 insertions(+), 55 deletions(-) diff --git a/dist/bundle.css b/dist/bundle.css index 1a3cc96b77..c64540574b 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -360,23 +360,23 @@ textarea { } .bi-header-background { background-color: #F2F4F7; - color: #3d4d66; + color: #647185; } .bi-header-background .bi-input { - color: #3d4d66; + color: #647185; } .bi-header-background .bi-textarea { - color: #3d4d66; + color: #647185; } .bi-theme-dark .bi-header-background { background-color: #2F3149; - color: #d6e0dc; + color: #afb7c6; } .bi-theme-dark .bi-header-background .bi-input { - color: #d6e0dc; + color: #afb7c6; } .bi-theme-dark .bi-header-background .bi-textarea { - color: #d6e0dc; + color: #afb7c6; } .bi-card { background-color: #ffffff; @@ -437,6 +437,24 @@ textarea { .bi-theme-dark .bi-border { border: 1px solid #2F3149; } +.bi-font-helvetica-neue { + font-family: "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; +} +.bi-font-arial { + font-family: Arial, "Helvetica Neue", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; +} +.bi-font-PingFang { + font-family: "PingFang SC", "Helvetica Neue", Arial, "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; +} +.bi-font-hiragino-sans { + font-family: "Hiragino Sans GB", "Helvetica Neue", Arial, "PingFang SC", "Microsoft YaHei", Heiti, serif; +} +.bi-font-microsoft-yaHei { + font-family: "Microsoft YaHei", "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", Heiti, serif; +} +.bi-font-heiti { + font-family: Heiti, "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", serif; +} .bi-border-radius { -webkit-border-radius: 2px; -moz-border-radius: 2px; @@ -3793,7 +3811,7 @@ body { -o-user-select: none; user-select: none; color: #3d4d66; - font: normal 12px "Microsoft YaHei", "Hiragino Sans GB W3"; + font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; text-decoration: none; diff --git a/dist/bundle.js b/dist/bundle.js index 0d502764db..a0f07f2dae 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -61274,7 +61274,7 @@ BI.extend(BI.DynamicDateCard, { }, props: { - baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow", + baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow bi-border-radius", height: 22 }, @@ -77146,7 +77146,7 @@ BI.DateInterval = BI.inherit(BI.Single, { BI.createWidget({ element: self, type: "bi.center", - hgap: 15, + hgap: 10, height: this.constants.height, items: [{ type: "bi.absolute", @@ -77326,7 +77326,7 @@ BI.TimeInterval = BI.inherit(BI.Single, { BI.createWidget({ element: self, type: "bi.center", - hgap: 15, + hgap: 10, height: this.constants.height, items: [{ type: "bi.absolute", diff --git a/dist/core.css b/dist/core.css index a22b058d0f..36bec7e4be 100644 --- a/dist/core.css +++ b/dist/core.css @@ -360,23 +360,23 @@ textarea { } .bi-header-background { background-color: #F2F4F7; - color: #3d4d66; + color: #647185; } .bi-header-background .bi-input { - color: #3d4d66; + color: #647185; } .bi-header-background .bi-textarea { - color: #3d4d66; + color: #647185; } .bi-theme-dark .bi-header-background { background-color: #2F3149; - color: #d6e0dc; + color: #afb7c6; } .bi-theme-dark .bi-header-background .bi-input { - color: #d6e0dc; + color: #afb7c6; } .bi-theme-dark .bi-header-background .bi-textarea { - color: #d6e0dc; + color: #afb7c6; } .bi-card { background-color: #ffffff; @@ -437,6 +437,24 @@ textarea { .bi-theme-dark .bi-border { border: 1px solid #2F3149; } +.bi-font-helvetica-neue { + font-family: "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; +} +.bi-font-arial { + font-family: Arial, "Helvetica Neue", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; +} +.bi-font-PingFang { + font-family: "PingFang SC", "Helvetica Neue", Arial, "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; +} +.bi-font-hiragino-sans { + font-family: "Hiragino Sans GB", "Helvetica Neue", Arial, "PingFang SC", "Microsoft YaHei", Heiti, serif; +} +.bi-font-microsoft-yaHei { + font-family: "Microsoft YaHei", "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", Heiti, serif; +} +.bi-font-heiti { + font-family: Heiti, "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", serif; +} .bi-border-radius { -webkit-border-radius: 2px; -moz-border-radius: 2px; diff --git a/dist/core_without_normalize.css b/dist/core_without_normalize.css index ed576a51c5..7b94e8fa47 100644 --- a/dist/core_without_normalize.css +++ b/dist/core_without_normalize.css @@ -79,23 +79,23 @@ textarea { } .bi-header-background { background-color: #F2F4F7; - color: #3d4d66; + color: #647185; } .bi-header-background .bi-input { - color: #3d4d66; + color: #647185; } .bi-header-background .bi-textarea { - color: #3d4d66; + color: #647185; } .bi-theme-dark .bi-header-background { background-color: #2F3149; - color: #d6e0dc; + color: #afb7c6; } .bi-theme-dark .bi-header-background .bi-input { - color: #d6e0dc; + color: #afb7c6; } .bi-theme-dark .bi-header-background .bi-textarea { - color: #d6e0dc; + color: #afb7c6; } .bi-card { background-color: #ffffff; @@ -156,6 +156,24 @@ textarea { .bi-theme-dark .bi-border { border: 1px solid #2F3149; } +.bi-font-helvetica-neue { + font-family: "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; +} +.bi-font-arial { + font-family: Arial, "Helvetica Neue", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; +} +.bi-font-PingFang { + font-family: "PingFang SC", "Helvetica Neue", Arial, "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; +} +.bi-font-hiragino-sans { + font-family: "Hiragino Sans GB", "Helvetica Neue", Arial, "PingFang SC", "Microsoft YaHei", Heiti, serif; +} +.bi-font-microsoft-yaHei { + font-family: "Microsoft YaHei", "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", Heiti, serif; +} +.bi-font-heiti { + font-family: Heiti, "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", serif; +} .bi-border-radius { -webkit-border-radius: 2px; -moz-border-radius: 2px; diff --git a/dist/fineui.css b/dist/fineui.css index 72604f3d1f..b811d17cf4 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -360,23 +360,23 @@ textarea { } .bi-header-background { background-color: #F2F4F7; - color: #3d4d66; + color: #647185; } .bi-header-background .bi-input { - color: #3d4d66; + color: #647185; } .bi-header-background .bi-textarea { - color: #3d4d66; + color: #647185; } .bi-theme-dark .bi-header-background { background-color: #2F3149; - color: #d6e0dc; + color: #afb7c6; } .bi-theme-dark .bi-header-background .bi-input { - color: #d6e0dc; + color: #afb7c6; } .bi-theme-dark .bi-header-background .bi-textarea { - color: #d6e0dc; + color: #afb7c6; } .bi-card { background-color: #ffffff; @@ -437,6 +437,24 @@ textarea { .bi-theme-dark .bi-border { border: 1px solid #2F3149; } +.bi-font-helvetica-neue { + font-family: "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; +} +.bi-font-arial { + font-family: Arial, "Helvetica Neue", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; +} +.bi-font-PingFang { + font-family: "PingFang SC", "Helvetica Neue", Arial, "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; +} +.bi-font-hiragino-sans { + font-family: "Hiragino Sans GB", "Helvetica Neue", Arial, "PingFang SC", "Microsoft YaHei", Heiti, serif; +} +.bi-font-microsoft-yaHei { + font-family: "Microsoft YaHei", "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", Heiti, serif; +} +.bi-font-heiti { + font-family: Heiti, "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", serif; +} .bi-border-radius { -webkit-border-radius: 2px; -moz-border-radius: 2px; @@ -3793,7 +3811,7 @@ body { -o-user-select: none; user-select: none; color: #3d4d66; - font: normal 12px "Microsoft YaHei", "Hiragino Sans GB W3"; + font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; text-decoration: none; diff --git a/dist/fineui.js b/dist/fineui.js index f8d11b6b06..5fab5db61c 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -61495,7 +61495,7 @@ BI.extend(BI.DynamicDateCard, { }, props: { - baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow", + baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow bi-border-radius", height: 22 }, @@ -77367,7 +77367,7 @@ BI.DateInterval = BI.inherit(BI.Single, { BI.createWidget({ element: self, type: "bi.center", - hgap: 15, + hgap: 10, height: this.constants.height, items: [{ type: "bi.absolute", @@ -77547,7 +77547,7 @@ BI.TimeInterval = BI.inherit(BI.Single, { BI.createWidget({ element: self, type: "bi.center", - hgap: 15, + hgap: 10, height: this.constants.height, items: [{ type: "bi.absolute", diff --git a/dist/resource.css b/dist/resource.css index e47fa08c2b..943fdc2b78 100644 --- a/dist/resource.css +++ b/dist/resource.css @@ -18,7 +18,7 @@ body { -o-user-select: none; user-select: none; color: #3d4d66; - font: normal 12px "Microsoft YaHei", "Hiragino Sans GB W3"; + font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; text-decoration: none; diff --git a/dist/widget.js b/dist/widget.js index 6f00db0eaa..cdc7e4caae 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -2864,7 +2864,7 @@ BI.extend(BI.DynamicDateCard, { }, props: { - baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow", + baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow bi-border-radius", height: 22 }, @@ -18736,7 +18736,7 @@ BI.DateInterval = BI.inherit(BI.Single, { BI.createWidget({ element: self, type: "bi.center", - hgap: 15, + hgap: 10, height: this.constants.height, items: [{ type: "bi.absolute", @@ -18916,7 +18916,7 @@ BI.TimeInterval = BI.inherit(BI.Single, { BI.createWidget({ element: self, type: "bi.center", - hgap: 15, + hgap: 10, height: this.constants.height, items: [{ type: "bi.absolute", diff --git a/public/css/app.css b/public/css/app.css index 850a53a538..b11bcc6f72 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -18,7 +18,7 @@ body { -o-user-select: none; user-select: none; color: #3d4d66; - font: normal 12px "Microsoft YaHei", "Hiragino Sans GB W3"; + font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; text-decoration: none; diff --git a/src/css/core/utils/common.css b/src/css/core/utils/common.css index 04d18193e7..595d287026 100644 --- a/src/css/core/utils/common.css +++ b/src/css/core/utils/common.css @@ -79,23 +79,23 @@ textarea { } .bi-header-background { background-color: #F2F4F7; - color: #3d4d66; + color: #647185; } .bi-header-background .bi-input { - color: #3d4d66; + color: #647185; } .bi-header-background .bi-textarea { - color: #3d4d66; + color: #647185; } .bi-theme-dark .bi-header-background { background-color: #2F3149; - color: #d6e0dc; + color: #afb7c6; } .bi-theme-dark .bi-header-background .bi-input { - color: #d6e0dc; + color: #afb7c6; } .bi-theme-dark .bi-header-background .bi-textarea { - color: #d6e0dc; + color: #afb7c6; } .bi-card { background-color: #ffffff; @@ -156,6 +156,24 @@ textarea { .bi-theme-dark .bi-border { border: 1px solid #2F3149; } +.bi-font-helvetica-neue { + font-family: "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; +} +.bi-font-arial { + font-family: Arial, "Helvetica Neue", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; +} +.bi-font-PingFang { + font-family: "PingFang SC", "Helvetica Neue", Arial, "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; +} +.bi-font-hiragino-sans { + font-family: "Hiragino Sans GB", "Helvetica Neue", Arial, "PingFang SC", "Microsoft YaHei", Heiti, serif; +} +.bi-font-microsoft-yaHei { + font-family: "Microsoft YaHei", "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", Heiti, serif; +} +.bi-font-heiti { + font-family: Heiti, "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", serif; +} .bi-border-radius { -webkit-border-radius: 2px; -moz-border-radius: 2px; diff --git a/src/css/resource/app.css b/src/css/resource/app.css index 850a53a538..b11bcc6f72 100644 --- a/src/css/resource/app.css +++ b/src/css/resource/app.css @@ -18,7 +18,7 @@ body { -o-user-select: none; user-select: none; color: #3d4d66; - font: normal 12px "Microsoft YaHei", "Hiragino Sans GB W3"; + font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; text-decoration: none; diff --git a/src/less/core/utils/common.less b/src/less/core/utils/common.less index 4c85a98c1d..b8422aadc5 100644 --- a/src/less/core/utils/common.less +++ b/src/less/core/utils/common.less @@ -97,24 +97,24 @@ textarea { .bi-header-background { background-color: @color-bi-background-light-gray; - color: @color-bi-text-normal; + color: @color-bi-text-light-gray; & .bi-input { - color: @color-bi-text-normal; + color: @color-bi-text-light-gray; } & .bi-textarea { - color: @color-bi-text-normal; + color: @color-bi-text-light-gray; } } .bi-theme-dark { .bi-header-background { background-color: @color-bi-background-light-gray-theme-dark; - color: @color-bi-text-normal-theme-dark; + color: @color-bi-text-light-gray-theme-dark; & .bi-input { - color: @color-bi-text-normal-theme-dark; + color: @color-bi-text-light-gray-theme-dark; } & .bi-textarea { - color: @color-bi-text-normal-theme-dark; + color: @color-bi-text-light-gray-theme-dark; } } } @@ -199,6 +199,31 @@ textarea { } } +// 字体 +.bi-font-helvetica-neue { + font-family: "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; +} + +.bi-font-arial{ + font-family: Arial, "Helvetica Neue", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; +} + +.bi-font-PingFang { + font-family: "PingFang SC", "Helvetica Neue", Arial, "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; +} + +.bi-font-hiragino-sans { + font-family: "Hiragino Sans GB", "Helvetica Neue", Arial, "PingFang SC", "Microsoft YaHei", Heiti, serif; +} + +.bi-font-microsoft-yaHei { + font-family: "Microsoft YaHei", "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", Heiti, serif; +} + +.bi-font-heiti { + font-family: Heiti, "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", serif; +} + .bi-border-radius { .border-radius(2px); } diff --git a/src/less/lib/colors.less b/src/less/lib/colors.less index d4ee6fb0d5..974657615d 100644 --- a/src/less/lib/colors.less +++ b/src/less/lib/colors.less @@ -14,6 +14,8 @@ @color-bi-text-gray: @font-color-gray; //浅灰色字体 @color-bi-text-light-gray: @font-color-light-gray; +//深色浅灰色字体 +@color-bi-text-light-gray-theme-dark: @font-color-light-gray-theme-dark; //白色字体颜色 @color-bi-text: @font-color-white; //灰化字体颜色 diff --git a/src/less/resource/app.less b/src/less/resource/app.less index 154b17c86e..f0a8a09a04 100644 --- a/src/less/resource/app.less +++ b/src/less/resource/app.less @@ -16,7 +16,7 @@ body { background-repeat: repeat; .user-select-disable(); color: @color-bi-text-normal; - font: normal 12px "Microsoft YaHei", "Hiragino Sans GB W3"; + font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; text-decoration: none; diff --git a/src/widget/dynamicdate/dynamicdate.combo.js b/src/widget/dynamicdate/dynamicdate.combo.js index 044f2ac9ac..bca67a7d8c 100644 --- a/src/widget/dynamicdate/dynamicdate.combo.js +++ b/src/widget/dynamicdate/dynamicdate.combo.js @@ -9,7 +9,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, { }, props: { - baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow", + baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow bi-border-radius", height: 22 }, diff --git a/src/widget/timeinterval/dateinterval.js b/src/widget/timeinterval/dateinterval.js index 58503b162b..37d9a6e022 100644 --- a/src/widget/timeinterval/dateinterval.js +++ b/src/widget/timeinterval/dateinterval.js @@ -33,7 +33,7 @@ BI.DateInterval = BI.inherit(BI.Single, { BI.createWidget({ element: self, type: "bi.center", - hgap: 15, + hgap: 10, height: this.constants.height, items: [{ type: "bi.absolute", diff --git a/src/widget/timeinterval/timeinterval.js b/src/widget/timeinterval/timeinterval.js index 3e3ba8c2ae..024c319693 100644 --- a/src/widget/timeinterval/timeinterval.js +++ b/src/widget/timeinterval/timeinterval.js @@ -33,7 +33,7 @@ BI.TimeInterval = BI.inherit(BI.Single, { BI.createWidget({ element: self, type: "bi.center", - hgap: 15, + hgap: 10, height: this.constants.height, items: [{ type: "bi.absolute", diff --git a/ui/css/app.css b/ui/css/app.css index 850a53a538..b11bcc6f72 100644 --- a/ui/css/app.css +++ b/ui/css/app.css @@ -18,7 +18,7 @@ body { -o-user-select: none; user-select: none; color: #3d4d66; - font: normal 12px "Microsoft YaHei", "Hiragino Sans GB W3"; + font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; text-decoration: none;