From 1909d7e1465db40225ad323e26daa86a830b2718 Mon Sep 17 00:00:00 2001 From: plough Date: Fri, 26 Apr 2019 15:41:10 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-16458=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E4=B8=AD=E6=9B=B4=E6=96=B0=E6=97=A5=E5=BF=97=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8=3D>?= =?UTF-8?q?=E6=96=87=E5=AD=97=E4=B8=8D=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/ui/update/push/pushUpdate.css | 14 ++++++++------ .../com/fr/design/ui/update/push/pushUpdate.js | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/designer-base/src/main/resources/com/fr/design/ui/update/push/pushUpdate.css b/designer-base/src/main/resources/com/fr/design/ui/update/push/pushUpdate.css index add1d3a3a..521c8cdbb 100644 --- a/designer-base/src/main/resources/com/fr/design/ui/update/push/pushUpdate.css +++ b/designer-base/src/main/resources/com/fr/design/ui/update/push/pushUpdate.css @@ -4,6 +4,8 @@ body { color: white; background-size: 100% 100% !important; -moz-background-size: 100% 100% !important; + + font-family: PingFangSC-Regular, Georgia, "Nimbus Roman No9 L", "Songti SC", "Noto Serif CJK SC", "Source Han Serif SC", "Source Han Serif CN", STSong, "AR PL New Sung", "AR PL SungtiL GB", NSimSun, SimSun, "TW\-Sung", "WenQuanYi Bitmap Song", "AR PL UMing CN", "AR PL UMing HK", "AR PL UMing TW", "AR PL UMing TW MBE", PMingLiU, MingLiU, serif !important; } .close-btn { @@ -24,15 +26,17 @@ body { color: white !important; } +.font-bold { + font-weight: bold; +} + .title { - font-family: PingFangSC-Semibold; font-size: 24px; letter-spacing: 1.5px; line-height: 24px; } .version { - font-family: PingFangSC-Semibold; font-size: 12px; line-height: 14px; margin-top: 6px; @@ -40,9 +44,8 @@ body { .desc { margin-top: 40px; - font-family: PingFangSC-Regular; font-size: 13px; - width: 540px; + width: 82%; margin-left: 19px; text-indent: -19px; overflow: visible !important; @@ -54,7 +57,6 @@ body { .moreInfo { margin-top: 20px; - font-family: PingFangSC-Regular; font-size: 13px; text-decoration: underline; } @@ -65,7 +67,7 @@ body { } .buttonGroup .bi-button { - font-family: PingFangSC-Medium; + font-weight: 600; font-size: 11px; text-align: center; line-height: 12px; diff --git a/designer-base/src/main/resources/com/fr/design/ui/update/push/pushUpdate.js b/designer-base/src/main/resources/com/fr/design/ui/update/push/pushUpdate.js index 1342cfb55..505a8effc 100644 --- a/designer-base/src/main/resources/com/fr/design/ui/update/push/pushUpdate.js +++ b/designer-base/src/main/resources/com/fr/design/ui/update/push/pushUpdate.js @@ -33,13 +33,13 @@ function getTitleArea() { { type: "bi.label", text: i18nText("Fine-Design_Find_New_Version"), - cls: "title", + cls: "title font-bold", textAlign: "left" }, { type: "bi.label", text: Pool.data.getVersion(), - cls: "version", + cls: "version font-bold", textAlign: "left" } ]