From 7cb5e69bc60a48a7e96b2389f52dd98a0742eddf Mon Sep 17 00:00:00 2001 From: guy Date: Wed, 10 May 2017 15:55:17 +0800 Subject: [PATCH] bug --- bi/base.css | 6 +++++ bi/case.js | 2 +- bi/widget.css | 27 ------------------- docs/base.css | 6 +++++ docs/case.js | 2 +- docs/widget.css | 27 ------------------- src/case/zclip/zclip.js | 2 +- .../base/single/editor/editor.textarea.css | 6 +++++ .../image/button/href/image.button.href.css | 7 ----- .../image/button/size/image.button.size.css | 6 ----- src/css/widget/image/uploadimage.css | 14 ---------- .../base/single/editor/editor.textarea.less | 13 +++++++++ 12 files changed, 34 insertions(+), 84 deletions(-) delete mode 100644 src/css/widget/image/button/href/image.button.href.css delete mode 100644 src/css/widget/image/button/size/image.button.size.css delete mode 100644 src/css/widget/image/uploadimage.css diff --git a/bi/base.css b/bi/base.css index 189a1a0f8..1ab5a81bd 100644 --- a/bi/base.css +++ b/bi/base.css @@ -859,6 +859,12 @@ li.CodeMirror-hint-active { .bi-textarea-editor .textarea-editor-content { border: none; } +.bi-textarea-editor .textarea-editor-content.textarea-editor-focus { + border: 1px solid #d4dadd; +} +.bi-theme-dark .bi-textarea-editor .textarea-editor-content.textarea-editor-focus { + border: 1px solid #525466; +} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ diff --git a/bi/case.js b/bi/case.js index 01db5616b..62c000dfa 100644 --- a/bi/case.js +++ b/bi/case.js @@ -11985,7 +11985,7 @@ BI.ZeroClip = BI.inherit(BI.BasicButton, { _init: function () { BI.ZeroClip.superclass._init.apply(this, arguments); var self = this, o = this.options; - + BI.nextTick(function () { self.element.zclip({ path: BI.resourceURL + "/ZeroClipboard.swf", diff --git a/bi/widget.css b/bi/widget.css index ee9212fb3..474396fdf 100644 --- a/bi/widget.css +++ b/bi/widget.css @@ -190,33 +190,6 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-image-button-href .image-button-href-icon-button { - z-index: 1; - font-size: 16px; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-image-button-size .image-button-size-button-group { - font-size: 12px; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-upload-image .upload-image-text-button-label { - font-size: 14px; - color: #999999; -} -.bi-upload-image .upload-image-icon-button { - z-index: 1; - font-size: 16px; -} -.bi-upload-image .upload-image-delete-label { - font-size: 14px; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ .bi-interactive-arrangement .interactive-arrangement-dragtag-line { z-index: 1000000000; background-color: #f07d0a; diff --git a/docs/base.css b/docs/base.css index 189a1a0f8..1ab5a81bd 100644 --- a/docs/base.css +++ b/docs/base.css @@ -859,6 +859,12 @@ li.CodeMirror-hint-active { .bi-textarea-editor .textarea-editor-content { border: none; } +.bi-textarea-editor .textarea-editor-content.textarea-editor-focus { + border: 1px solid #d4dadd; +} +.bi-theme-dark .bi-textarea-editor .textarea-editor-content.textarea-editor-focus { + border: 1px solid #525466; +} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ diff --git a/docs/case.js b/docs/case.js index 01db5616b..62c000dfa 100644 --- a/docs/case.js +++ b/docs/case.js @@ -11985,7 +11985,7 @@ BI.ZeroClip = BI.inherit(BI.BasicButton, { _init: function () { BI.ZeroClip.superclass._init.apply(this, arguments); var self = this, o = this.options; - + BI.nextTick(function () { self.element.zclip({ path: BI.resourceURL + "/ZeroClipboard.swf", diff --git a/docs/widget.css b/docs/widget.css index ee9212fb3..474396fdf 100644 --- a/docs/widget.css +++ b/docs/widget.css @@ -190,33 +190,6 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-image-button-href .image-button-href-icon-button { - z-index: 1; - font-size: 16px; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-image-button-size .image-button-size-button-group { - font-size: 12px; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-upload-image .upload-image-text-button-label { - font-size: 14px; - color: #999999; -} -.bi-upload-image .upload-image-icon-button { - z-index: 1; - font-size: 16px; -} -.bi-upload-image .upload-image-delete-label { - font-size: 14px; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ .bi-interactive-arrangement .interactive-arrangement-dragtag-line { z-index: 1000000000; background-color: #f07d0a; diff --git a/src/case/zclip/zclip.js b/src/case/zclip/zclip.js index 64fc32f56..7a7d99132 100644 --- a/src/case/zclip/zclip.js +++ b/src/case/zclip/zclip.js @@ -16,7 +16,7 @@ BI.ZeroClip = BI.inherit(BI.BasicButton, { _init: function () { BI.ZeroClip.superclass._init.apply(this, arguments); var self = this, o = this.options; - + BI.nextTick(function () { self.element.zclip({ path: BI.resourceURL + "/ZeroClipboard.swf", diff --git a/src/css/base/single/editor/editor.textarea.css b/src/css/base/single/editor/editor.textarea.css index 13e82616c..95537977a 100644 --- a/src/css/base/single/editor/editor.textarea.css +++ b/src/css/base/single/editor/editor.textarea.css @@ -12,3 +12,9 @@ .bi-textarea-editor .textarea-editor-content { border: none; } +.bi-textarea-editor .textarea-editor-content.textarea-editor-focus { + border: 1px solid #d4dadd; +} +.bi-theme-dark .bi-textarea-editor .textarea-editor-content.textarea-editor-focus { + border: 1px solid #525466; +} diff --git a/src/css/widget/image/button/href/image.button.href.css b/src/css/widget/image/button/href/image.button.href.css deleted file mode 100644 index cb133baf9..000000000 --- a/src/css/widget/image/button/href/image.button.href.css +++ /dev/null @@ -1,7 +0,0 @@ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-image-button-href .image-button-href-icon-button { - z-index: 1; - font-size: 16px; -} diff --git a/src/css/widget/image/button/size/image.button.size.css b/src/css/widget/image/button/size/image.button.size.css deleted file mode 100644 index 316d4f333..000000000 --- a/src/css/widget/image/button/size/image.button.size.css +++ /dev/null @@ -1,6 +0,0 @@ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-image-button-size .image-button-size-button-group { - font-size: 12px; -} diff --git a/src/css/widget/image/uploadimage.css b/src/css/widget/image/uploadimage.css deleted file mode 100644 index a2e1933cd..000000000 --- a/src/css/widget/image/uploadimage.css +++ /dev/null @@ -1,14 +0,0 @@ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-upload-image .upload-image-text-button-label { - font-size: 14px; - color: #999999; -} -.bi-upload-image .upload-image-icon-button { - z-index: 1; - font-size: 16px; -} -.bi-upload-image .upload-image-delete-label { - font-size: 14px; -} diff --git a/src/less/base/single/editor/editor.textarea.less b/src/less/base/single/editor/editor.textarea.less index ce6b01357..452595970 100644 --- a/src/less/base/single/editor/editor.textarea.less +++ b/src/less/base/single/editor/editor.textarea.less @@ -7,5 +7,18 @@ & { border: none; } + &.textarea-editor-focus{ + border: 1px solid @color-bi-border-line; + } + } +} + +.bi-theme-dark{ + .bi-textarea-editor { + & .textarea-editor-content { + &.textarea-editor-focus{ + border: 1px solid @color-bi-border-line-theme-dark; + } + } } } \ No newline at end of file