Browse Source

全局样式

master
guy 8 years ago
parent
commit
7612de4f9b
  1. 25
      bi/base.css
  2. 16
      bi/base.js
  3. 4
      bi/case.js
  4. 9
      bi/core.css
  5. 5
      bi/widget.css
  6. 2
      bi/widget.js
  7. 25
      docs/base.css
  8. 16
      docs/base.js
  9. 4
      docs/case.js
  10. 9
      docs/core.css
  11. 58
      docs/resource.css
  12. 5
      docs/widget.css
  13. 2
      docs/widget.js
  14. 2
      src/base/combination/group.button.js
  15. 2
      src/base/single/editor/editor.textarea.js
  16. 12
      src/base/single/text.js
  17. 0
      src/case/layer/layer.multipopup.js
  18. 4
      src/case/layer/panel.js
  19. 15
      src/css/base/formula/codemirror.css
  20. 5
      src/css/base/layer/panel.css
  21. 2
      src/css/base/single/button/button.css
  22. 3
      src/css/base/single/editor/editor.textarea.css
  23. 31
      src/css/core/utils/common.css
  24. 0
      src/css/resource/third/ztree/display.tree.css
  25. 5
      src/css/widget/arrangement/arrangement.block.css
  26. 352
      src/less/base/formula/codemirror.less
  27. 3
      src/less/base/layer/panel.less
  28. 4
      src/less/base/single/button/button.less
  29. 3
      src/less/base/single/editor/editor.textarea.less
  30. 31
      src/less/core/utils/common.less
  31. 7
      src/less/lib/colors.less
  32. 38
      src/less/lib/constant.less
  33. 2
      src/less/resource/third/ztree/display.tree.less
  34. 4
      src/less/widget/arrangement/arrangement.block.less
  35. 2
      src/widget/arrangement/arrangement.block.js

25
bi/base.css

@ -131,7 +131,12 @@
cursor: text; cursor: text;
width: 100%; width: 100%;
height: 100%; height: 100%;
color: black; color: #1a1a1a;
background-color: #ffffff;
}
.bi-theme-dark .CodeMirror {
color: #ffffff;
background-color: #242640;
} }
/* PADDING */ /* PADDING */
.CodeMirror-lines { .CodeMirror-lines {
@ -168,7 +173,10 @@
} }
/* CURSOR */ /* CURSOR */
.CodeMirror div.CodeMirror-cursor { .CodeMirror div.CodeMirror-cursor {
border-left: 1px solid black; border-left: 1px solid #1a1a1a;
}
.bi-theme-dark .CodeMirror div.CodeMirror-cursor {
border-left: 1px solid #ffffff;
} }
/* Shown when moving in bi-directional text */ /* Shown when moving in bi-directional text */
.CodeMirror div.CodeMirror-secondarycursor { .CodeMirror div.CodeMirror-secondarycursor {
@ -307,7 +315,7 @@
} }
.cm-s-default span[class*="fieldName"] { .cm-s-default span[class*="fieldName"] {
color: white; color: white;
padding: 1px ; padding: 1px;
margin: 1px 0px; margin: 1px 0px;
background: #3f8ce8; background: #3f8ce8;
} }
@ -359,7 +367,6 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
.CodeMirror { .CodeMirror {
position: relative; position: relative;
overflow: hidden; overflow: hidden;
background: white;
} }
.CodeMirror-scroll { .CodeMirror-scroll {
overflow: scroll !important; overflow: scroll !important;
@ -627,15 +634,10 @@ li.CodeMirror-hint-active {
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
.bi-panel { .bi-panel {
border: 1px solid #a3d6e8;
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
} }
.bi-panel .panel-title {
background-color: #d8f2fd;
border-bottom: 1px solid #a3d6e8;
}
.bi-panel .panel-title .panel-title-text { .bi-panel .panel-title .panel-title-text {
cursor: text; cursor: text;
font-size: 14px; font-size: 14px;
@ -697,7 +699,7 @@ li.CodeMirror-hint-active {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
border: 1px solid #3f8ce8; border: 1px solid #178cdf;
background-color: #3f8ce8; background-color: #3f8ce8;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
@ -849,9 +851,6 @@ li.CodeMirror-hint-active {
.bi-textarea-editor .textarea-editor-content { .bi-textarea-editor .textarea-editor-content {
border: none; border: none;
} }
.bi-textarea-editor .textarea-editor-content.textarea-editor-focus {
border: 1px solid #3f8ce8;
}
/****添加计算宽度的--运算符直接需要space****/ /****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/

16
bi/base.js

@ -496,11 +496,15 @@ BI.Text = BI.inherit(BI.Single, {
type: "bi.layout", type: "bi.layout",
cls: "bi-text" cls: "bi-text"
}); });
this.text.element.appendTo(this.element); BI.createWidget({
type: "bi.default",
element: this,
items: [this.text]
});
if (BI.isKey(o.text)) { if (BI.isKey(o.text)) {
this.text.element.text(o.text); this.setText(o.text);
} else if (BI.isKey(o.value)) { } else if (BI.isKey(o.value)) {
this.text.element.text(o.value); this.setText(o.value);
} }
if (o.hgap + o.lgap > 0) { if (o.hgap + o.lgap > 0) {
this.text.element.css({ this.text.element.css({
@ -562,7 +566,7 @@ BI.Text = BI.inherit(BI.Single, {
setValue: function (text) { setValue: function (text) {
BI.Text.superclass.setValue.apply(this, arguments); BI.Text.superclass.setValue.apply(this, arguments);
if (!this.isReadOnly()) { if (!this.isReadOnly()) {
this.text.element.text(text); this.setText(text);
} }
}, },
@ -1061,7 +1065,7 @@ BI.ButtonGroup = BI.inherit(BI.Widget, {
//如果是一个简单的layout //如果是一个简单的layout
_isSimpleLayout: function () { _isSimpleLayout: function () {
var o = this.options; var o = this.options;
return o.layouts.length === 1 && !BI.isArray(o.layouts.items[0]) return o.layouts.length === 1 && !BI.isArray(o.items[0])
}, },
doBehavior: function () { doBehavior: function () {
@ -17838,7 +17842,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
tagName: "textarea", tagName: "textarea",
width: "100%", width: "100%",
height: "100%", height: "100%",
cls: "textarea-editor-content display-block" cls: "textarea-editor-content display-block bi-card"
}); });
this.content.element.css({"resize": "none"}); this.content.element.css({"resize": "none"});
BI.createWidget({ BI.createWidget({

4
bi/case.js

@ -7250,7 +7250,7 @@ BI.shortcut("bi.list_pane", BI.ListPane);/**
BI.Panel = BI.inherit(BI.Widget,{ BI.Panel = BI.inherit(BI.Widget,{
_defaultConfig : function(){ _defaultConfig : function(){
return BI.extend(BI.Panel.superclass._defaultConfig.apply(this,arguments),{ return BI.extend(BI.Panel.superclass._defaultConfig.apply(this,arguments),{
baseCls: "bi-panel", baseCls: "bi-panel bi-border",
title:"", title:"",
titleButtons:[], titleButtons:[],
el:{}, el:{},
@ -7301,7 +7301,7 @@ BI.Panel = BI.inherit(BI.Widget,{
return { return {
el: { el: {
type: "bi.left_right_vertical_adapt", type: "bi.left_right_vertical_adapt",
cls: "panel-title bi-tips", cls: "panel-title bi-tips bi-border-bottom bi-background",
height: 30, height: 30,
items: { items: {
left: [this.text], left: [this.text],

9
bi/core.css

@ -3000,11 +3000,14 @@
color: #666666; color: #666666;
} }
.bi-resizer { .bi-resizer {
background: #d8f3fe; background: #1a1a1a;
opacity: 0.8; opacity: 0.2;
filter: alpha(opacity=80); filter: alpha(opacity=20);
z-index: 1000000000; z-index: 1000000000;
} }
.bi-theme-dark .bi-resizer {
background: #ffffff;
}
.bi-z-index-mask { .bi-z-index-mask {
background-color: #1a1a1a; background-color: #1a1a1a;
opacity: 0.5; opacity: 0.5;

5
bi/widget.css

@ -1,11 +1,6 @@
/****添加计算宽度的--运算符直接需要space****/ /****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
.bi-arrangement-block {
background: #e85050;
opacity: 0.8;
filter: alpha(opacity=80);
}
/****添加计算宽度的--运算符直接需要space****/ /****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/

2
bi/widget.js

@ -921,7 +921,7 @@ BI.ArrangementBlock = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.ArrangementBlock.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.ArrangementBlock.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-arrangement-block" baseCls: "bi-arrangement-block bi-resizer"
}); });
}, },

25
docs/base.css

@ -131,7 +131,12 @@
cursor: text; cursor: text;
width: 100%; width: 100%;
height: 100%; height: 100%;
color: black; color: #1a1a1a;
background-color: #ffffff;
}
.bi-theme-dark .CodeMirror {
color: #ffffff;
background-color: #242640;
} }
/* PADDING */ /* PADDING */
.CodeMirror-lines { .CodeMirror-lines {
@ -168,7 +173,10 @@
} }
/* CURSOR */ /* CURSOR */
.CodeMirror div.CodeMirror-cursor { .CodeMirror div.CodeMirror-cursor {
border-left: 1px solid black; border-left: 1px solid #1a1a1a;
}
.bi-theme-dark .CodeMirror div.CodeMirror-cursor {
border-left: 1px solid #ffffff;
} }
/* Shown when moving in bi-directional text */ /* Shown when moving in bi-directional text */
.CodeMirror div.CodeMirror-secondarycursor { .CodeMirror div.CodeMirror-secondarycursor {
@ -307,7 +315,7 @@
} }
.cm-s-default span[class*="fieldName"] { .cm-s-default span[class*="fieldName"] {
color: white; color: white;
padding: 1px ; padding: 1px;
margin: 1px 0px; margin: 1px 0px;
background: #3f8ce8; background: #3f8ce8;
} }
@ -359,7 +367,6 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
.CodeMirror { .CodeMirror {
position: relative; position: relative;
overflow: hidden; overflow: hidden;
background: white;
} }
.CodeMirror-scroll { .CodeMirror-scroll {
overflow: scroll !important; overflow: scroll !important;
@ -627,15 +634,10 @@ li.CodeMirror-hint-active {
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
.bi-panel { .bi-panel {
border: 1px solid #a3d6e8;
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
} }
.bi-panel .panel-title {
background-color: #d8f2fd;
border-bottom: 1px solid #a3d6e8;
}
.bi-panel .panel-title .panel-title-text { .bi-panel .panel-title .panel-title-text {
cursor: text; cursor: text;
font-size: 14px; font-size: 14px;
@ -697,7 +699,7 @@ li.CodeMirror-hint-active {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
border: 1px solid #3f8ce8; border: 1px solid #178cdf;
background-color: #3f8ce8; background-color: #3f8ce8;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
@ -849,9 +851,6 @@ li.CodeMirror-hint-active {
.bi-textarea-editor .textarea-editor-content { .bi-textarea-editor .textarea-editor-content {
border: none; border: none;
} }
.bi-textarea-editor .textarea-editor-content.textarea-editor-focus {
border: 1px solid #3f8ce8;
}
/****添加计算宽度的--运算符直接需要space****/ /****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/

16
docs/base.js

@ -496,11 +496,15 @@ BI.Text = BI.inherit(BI.Single, {
type: "bi.layout", type: "bi.layout",
cls: "bi-text" cls: "bi-text"
}); });
this.text.element.appendTo(this.element); BI.createWidget({
type: "bi.default",
element: this,
items: [this.text]
});
if (BI.isKey(o.text)) { if (BI.isKey(o.text)) {
this.text.element.text(o.text); this.setText(o.text);
} else if (BI.isKey(o.value)) { } else if (BI.isKey(o.value)) {
this.text.element.text(o.value); this.setText(o.value);
} }
if (o.hgap + o.lgap > 0) { if (o.hgap + o.lgap > 0) {
this.text.element.css({ this.text.element.css({
@ -562,7 +566,7 @@ BI.Text = BI.inherit(BI.Single, {
setValue: function (text) { setValue: function (text) {
BI.Text.superclass.setValue.apply(this, arguments); BI.Text.superclass.setValue.apply(this, arguments);
if (!this.isReadOnly()) { if (!this.isReadOnly()) {
this.text.element.text(text); this.setText(text);
} }
}, },
@ -1061,7 +1065,7 @@ BI.ButtonGroup = BI.inherit(BI.Widget, {
//如果是一个简单的layout //如果是一个简单的layout
_isSimpleLayout: function () { _isSimpleLayout: function () {
var o = this.options; var o = this.options;
return o.layouts.length === 1 && !BI.isArray(o.layouts.items[0]) return o.layouts.length === 1 && !BI.isArray(o.items[0])
}, },
doBehavior: function () { doBehavior: function () {
@ -17838,7 +17842,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
tagName: "textarea", tagName: "textarea",
width: "100%", width: "100%",
height: "100%", height: "100%",
cls: "textarea-editor-content display-block" cls: "textarea-editor-content display-block bi-card"
}); });
this.content.element.css({"resize": "none"}); this.content.element.css({"resize": "none"});
BI.createWidget({ BI.createWidget({

4
docs/case.js

@ -7250,7 +7250,7 @@ BI.shortcut("bi.list_pane", BI.ListPane);/**
BI.Panel = BI.inherit(BI.Widget,{ BI.Panel = BI.inherit(BI.Widget,{
_defaultConfig : function(){ _defaultConfig : function(){
return BI.extend(BI.Panel.superclass._defaultConfig.apply(this,arguments),{ return BI.extend(BI.Panel.superclass._defaultConfig.apply(this,arguments),{
baseCls: "bi-panel", baseCls: "bi-panel bi-border",
title:"", title:"",
titleButtons:[], titleButtons:[],
el:{}, el:{},
@ -7301,7 +7301,7 @@ BI.Panel = BI.inherit(BI.Widget,{
return { return {
el: { el: {
type: "bi.left_right_vertical_adapt", type: "bi.left_right_vertical_adapt",
cls: "panel-title bi-tips", cls: "panel-title bi-tips bi-border-bottom bi-background",
height: 30, height: 30,
items: { items: {
left: [this.text], left: [this.text],

9
docs/core.css

@ -3000,11 +3000,14 @@
color: #666666; color: #666666;
} }
.bi-resizer { .bi-resizer {
background: #d8f3fe; background: #1a1a1a;
opacity: 0.8; opacity: 0.2;
filter: alpha(opacity=80); filter: alpha(opacity=20);
z-index: 1000000000; z-index: 1000000000;
} }
.bi-theme-dark .bi-resizer {
background: #ffffff;
}
.bi-z-index-mask { .bi-z-index-mask {
background-color: #1a1a1a; background-color: #1a1a1a;
opacity: 0.5; opacity: 0.5;

58
docs/resource.css

@ -6424,6 +6424,35 @@ i {
overflow: hidden; overflow: hidden;
background: url("third/farbtastic/marker.png") no-repeat; background: url("third/farbtastic/marker.png") no-repeat;
} }
/****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/
.bi-display-tree .ztree * {
color: #999999;
}
.bi-display-tree .ztree li span.button.switch.center_open {
background-image: url("/icon/tree-vertical-line-3.png");
}
.bi-display-tree .ztree li span.button.switch.roots_open {
background-image: url("/icon/tree-vertical-line-2.png");
}
.bi-display-tree .ztree li span.button.switch.bottom_open {
background-image: url("/icon/tree-vertical-line-4.png");
}
.bi-display-tree .ztree li a,
.bi-display-tree .ztree li span {
cursor: default !important;
}
.bi-display-tree .ztree li a:hover {
text-decoration: none;
}
.bi-display-tree .ztree li a.curSelectedNode {
padding-top: 1px;
border: none;
background-color: inherit;
opacity: 1;
filter: alpha(opacity=100);
}
/*------------------------------------- /*-------------------------------------
zTree Style zTree Style
@ -6715,32 +6744,3 @@ ul.ztree.zTreeDragUL {
padding:0; padding:0;
background:none; background:none;
}*/ }*/
/****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/
.bi-display-tree .ztree * {
color: #999999;
}
.bi-display-tree .ztree li span.button.switch.center_open {
background-image: url("/icon/tree-vertical-line-3.png");
}
.bi-display-tree .ztree li span.button.switch.roots_open {
background-image: url("/icon/tree-vertical-line-2.png");
}
.bi-display-tree .ztree li span.button.switch.bottom_open {
background-image: url("/icon/tree-vertical-line-4.png");
}
.bi-display-tree .ztree li a,
.bi-display-tree .ztree li span {
cursor: default !important;
}
.bi-display-tree .ztree li a:hover {
text-decoration: none;
}
.bi-display-tree .ztree li a.curSelectedNode {
padding-top: 1px;
border: none;
background-color: inherit;
opacity: 1;
filter: alpha(opacity=100);
}

5
docs/widget.css

@ -1,11 +1,6 @@
/****添加计算宽度的--运算符直接需要space****/ /****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
.bi-arrangement-block {
background: #e85050;
opacity: 0.8;
filter: alpha(opacity=80);
}
/****添加计算宽度的--运算符直接需要space****/ /****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/

2
docs/widget.js

@ -921,7 +921,7 @@ BI.ArrangementBlock = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.ArrangementBlock.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.ArrangementBlock.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-arrangement-block" baseCls: "bi-arrangement-block bi-resizer"
}); });
}, },

2
src/base/combination/group.button.js

@ -117,7 +117,7 @@ BI.ButtonGroup = BI.inherit(BI.Widget, {
//如果是一个简单的layout //如果是一个简单的layout
_isSimpleLayout: function () { _isSimpleLayout: function () {
var o = this.options; var o = this.options;
return o.layouts.length === 1 && !BI.isArray(o.layouts.items[0]) return o.layouts.length === 1 && !BI.isArray(o.items[0])
}, },
doBehavior: function () { doBehavior: function () {

2
src/base/single/editor/editor.textarea.js

@ -19,7 +19,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
tagName: "textarea", tagName: "textarea",
width: "100%", width: "100%",
height: "100%", height: "100%",
cls: "textarea-editor-content display-block" cls: "textarea-editor-content display-block bi-card"
}); });
this.content.element.css({"resize": "none"}); this.content.element.css({"resize": "none"});
BI.createWidget({ BI.createWidget({

12
src/base/single/text.js

@ -29,11 +29,15 @@ BI.Text = BI.inherit(BI.Single, {
type: "bi.layout", type: "bi.layout",
cls: "bi-text" cls: "bi-text"
}); });
this.text.element.appendTo(this.element); BI.createWidget({
type: "bi.default",
element: this,
items: [this.text]
});
if (BI.isKey(o.text)) { if (BI.isKey(o.text)) {
this.text.element.text(o.text); this.setText(o.text);
} else if (BI.isKey(o.value)) { } else if (BI.isKey(o.value)) {
this.text.element.text(o.value); this.setText(o.value);
} }
if (o.hgap + o.lgap > 0) { if (o.hgap + o.lgap > 0) {
this.text.element.css({ this.text.element.css({
@ -95,7 +99,7 @@ BI.Text = BI.inherit(BI.Single, {
setValue: function (text) { setValue: function (text) {
BI.Text.superclass.setValue.apply(this, arguments); BI.Text.superclass.setValue.apply(this, arguments);
if (!this.isReadOnly()) { if (!this.isReadOnly()) {
this.text.element.text(text); this.setText(text);
} }
}, },

0
src/case/layer/layer.multiselect.js → src/case/layer/layer.multipopup.js

4
src/case/layer/panel.js

@ -6,7 +6,7 @@
BI.Panel = BI.inherit(BI.Widget,{ BI.Panel = BI.inherit(BI.Widget,{
_defaultConfig : function(){ _defaultConfig : function(){
return BI.extend(BI.Panel.superclass._defaultConfig.apply(this,arguments),{ return BI.extend(BI.Panel.superclass._defaultConfig.apply(this,arguments),{
baseCls: "bi-panel", baseCls: "bi-panel bi-border",
title:"", title:"",
titleButtons:[], titleButtons:[],
el:{}, el:{},
@ -57,7 +57,7 @@ BI.Panel = BI.inherit(BI.Widget,{
return { return {
el: { el: {
type: "bi.left_right_vertical_adapt", type: "bi.left_right_vertical_adapt",
cls: "panel-title bi-tips", cls: "panel-title bi-tips bi-border-bottom bi-background",
height: 30, height: 30,
items: { items: {
left: [this.text], left: [this.text],

15
src/css/base/formula/codemirror.css

@ -8,7 +8,12 @@
cursor: text; cursor: text;
width: 100%; width: 100%;
height: 100%; height: 100%;
color: black; color: #1a1a1a;
background-color: #ffffff;
}
.bi-theme-dark .CodeMirror {
color: #ffffff;
background-color: #242640;
} }
/* PADDING */ /* PADDING */
.CodeMirror-lines { .CodeMirror-lines {
@ -45,7 +50,10 @@
} }
/* CURSOR */ /* CURSOR */
.CodeMirror div.CodeMirror-cursor { .CodeMirror div.CodeMirror-cursor {
border-left: 1px solid black; border-left: 1px solid #1a1a1a;
}
.bi-theme-dark .CodeMirror div.CodeMirror-cursor {
border-left: 1px solid #ffffff;
} }
/* Shown when moving in bi-directional text */ /* Shown when moving in bi-directional text */
.CodeMirror div.CodeMirror-secondarycursor { .CodeMirror div.CodeMirror-secondarycursor {
@ -184,7 +192,7 @@
} }
.cm-s-default span[class*="fieldName"] { .cm-s-default span[class*="fieldName"] {
color: white; color: white;
padding: 1px ; padding: 1px;
margin: 1px 0px; margin: 1px 0px;
background: #3f8ce8; background: #3f8ce8;
} }
@ -236,7 +244,6 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
.CodeMirror { .CodeMirror {
position: relative; position: relative;
overflow: hidden; overflow: hidden;
background: white;
} }
.CodeMirror-scroll { .CodeMirror-scroll {
overflow: scroll !important; overflow: scroll !important;

5
src/css/base/layer/panel.css

@ -2,15 +2,10 @@
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
.bi-panel { .bi-panel {
border: 1px solid #a3d6e8;
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
} }
.bi-panel .panel-title {
background-color: #d8f2fd;
border-bottom: 1px solid #a3d6e8;
}
.bi-panel .panel-title .panel-title-text { .bi-panel .panel-title .panel-title-text {
cursor: text; cursor: text;
font-size: 14px; font-size: 14px;

2
src/css/base/single/button/button.css

@ -5,7 +5,7 @@
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
border: 1px solid #3f8ce8; border: 1px solid #178cdf;
background-color: #3f8ce8; background-color: #3f8ce8;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;

3
src/css/base/single/editor/editor.textarea.css

@ -12,6 +12,3 @@
.bi-textarea-editor .textarea-editor-content { .bi-textarea-editor .textarea-editor-content {
border: none; border: none;
} }
.bi-textarea-editor .textarea-editor-content.textarea-editor-focus {
border: 1px solid #3f8ce8;
}

31
src/css/core/utils/common.css

@ -98,11 +98,14 @@
color: #666666; color: #666666;
} }
.bi-resizer { .bi-resizer {
background: #d8f3fe; background: #1a1a1a;
opacity: 0.8; opacity: 0.2;
filter: alpha(opacity=80); filter: alpha(opacity=20);
z-index: 1000000000; z-index: 1000000000;
} }
.bi-theme-dark .bi-resizer {
background: #ffffff;
}
.bi-z-index-mask { .bi-z-index-mask {
background-color: #1a1a1a; background-color: #1a1a1a;
opacity: 0.5; opacity: 0.5;
@ -258,7 +261,7 @@
.bi-theme-dark .bi-list-item-select:hover, .bi-theme-dark .bi-list-item-select:hover,
.bi-theme-dark .bi-list-item-select.hover { .bi-theme-dark .bi-list-item-select.hover {
color: #3f8ce8; color: #3f8ce8;
background-color: #eff1f4; background-color: #191b2b;
} }
.bi-theme-dark .bi-list-item-select:active, .bi-theme-dark .bi-list-item-select:active,
.bi-theme-dark .bi-list-item-select.active { .bi-theme-dark .bi-list-item-select.active {
@ -280,3 +283,23 @@
.bi-theme-dark .bi-list-item-select.disabled:active .bi-high-light { .bi-theme-dark .bi-list-item-select.disabled:active .bi-high-light {
color: #666666 !important; color: #666666 !important;
} }
.bi-list-item-choose:active,
.bi-list-item-choose.active {
color: #ffffff;
background-color: #3f8ce8;
}
.bi-list-item-choose:active .bi-high-light,
.bi-list-item-choose.active .bi-high-light {
color: #ffffff;
}
.bi-list-item-choose.disabled,
.bi-list-item-choose.disabled:hover,
.bi-list-item-choose.disabled:active {
color: #cccccc !important;
background-color: transparent !important;
}
.bi-list-item-choose.disabled .bi-high-light,
.bi-list-item-choose.disabled:hover .bi-high-light,
.bi-list-item-choose.disabled:active .bi-high-light {
color: #cccccc !important;
}

0
src/css/resource/widget/display.tree.css → src/css/resource/third/ztree/display.tree.css

5
src/css/widget/arrangement/arrangement.block.css

@ -1,8 +1,3 @@
/****添加计算宽度的--运算符直接需要space****/ /****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
.bi-arrangement-block {
background: #e85050;
opacity: 0.8;
filter: alpha(opacity=80);
}

352
src/less/base/formula/codemirror.less

@ -6,9 +6,17 @@
/* Set height, width, borders, and global font properties here */ /* Set height, width, borders, and global font properties here */
font-family: monospace; font-family: monospace;
cursor: text; cursor: text;
// .border-radius(4px); // .border-radius(4px);
.size(100%, 100%); .size(100%, 100%);
color: black; color: @color-bi-text-black;
background-color: @color-bi-background-default;
}
.bi-theme-dark {
.CodeMirror {
color: @color-bi-text;
background-color: @color-bi-background-default-theme-dark;
}
} }
/* PADDING */ /* PADDING */
@ -16,6 +24,7 @@
.CodeMirror-lines { .CodeMirror-lines {
padding: 4px 0; /* Vertical padding around content */ padding: 4px 0; /* Vertical padding around content */
} }
.CodeMirror pre { .CodeMirror pre {
padding: 0 4px; /* Horizontal padding of content */ padding: 0 4px; /* Horizontal padding of content */
} }
@ -31,7 +40,10 @@
background-color: #f7f7f7; background-color: #f7f7f7;
white-space: nowrap; white-space: nowrap;
} }
.CodeMirror-linenumbers {}
.CodeMirror-linenumbers {
}
.CodeMirror-linenumber { .CodeMirror-linenumber {
padding: 0 3px 0 5px; padding: 0 3px 0 5px;
min-width: 20px; min-width: 20px;
@ -40,23 +52,37 @@
white-space: nowrap; white-space: nowrap;
} }
.CodeMirror-guttermarker { color: black; } .CodeMirror-guttermarker {
.CodeMirror-guttermarker-subtle { color: #999; } color: black;
}
.CodeMirror-guttermarker-subtle {
color: #999;
}
/* CURSOR */ /* CURSOR */
.CodeMirror div.CodeMirror-cursor { .CodeMirror div.CodeMirror-cursor {
border-left: 1px solid black; border-left: 1px solid @color-bi-border-black;
}
.bi-theme-dark {
.CodeMirror div.CodeMirror-cursor {
border-left: 1px solid @color-bi-border-default;
}
} }
/* Shown when moving in bi-directional text */ /* Shown when moving in bi-directional text */
.CodeMirror div.CodeMirror-secondarycursor { .CodeMirror div.CodeMirror-secondarycursor {
border-left: 1px solid silver; border-left: 1px solid silver;
} }
.CodeMirror.cm-fat-cursor div.CodeMirror-cursor { .CodeMirror.cm-fat-cursor div.CodeMirror-cursor {
width: auto; width: auto;
border: 0; border: 0;
background: #7e7; background: #7e7;
} }
.CodeMirror.cm-fat-cursor div.CodeMirror-cursors { .CodeMirror.cm-fat-cursor div.CodeMirror-cursors {
z-index: 1; z-index: 1;
} }
@ -68,26 +94,51 @@
-moz-animation: blink 1.06s steps(1) infinite; -moz-animation: blink 1.06s steps(1) infinite;
animation: blink 1.06s steps(1) infinite; animation: blink 1.06s steps(1) infinite;
} }
@-moz-keyframes blink { @-moz-keyframes blink {
0% { background: #7e7; } 0% {
50% { background: none; } background: #7e7;
100% { background: #7e7; } }
50% {
background: none;
}
100% {
background: #7e7;
}
} }
@-webkit-keyframes blink { @-webkit-keyframes blink {
0% { background: #7e7; } 0% {
50% { background: none; } background: #7e7;
100% { background: #7e7; } }
50% {
background: none;
}
100% {
background: #7e7;
}
} }
@keyframes blink { @keyframes blink {
0% { background: #7e7; } 0% {
50% { background: none; } background: #7e7;
100% { background: #7e7; } }
50% {
background: none;
}
100% {
background: #7e7;
}
} }
/* Can style cursor different in overwrite (non-insert) mode */ /* Can style cursor different in overwrite (non-insert) mode */
div.CodeMirror-overwrite div.CodeMirror-cursor {} div.CodeMirror-overwrite div.CodeMirror-cursor {
}
.cm-tab { display: inline-block; text-decoration: inherit; } .cm-tab {
display: inline-block;
text-decoration: inherit;
}
.CodeMirror-ruler { .CodeMirror-ruler {
border-left: 1px solid #ccc; border-left: 1px solid #ccc;
@ -96,73 +147,164 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}
/* DEFAULT THEME */ /* DEFAULT THEME */
.cm-s-default .cm-header {color: blue;} .cm-s-default .cm-header {
.cm-s-default .cm-quote {color: #090;} color: blue;
.cm-negative {color: #d44;} }
.cm-positive {color: #292;}
.cm-header, .cm-strong {font-weight: bold;} .cm-s-default .cm-quote {
.cm-em {font-style: italic;} color: #090;
.cm-link {text-decoration: underline;} }
.cm-strikethrough {text-decoration: line-through;}
.cm-negative {
color: #d44;
}
.cm-positive {
color: #292;
}
.cm-header, .cm-strong {
font-weight: bold;
}
.cm-em {
font-style: italic;
}
.cm-link {
text-decoration: underline;
}
.cm-strikethrough {
text-decoration: line-through;
}
//.cm-s-default .cm-keyword {color: #708;} //.cm-s-default .cm-keyword {color: #708;}
.cm-s-default .cm-atom {color: #219;} .cm-s-default .cm-atom {
.cm-s-default .cm-number {color: #164;} color: #219;
.cm-s-default .cm-def {color: #00f;} }
.cm-s-default .cm-number {
color: #164;
}
.cm-s-default .cm-def {
color: #00f;
}
.cm-s-default .cm-variable, .cm-s-default .cm-variable,
.cm-s-default .cm-punctuation, .cm-s-default .cm-punctuation,
.cm-s-default .cm-property, .cm-s-default .cm-property,
.cm-s-default .cm-operator {} .cm-s-default .cm-operator {
.cm-s-default .cm-variable-2 {color: #05a;} }
.cm-s-default .cm-variable-3 {color: #085;}
.cm-s-default .cm-comment {color: #a50;} .cm-s-default .cm-variable-2 {
.cm-s-default .cm-string {color: #a11;} color: #05a;
.cm-s-default .cm-string-2 {color: #f50;} }
.cm-s-default .cm-meta {color: #555;}
.cm-s-default .cm-qualifier {color: #555;} .cm-s-default .cm-variable-3 {
.cm-s-default .cm-builtin {color: #30a;} color: #085;
.cm-s-default .cm-bracket {color: #997;} }
.cm-s-default .cm-tag {color: #170;}
.cm-s-default .cm-attribute {color: #00c;} .cm-s-default .cm-comment {
.cm-s-default .cm-hr {color: #999;} color: #a50;
.cm-s-default .cm-link {color: #00c;} }
.cm-s-default span[class*="fieldName"]{
.cm-s-default .cm-string {
color: #a11;
}
.cm-s-default .cm-string-2 {
color: #f50;
}
.cm-s-default .cm-meta {
color: #555;
}
.cm-s-default .cm-qualifier {
color: #555;
}
.cm-s-default .cm-builtin {
color: #30a;
}
.cm-s-default .cm-bracket {
color: #997;
}
.cm-s-default .cm-tag {
color: #170;
}
.cm-s-default .cm-attribute {
color: #00c;
}
.cm-s-default .cm-hr {
color: #999;
}
.cm-s-default .cm-link {
color: #00c;
}
.cm-s-default span[class*="fieldName"] {
color: white; color: white;
padding: 1px ; padding: 1px;
margin: 1px 0px; margin: 1px 0px;
background: @color-bi-text-highlight; background: @color-bi-text-highlight;
} }
.cm-s-default span[class*="start"]{ .cm-s-default span[class*="start"] {
.border-radius(3px 0px 0px 3px); .border-radius(3px 0px 0px 3px);
margin-left :3px; margin-left: 3px;
} }
.cm-s-default span[class*="end"]{ .cm-s-default span[class*="end"] {
.border-radius(0px 3px 3px 0px); .border-radius(0px 3px 3px 0px);
margin-right :3px; margin-right: 3px;
} }
.cm-s-default span[class*="start end"]{ .cm-s-default span[class*="start end"] {
.border-radius(3px); .border-radius(3px);
} }
.cm-s-default span[class*="#"]{ .cm-s-default span[class*="#"] {
color: @color-bi-text-highlight; color: @color-bi-text-highlight;
} }
.cm-s-default .cm-error {color: #f00;} .cm-s-default .cm-error {
.cm-invalidchar {color: #f00;} color: #f00;
}
.CodeMirror-composing { border-bottom: 2px solid; } .cm-invalidchar {
color: #f00;
}
.CodeMirror-composing {
border-bottom: 2px solid;
}
/* Default styles for common addons */ /* Default styles for common addons */
div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;} div.CodeMirror span.CodeMirror-matchingbracket {
div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;} color: #0f0;
.CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); } }
.CodeMirror-activeline-background {background: #e8f2ff;}
div.CodeMirror span.CodeMirror-nonmatchingbracket {
color: #f22;
}
.CodeMirror-matchingtag {
background: rgba(255, 150, 0, .3);
}
.CodeMirror-activeline-background {
background: #e8f2ff;
}
/* STOP */ /* STOP */
@ -172,19 +314,20 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
.CodeMirror { .CodeMirror {
position: relative; position: relative;
overflow: hidden; overflow: hidden;
background: white;
} }
.CodeMirror-scroll { .CodeMirror-scroll {
overflow: scroll !important; /* Things will break if this is overridden */ overflow: scroll !important; /* Things will break if this is overridden */
/* 30px is the magic margin used to hide the element's real scrollbars */ /* 30px is the magic margin used to hide the element's real scrollbars */
/* See overflow: hidden in .CodeMirror */ /* See overflow: hidden in .CodeMirror */
margin-bottom: -30px; margin-right: -30px; margin-bottom: -30px;
margin-right: -30px;
padding-bottom: 30px; padding-bottom: 30px;
height: 100%; height: 100%;
outline: none; /* Prevent dragging from highlighting the element */ outline: none; /* Prevent dragging from highlighting the element */
position: relative; position: relative;
} }
.CodeMirror-sizer { .CodeMirror-sizer {
position: relative; position: relative;
border-right: 30px solid transparent; border-right: 30px solid transparent;
@ -198,46 +341,60 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
z-index: 6; z-index: 6;
display: none; display: none;
} }
.CodeMirror-vscrollbar { .CodeMirror-vscrollbar {
right: 0; top: 0; right: 0;
top: 0;
overflow-x: hidden; overflow-x: hidden;
overflow-y: scroll; overflow-y: scroll;
} }
.CodeMirror-hscrollbar { .CodeMirror-hscrollbar {
bottom: 0; left: 0; bottom: 0;
left: 0;
overflow-y: hidden; overflow-y: hidden;
overflow-x: scroll; overflow-x: scroll;
} }
.CodeMirror-scrollbar-filler { .CodeMirror-scrollbar-filler {
right: 0; bottom: 0; right: 0;
bottom: 0;
} }
.CodeMirror-gutter-filler { .CodeMirror-gutter-filler {
left: 0; bottom: 0; left: 0;
bottom: 0;
} }
.CodeMirror-gutters { .CodeMirror-gutters {
position: absolute; left: 0; top: 0; position: absolute;
left: 0;
top: 0;
z-index: 3; z-index: 3;
} }
.CodeMirror-gutter { .CodeMirror-gutter {
white-space: normal; white-space: normal;
height: 100%; height: 100%;
display: inline-block; display: inline-block;
margin-bottom: -30px; margin-bottom: -30px;
/* Hack to make IE7 behave */ /* Hack to make IE7 behave */
*zoom:1; *zoom: 1;
*display:inline; *display: inline;
} }
.CodeMirror-gutter-wrapper { .CodeMirror-gutter-wrapper {
position: absolute; position: absolute;
z-index: 4; z-index: 4;
height: 100%; height: 100%;
} }
.CodeMirror-gutter-elt { .CodeMirror-gutter-elt {
position: absolute; position: absolute;
cursor: default; cursor: default;
z-index: 4; z-index: 4;
} }
.CodeMirror-gutter-wrapper { .CodeMirror-gutter-wrapper {
-webkit-user-select: none; -webkit-user-select: none;
-moz-user-select: none; -moz-user-select: none;
@ -248,9 +405,12 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
cursor: text; cursor: text;
min-height: 1px; /* prevents collapsing before first draw */ min-height: 1px; /* prevents collapsing before first draw */
} }
.CodeMirror pre { .CodeMirror pre {
/* Reset some styles that the rest of the page might have set */ /* Reset some styles that the rest of the page might have set */
-moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; -moz-border-radius: 0;
-webkit-border-radius: 0;
border-radius: 0;
border-width: 0; border-width: 0;
background: transparent; background: transparent;
font-family: inherit; font-family: inherit;
@ -265,6 +425,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
overflow: visible; overflow: visible;
-webkit-tap-highlight-color: transparent; -webkit-tap-highlight-color: transparent;
} }
.CodeMirror-wrap pre { .CodeMirror-wrap pre {
word-wrap: break-word; word-wrap: break-word;
white-space: pre-wrap; white-space: pre-wrap;
@ -273,7 +434,10 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
.CodeMirror-linebackground { .CodeMirror-linebackground {
position: absolute; position: absolute;
left: 0; right: 0; top: 0; bottom: 0; left: 0;
right: 0;
top: 0;
bottom: 0;
z-index: 0; z-index: 0;
} }
@ -308,7 +472,10 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
overflow: hidden; overflow: hidden;
visibility: hidden; visibility: hidden;
} }
.CodeMirror-measure pre { position: static; }
.CodeMirror-measure pre {
position: static;
}
.CodeMirror div.CodeMirror-cursor { .CodeMirror div.CodeMirror-cursor {
position: absolute; position: absolute;
@ -321,15 +488,30 @@ div.CodeMirror-cursors {
position: relative; position: relative;
z-index: 3; z-index: 3;
} }
.CodeMirror-focused div.CodeMirror-cursors { .CodeMirror-focused div.CodeMirror-cursors {
visibility: visible; visibility: visible;
} }
.CodeMirror-selected { background: #d9d9d9; } .CodeMirror-selected {
.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; } background: #d9d9d9;
.CodeMirror-crosshair { cursor: crosshair; } }
.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection { background: #d7d4f0; }
.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { background: #d7d4f0; } .CodeMirror-focused .CodeMirror-selected {
background: #d7d4f0;
}
.CodeMirror-crosshair {
cursor: crosshair;
}
.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection {
background: #d7d4f0;
}
.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection {
background: #d7d4f0;
}
.cm-searching { .cm-searching {
background: #ffa; background: #ffa;
@ -337,10 +519,14 @@ div.CodeMirror-cursors {
} }
/* IE7 hack to prevent it from returning funny offsetTops on the spans */ /* IE7 hack to prevent it from returning funny offsetTops on the spans */
.CodeMirror span { *vertical-align: text-bottom; } .CodeMirror span {
*vertical-align: text-bottom;
}
/* Used to force a border model for a node */ /* Used to force a border model for a node */
.cm-force-border { padding-right: .1px; } .cm-force-border {
padding-right: .1px;
}
@media print { @media print {
/* Hide the cursor when printing */ /* Hide the cursor when printing */
@ -350,10 +536,14 @@ div.CodeMirror-cursors {
} }
/* See issue #2901 */ /* See issue #2901 */
.cm-tab-wrap-hack:after { content: ''; } .cm-tab-wrap-hack:after {
content: '';
}
/* Help users use markselection to safely style text background */ /* Help users use markselection to safely style text background */
span.CodeMirror-selectedtext { background: none; } span.CodeMirror-selectedtext {
background: none;
}
/*addon: show-hint*/ /*addon: show-hint*/
.CodeMirror-hints { .CodeMirror-hints {
@ -365,9 +555,9 @@ span.CodeMirror-selectedtext { background: none; }
margin: 0; margin: 0;
padding: 2px; padding: 2px;
-webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2); -webkit-box-shadow: 2px 3px 5px rgba(0, 0, 0, .2);
-moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2); -moz-box-shadow: 2px 3px 5px rgba(0, 0, 0, .2);
box-shadow: 2px 3px 5px rgba(0,0,0,.2); box-shadow: 2px 3px 5px rgba(0, 0, 0, .2);
border-radius: 3px; border-radius: 3px;
border: 1px solid silver; border: 1px solid silver;

3
src/less/base/layer/panel.less

@ -1,11 +1,8 @@
@import "../../bibase"; @import "../../bibase";
.bi-panel{ .bi-panel{
border: 1px solid @border-color-light-blue;
.border-radius(2px); .border-radius(2px);
.panel-title{ .panel-title{
background-color: @background-color-light-blue;
border-bottom: 1px solid @border-color-light-blue;
& .panel-title-text{ & .panel-title-text{
cursor: text; cursor: text;
font-size: @font-size-14; font-size: @font-size-14;

4
src/less/base/single/button/button.less

@ -2,8 +2,8 @@
.bi-button { .bi-button {
.border-radius(2px); .border-radius(2px);
border: 1px solid @color-bi-text-highlight; border: 1px solid @color-bi-border-highlight;
background-color: @color-bi-text-highlight; background-color: @color-bi-background-highlight;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
cursor: pointer; cursor: pointer;

3
src/less/base/single/editor/editor.textarea.less

@ -7,8 +7,5 @@
& { & {
border: none; border: none;
} }
&.textarea-editor-focus{
border: 1px solid @color-bi-border-outline;
}
} }
} }

31
src/less/core/utils/common.less

@ -141,11 +141,17 @@
//resize //resize
.bi-resizer { .bi-resizer {
background: @color-bi-background-virtual-blue; background: @color-bi-background-black;
.opacity(0.8); .opacity(0.2);
z-index: @zIndex-tip; z-index: @zIndex-tip;
} }
.bi-theme-dark {
.bi-resizer {
background: @color-bi-background-default;
}
}
.bi-z-index-mask { .bi-z-index-mask {
background-color: @color-bi-background-black; background-color: @color-bi-background-black;
.opacity(0.5); .opacity(0.5);
@ -337,7 +343,7 @@
.bi-list-item-select { .bi-list-item-select {
&:hover, &.hover { &:hover, &.hover {
color: @color-bi-text-highlight; color: @color-bi-text-highlight;
background-color: @color-bi-background-normal; background-color: @color-bi-background-normal-theme-dark;
} }
&:active, &.active { &:active, &.active {
color: @color-bi-text; color: @color-bi-text;
@ -356,4 +362,23 @@
} }
} }
} }
}
.bi-list-item-choose {
&:active, &.active {
color: @color-bi-text;
background-color: @color-bi-background-highlight;
& .bi-high-light {
color: @color-bi-text;
}
}
&.disabled {
&, &:hover, &:active {
color: @color-bi-text-disabled !important;
background-color: transparent !important;
& .bi-high-light {
color: @color-bi-text-disabled !important;
}
}
}
} }

7
src/less/lib/colors.less

@ -124,6 +124,10 @@
@color-target-background: @background-color-light-green; @color-target-background: @background-color-light-green;
@color-dimension-region-border: @border-color-light-blue; @color-dimension-region-border: @border-color-light-blue;
@color-target-region-border: @border-color-light-green; @color-target-region-border: @border-color-light-green;
@color-dimension-background-theme-dark: @background-color-light-blue-theme-dark;
@color-target-background-theme-dark: @background-color-light-green-theme-dark;
@color-dimension-region-border-theme-dark: @border-color-light-blue-theme-dark;
@color-target-region-border-theme-dark: @border-color-light-green-theme-dark;
//etl operator //etl operator
@color-etl-operator: @background-color-light-blue; @color-etl-operator: @background-color-light-blue;
@ -151,8 +155,7 @@
@color-login-info-fields-group-background: @background-color-light-blue; @color-login-info-fields-group-background: @background-color-light-blue;
//mask颜色 //mask颜色
@color-bi-button-mask : @color-bi-background-black; @color-bi-button-mask: @color-bi-background-black;
// 数据连接底色 10种 --start-- // 数据连接底色 10种 --start--
@color-bi-data-link-button-color1: @data-link-color1; @color-bi-data-link-button-color1: @data-link-color1;

38
src/less/lib/constant.less

@ -15,15 +15,15 @@
@opacity-20: 0.2; @opacity-20: 0.2;
//font color //font color
@font-color-black: #1a1a1a; @font-color-black: #1a1a1a;//
@font-color-normal: #666666; @font-color-normal: #666666;//
@font-color-normal-theme-dark: #cccccc; @font-color-normal-theme-dark: #cccccc;//
@font-color-disabled: #cccccc; @font-color-disabled: #cccccc;//
@font-color-disabled-theme-dark: #666666; @font-color-disabled-theme-dark: #666666;//
@font-color-tips: #999999; @font-color-tips: #999999;//
@font-color-dark: #d4dadd; @font-color-dark: #d4dadd;
@font-color-gray: #999999; @font-color-gray: #999999;
@font-color-white: #ffffff; @font-color-white: #ffffff;//
@font-color-highlight: #3f8ce8; @font-color-highlight: #3f8ce8;
@font-color-success: #0c6d23; @font-color-success: #0c6d23;
@font-color-warning: #e85050; @font-color-warning: #e85050;
@ -36,19 +36,23 @@
@icon-color-active: #3f8ce8; @icon-color-active: #3f8ce8;
//background color //background color
@background-color-black: #1a1a1a; @background-color-black: #1a1a1a;//
@background-color-light: #eaeaea; @background-color-light: #eaeaea;
@background-color-default: #ffffff; @background-color-default: #ffffff;//
@background-color-default-theme-dark: #242640; @background-color-default-theme-dark: #242640;//
@background-color-normal: #eff1f4; @background-color-normal: #eff1f4;//
@background-color-normal-theme-dark: #191B2B; @background-color-normal-theme-dark: #191B2B;//
@background-color-active: #f4f4f4; @background-color-active: #f4f4f4;
@background-color-highlight: #3f8ce8; @background-color-highlight: #3f8ce8;
@background-color-dark: #d4dadd; @background-color-dark: #d4dadd;
@background-color-disabled: #c4c6c6; @background-color-disabled: #c4c6c6;
@background-color-alert: #fddddd; @background-color-alert: #fddddd;
@background-color-light-blue: #d8f2fd;
@background-color-light-green: #e1f4e7; @background-color-light-blue: #d8f2fd;//
@background-color-light-green: #e1f4e7;//
@background-color-light-blue-theme-dark: #008ae9;//
@background-color-light-green-theme-dark: #04b1c2;//
@background-color-orange: #fef6de; @background-color-orange: #fef6de;
@background-color-green: #eefbff; @background-color-green: #eefbff;
@background-color-yellow: #f9a744; @background-color-yellow: #f9a744;
@ -78,8 +82,10 @@
@border-color-error: #f4cbcb; @border-color-error: #f4cbcb;
@border-color-normal-success: #eddea2; @border-color-normal-success: #eddea2;
@border-color-light-blue: #a3d6e8; @border-color-light-blue: #d8f2fd;//
@border-color-light-green: #9fd3ae; @border-color-light-green: #e1f4e7;//
@border-color-light-blue-theme-dark: #008ae9;//
@border-color-light-green-theme-dark: #04b1c2;//
@border-color-dark: #c4c6c6; @border-color-dark: #c4c6c6;

2
src/less/resource/widget/display.tree.less → src/less/resource/third/ztree/display.tree.less

@ -1,4 +1,4 @@
@import "../../bibase"; @import "../../../bibase";
.bi-display-tree{ .bi-display-tree{
.ztree * { .ztree * {

4
src/less/widget/arrangement/arrangement.block.less

@ -1,6 +1,4 @@
@import "../../bibase"; @import "../../bibase";
.bi-arrangement-block{ .bi-arrangement-block {
background:@color-bi-background-failure;
.opacity(0.8);
} }

2
src/widget/arrangement/arrangement.block.js

@ -9,7 +9,7 @@ BI.ArrangementBlock = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.ArrangementBlock.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.ArrangementBlock.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-arrangement-block" baseCls: "bi-arrangement-block bi-resizer"
}); });
}, },

Loading…
Cancel
Save