From d8bdb138d09e3ab7f5537c6c871513ec306131f5 Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 21 Apr 2017 19:43:11 +0800 Subject: [PATCH] add --- bi/core.css | 51 ++++++++++++++++++++++ bi/core.js | 4 +- docs/core.css | 51 ++++++++++++++++++++++ docs/core.js | 4 +- docs/resource.css | 55 +----------------------- src/core/controller/controller.masker.js | 4 +- src/css/{resource => core}/normal.css | 0 src/css/resource/font.css | 4 +- src/less/{resource => core}/normal.less | 0 src/less/resource/font.less | 2 +- 10 files changed, 110 insertions(+), 65 deletions(-) rename src/css/{resource => core}/normal.css (100%) rename src/less/{resource => core}/normal.less (100%) diff --git a/bi/core.css b/bi/core.css index 870e951fd..317fa4d81 100644 --- a/bi/core.css +++ b/bi/core.css @@ -1,3 +1,54 @@ +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +html, +body, +div, +ul, +li, +img, +a, +span, +p, +* { + margin: 0; + padding: 0; +} +a { + outline: none; + text-decoration: none; +} +a:focus { + outline: 0; +} +input, +textarea { + margin: 0; + padding: 0; + outline: none; + border: 1px solid #d4dadd; +} +.bi-theme-dark input, +.bi-theme-dark textarea { + border: 1px solid #525466; +} +ul, +ol { + margin: 0; + padding: 0; +} +ul { + list-style: disc; +} +li { + list-style-type: none; +} +i { + font-style: normal; + -webkit-font-smoothing: antialiased; + -webkit-text-stroke-width: 0.2px; + -moz-osx-font-smoothing: grayscale; +} @charset "UTF-8"; /*! * animate.css -http://daneden.me/animate diff --git a/bi/core.js b/bi/core.js index 0a23cd165..0c0d0099b 100644 --- a/bi/core.js +++ b/bi/core.js @@ -15926,9 +15926,7 @@ BI.LayerController = BI.inherit(BI.Controller, { */ BI.MaskersController = BI.inherit(BI.LayerController, { _defaultConfig: function () { - return BI.extend(BI.MaskersController.superclass._defaultConfig.apply(this, arguments), { - render: "body" - }); + return BI.extend(BI.MaskersController.superclass._defaultConfig.apply(this, arguments), {}); }, _init: function () { diff --git a/docs/core.css b/docs/core.css index 870e951fd..317fa4d81 100644 --- a/docs/core.css +++ b/docs/core.css @@ -1,3 +1,54 @@ +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +html, +body, +div, +ul, +li, +img, +a, +span, +p, +* { + margin: 0; + padding: 0; +} +a { + outline: none; + text-decoration: none; +} +a:focus { + outline: 0; +} +input, +textarea { + margin: 0; + padding: 0; + outline: none; + border: 1px solid #d4dadd; +} +.bi-theme-dark input, +.bi-theme-dark textarea { + border: 1px solid #525466; +} +ul, +ol { + margin: 0; + padding: 0; +} +ul { + list-style: disc; +} +li { + list-style-type: none; +} +i { + font-style: normal; + -webkit-font-smoothing: antialiased; + -webkit-text-stroke-width: 0.2px; + -moz-osx-font-smoothing: grayscale; +} @charset "UTF-8"; /*! * animate.css -http://daneden.me/animate diff --git a/docs/core.js b/docs/core.js index 10dbadaf8..8a85d1efa 100644 --- a/docs/core.js +++ b/docs/core.js @@ -21125,9 +21125,7 @@ BI.LayerController = BI.inherit(BI.Controller, { */ BI.MaskersController = BI.inherit(BI.LayerController, { _defaultConfig: function () { - return BI.extend(BI.MaskersController.superclass._defaultConfig.apply(this, arguments), { - render: "body" - }); + return BI.extend(BI.MaskersController.superclass._defaultConfig.apply(this, arguments), {}); }, _init: function () { diff --git a/docs/resource.css b/docs/resource.css index ef4dd0ada..f3b24fcc8 100644 --- a/docs/resource.css +++ b/docs/resource.css @@ -3192,12 +3192,12 @@ textarea::-webkit-scrollbar-thumb { } .recover-chart-font-hightlight .b-font:before { content: "\e6b4"; - color: #3f8ce8; + color: inherit; } .recover-chart-font-hightlight.native .b-font:before, .recover-chart-font-hightlight.disabled .b-font:before { content: "\e6b4"; - color: #3f8ce8; + color: inherit; } .tables-tile-view-font .b-font:before { content: "\e685"; @@ -6318,57 +6318,6 @@ textarea::-webkit-scrollbar-thumb { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/push_up.png'); _background: none; } -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -html, -body, -div, -ul, -li, -img, -a, -span, -p, -* { - margin: 0; - padding: 0; -} -a { - outline: none; - text-decoration: none; -} -a:focus { - outline: 0; -} -input, -textarea { - margin: 0; - padding: 0; - outline: none; - border: 1px solid #d4dadd; -} -.bi-theme-dark input, -.bi-theme-dark textarea { - border: 1px solid #525466; -} -ul, -ol { - margin: 0; - padding: 0; -} -ul { - list-style: disc; -} -li { - list-style-type: none; -} -i { - font-style: normal; - -webkit-font-smoothing: antialiased; - -webkit-text-stroke-width: 0.2px; - -moz-osx-font-smoothing: grayscale; -} /** * Farbtastic Color Picker 1.2 * © 2008 Steven Wittens diff --git a/src/core/controller/controller.masker.js b/src/core/controller/controller.masker.js index 9d1bdcbd8..5c34fc8d5 100644 --- a/src/core/controller/controller.masker.js +++ b/src/core/controller/controller.masker.js @@ -6,9 +6,7 @@ */ BI.MaskersController = BI.inherit(BI.LayerController, { _defaultConfig: function () { - return BI.extend(BI.MaskersController.superclass._defaultConfig.apply(this, arguments), { - render: "body" - }); + return BI.extend(BI.MaskersController.superclass._defaultConfig.apply(this, arguments), {}); }, _init: function () { diff --git a/src/css/resource/normal.css b/src/css/core/normal.css similarity index 100% rename from src/css/resource/normal.css rename to src/css/core/normal.css diff --git a/src/css/resource/font.css b/src/css/resource/font.css index 268aada16..b7944bb8d 100644 --- a/src/css/resource/font.css +++ b/src/css/resource/font.css @@ -2578,12 +2578,12 @@ } .recover-chart-font-hightlight .b-font:before { content: "\e6b4"; - color: #3f8ce8; + color: inherit; } .recover-chart-font-hightlight.native .b-font:before, .recover-chart-font-hightlight.disabled .b-font:before { content: "\e6b4"; - color: #3f8ce8; + color: inherit; } .tables-tile-view-font .b-font:before { content: "\e685"; diff --git a/src/less/resource/normal.less b/src/less/core/normal.less similarity index 100% rename from src/less/resource/normal.less rename to src/less/core/normal.less diff --git a/src/less/resource/font.less b/src/less/resource/font.less index 76d813b0a..7f4580ef3 100644 --- a/src/less/resource/font.less +++ b/src/less/resource/font.less @@ -244,7 +244,7 @@ .font-hover-active(sql-table-font, @font-sql-table, @color-bi-text-highlight, @color-bi-text-highlight, @color-bi-text); .font(refresh-table-font, @font-refresh); -.font(recover-chart-font-hightlight, @font-recover-chart, @color-bi-text-highlight); +.font(recover-chart-font-hightlight, @font-recover-chart); .font-hover-active(tables-tile-view-font, @font-tile-view, inherit, inherit, @color-bi-text); .font-hover-active(tables-relation-view-font, @font-relation-view, inherit, inherit, @color-bi-text);