From 9bc28e06bb5ee25fd3b96536c240d230fcc51fdb Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Tue, 2 May 2017 13:49:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=9B=BD=E9=99=85=E5=8C=96Ke?= =?UTF-8?q?y?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bi/core.js | 16 +++++++------- demo/css/center.css | 0 demo/css/face.css | 6 +++++ demo/css/index.css | 3 +++ demo/css/main.css | 50 ++++++++++++++++++++++++++++++++++++++++++ demo/css/north.css | 13 +++++++++++ demo/css/preview.css | 3 +++ demo/css/west.css | 3 +++ docs/core.js | 16 +++++++------- src/core/proto/date.js | 16 +++++++------- 10 files changed, 102 insertions(+), 24 deletions(-) create mode 100644 demo/css/center.css create mode 100644 demo/css/face.css create mode 100644 demo/css/index.css create mode 100644 demo/css/main.css create mode 100644 demo/css/north.css create mode 100644 demo/css/preview.css create mode 100644 demo/css/west.css diff --git a/bi/core.js b/bi/core.js index 39ec4f58d5..a1302b3dba 100644 --- a/bi/core.js +++ b/bi/core.js @@ -6169,14 +6169,14 @@ Date._DN = [BI.i18nText("BI-Basic_Sunday"), BI.i18nText("BI-Basic_Sunday")]; // short day names -Date._SDN = [BI.i18nText("BI-Date_Day"), - BI.i18nText("BI-Basic_One"), - BI.i18nText("BI-Basic_Two"), - BI.i18nText("BI-Basic_Three"), - BI.i18nText("BI-Basic_Four"), - BI.i18nText("BI-Basic_Five"), - BI.i18nText("BI-Basic_Six"), - BI.i18nText("BI-Date_Day")]; +Date._SDN = [BI.i18nText("BI-Basic_Simple_Sunday"), + BI.i18nText("BI-Basic_Simple_Monday"), + BI.i18nText("BI-Basic_Simple_Tuesday"), + BI.i18nText("BI-Basic_Simple_Wednesday"), + BI.i18nText("BI-Basic_Simple_Thursday"), + BI.i18nText("BI-Basic_Simple_Friday"), + BI.i18nText("BI-Basic_Simple_Saturday"), + BI.i18nText("BI-Basic_Simple_Sunday")]; // Monday first, etc. Date._FD = 1; diff --git a/demo/css/center.css b/demo/css/center.css new file mode 100644 index 0000000000..e69de29bb2 diff --git a/demo/css/face.css b/demo/css/face.css new file mode 100644 index 0000000000..310c89450b --- /dev/null +++ b/demo/css/face.css @@ -0,0 +1,6 @@ +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +.demo-face .face-config .config-label { + font-size: 14px; +} diff --git a/demo/css/index.css b/demo/css/index.css new file mode 100644 index 0000000000..2f6491e13f --- /dev/null +++ b/demo/css/index.css @@ -0,0 +1,3 @@ +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ diff --git a/demo/css/main.css b/demo/css/main.css new file mode 100644 index 0000000000..a7c6746853 --- /dev/null +++ b/demo/css/main.css @@ -0,0 +1,50 @@ +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +.layout-bg-white { + background-color: #ffffff; +} +.layout-bg-gray { + background-color: #eeeeee; +} +.layout-bg1 { + color: #ffffff; + background-color: #0088cc; +} +.layout-bg2 { + color: #ffffff; + background-color: #008B8B; +} +.layout-bg3 { + color: #ffffff; + background-color: #6495ED; +} +.layout-bg4 { + color: #ffffff; + background-color: #ff69b4; +} +.layout-bg5 { + color: #ffffff; + background-color: #B8860B; +} +.layout-bg6 { + color: #ffffff; + background-color: #d9534f; +} +.layout-bg7 { + color: #ffffff; + background-color: #ea4738; +} +.layout-bg8 { + color: #ffffff; + background-color: #6495ed; +} +.demo-main .bg1 { + background-color: #178cdf; +} +body { + background-color: #eff1f4; +} +body.bi-theme-dark { + background-color: #191B2B; +} diff --git a/demo/css/north.css b/demo/css/north.css new file mode 100644 index 0000000000..ffd6fe0a3a --- /dev/null +++ b/demo/css/north.css @@ -0,0 +1,13 @@ +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +.demo-north { + background-color: #3c8dbc; +} +.demo-north .logo { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + color: #ffffff; + background-color: #367fa9; + font-size: 20px; + font-weight: 300; +} diff --git a/demo/css/preview.css b/demo/css/preview.css new file mode 100644 index 0000000000..2f6491e13f --- /dev/null +++ b/demo/css/preview.css @@ -0,0 +1,3 @@ +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ diff --git a/demo/css/west.css b/demo/css/west.css new file mode 100644 index 0000000000..2f6491e13f --- /dev/null +++ b/demo/css/west.css @@ -0,0 +1,3 @@ +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ diff --git a/docs/core.js b/docs/core.js index 79ebe3be9c..920883e37f 100644 --- a/docs/core.js +++ b/docs/core.js @@ -23646,14 +23646,14 @@ Date._DN = [BI.i18nText("BI-Basic_Sunday"), BI.i18nText("BI-Basic_Sunday")]; // short day names -Date._SDN = [BI.i18nText("BI-Date_Day"), - BI.i18nText("BI-Basic_One"), - BI.i18nText("BI-Basic_Two"), - BI.i18nText("BI-Basic_Three"), - BI.i18nText("BI-Basic_Four"), - BI.i18nText("BI-Basic_Five"), - BI.i18nText("BI-Basic_Six"), - BI.i18nText("BI-Date_Day")]; +Date._SDN = [BI.i18nText("BI-Basic_Simple_Sunday"), + BI.i18nText("BI-Basic_Simple_Monday"), + BI.i18nText("BI-Basic_Simple_Tuesday"), + BI.i18nText("BI-Basic_Simple_Wednesday"), + BI.i18nText("BI-Basic_Simple_Thursday"), + BI.i18nText("BI-Basic_Simple_Friday"), + BI.i18nText("BI-Basic_Simple_Saturday"), + BI.i18nText("BI-Basic_Simple_Sunday")]; // Monday first, etc. Date._FD = 1; diff --git a/src/core/proto/date.js b/src/core/proto/date.js index 72df184662..1ae8b59593 100644 --- a/src/core/proto/date.js +++ b/src/core/proto/date.js @@ -9,14 +9,14 @@ Date._DN = [BI.i18nText("BI-Basic_Sunday"), BI.i18nText("BI-Basic_Sunday")]; // short day names -Date._SDN = [BI.i18nText("BI-Date_Day"), - BI.i18nText("BI-Basic_One"), - BI.i18nText("BI-Basic_Two"), - BI.i18nText("BI-Basic_Three"), - BI.i18nText("BI-Basic_Four"), - BI.i18nText("BI-Basic_Five"), - BI.i18nText("BI-Basic_Six"), - BI.i18nText("BI-Date_Day")]; +Date._SDN = [BI.i18nText("BI-Basic_Simple_Sunday"), + BI.i18nText("BI-Basic_Simple_Monday"), + BI.i18nText("BI-Basic_Simple_Tuesday"), + BI.i18nText("BI-Basic_Simple_Wednesday"), + BI.i18nText("BI-Basic_Simple_Thursday"), + BI.i18nText("BI-Basic_Simple_Friday"), + BI.i18nText("BI-Basic_Simple_Saturday"), + BI.i18nText("BI-Basic_Simple_Sunday")]; // Monday first, etc. Date._FD = 1;