Frank
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

主题

es6
guy 8 years ago
parent
6a3e117427
commit
b59d7dd643
31 changed files with 294 additions and 128 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 54
      bi/base.css
  2. 2
      bi/case.js
  3. 24
      bi/core.css
  4. 20
      bi/core.js
  5. 54
      docs/base.css
  6. 2
      docs/case.js
  7. 24
      docs/core.css
  8. 20
      docs/core.js
  9. 2
      docs/resource.css
  10. 2
      src/case/colorchooser/colorchooser.popup.js
  11. 20
      src/core/func/function.js
  12. 7
      src/css/base/colorchooser/colorchooser.popup.css
  13. 8
      src/css/base/foundation/bi.message.css
  14. 3
      src/css/base/layer/layer.panel.css
  15. 24
      src/css/base/table/table.grid.scrollbar.css
  16. 10
      src/css/base/view/floatboxview.css
  17. 2
      src/css/base/view/popupview.css
  18. 24
      src/css/core/utils/common.css
  19. 2
      src/css/resource/app.css
  20. 12
      src/less/base/colorchooser/colorchooser.popup.less
  21. 16
      src/less/base/foundation/bi.message.less
  22. 8
      src/less/base/layer/layer.panel.less
  23. 32
      src/less/base/table/table.grid.scrollbar.less
  24. 14
      src/less/base/view/floatboxview.less
  25. 2
      src/less/base/view/popupview.less
  26. 2
      src/less/core/utils/common.less
  27. 7
      src/less/lib/colors.less
  28. 5
      src/less/lib/constant.less
  29. 4
      src/less/resource/app.less
  30. 2
      src/less/theme/dark.less
  31. 2
      src/less/widget/multiselect/trigger/button.checkselected.less

54
bi/base.css
Unescape View File

@ -11,8 +11,11 @@
.bi-color-chooser-popup .color-chooser-popup-more { .bi-color-chooser-popup .color-chooser-popup-more {
background: #f4f4f4; background: #f4f4f4;
} }
.bi-color-chooser-popup .color-chooser-popup-more:hover { .bi-theme-dark .bi-color-chooser-popup .color-chooser-popup-title {
background: #d4dadd; background: #191a2c;
}
.bi-theme-dark .bi-color-chooser-popup .color-chooser-popup-more {
background: #191a2c;
} }
/****添加计算宽度的--运算符直接需要space****/ /****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
@ -667,6 +670,10 @@ li.CodeMirror-hint-active {
font-size: 16px; font-size: 16px;
cursor: pointer; cursor: pointer;
} }
.bi-theme-dark .bi-message-title {
background-color: #191a2c;
color: #b2b2b2;
}
.bi-message-text { .bi-message-text {
font-size: 16px; font-size: 16px;
-webkit-user-select: text; -webkit-user-select: text;
@ -681,6 +688,10 @@ li.CodeMirror-hint-active {
color: #808080; color: #808080;
font-size: 16px; font-size: 16px;
} }
.bi-theme-dark .bi-message-content {
background-color: #202237;
color: #b2b2b2;
}
.bi-message-close { .bi-message-close {
font-size: 25px; font-size: 25px;
} }
@ -698,6 +709,9 @@ li.CodeMirror-hint-active {
background: #f4f4f4; background: #f4f4f4;
border-bottom: 1px solid #d4dadd; border-bottom: 1px solid #d4dadd;
} }
.bi-theme-dark .bi-popup-panel .popup-panel-title {
background: #191a2c;
}
/****添加计算宽度的--运算符直接需要space****/ /****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
@ -1176,6 +1190,9 @@ li.CodeMirror-hint-active {
.bi-grid-table-cell.first-col { .bi-grid-table-cell.first-col {
border-left: 1px solid #eaeaea; border-left: 1px solid #eaeaea;
} }
/****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/
.scrollbar-layout-main { .scrollbar-layout-main {
box-sizing: border-box; box-sizing: border-box;
outline: none; outline: none;
@ -1184,10 +1201,13 @@ li.CodeMirror-hint-active {
transition-duration: 250ms; transition-duration: 250ms;
transition-timing-function: ease; transition-timing-function: ease;
user-select: none; user-select: none;
background-color: rgba(0, 0, 0, 0.1); background-color: #f4f4f4;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19000000,endColorstr=#19000000);
border-radius: 5px; border-radius: 5px;
} }
.bi-theme-dark .scrollbar-layout-main {
background-color: rgba(255, 255, 255, 0.1);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19ffffff,endColorstr=#19ffffff);
}
.scrollbar-layout-main-vertical { .scrollbar-layout-main-vertical {
bottom: 0; bottom: 0;
right: 0; right: 0;
@ -1204,8 +1224,11 @@ li.CodeMirror-hint-active {
height: 10px; height: 10px;
left: 0; left: 0;
transition-property: background-color; transition-property: background-color;
background-color: rgba(0, 0, 0, 0.1); background-color: #f4f4f4;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19000000,endColorstr=#19000000); }
.bi-theme-dark .scrollbar-layout-main-horizontal {
background-color: rgba(255, 255, 255, 0.1);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19ffffff,endColorstr=#19ffffff);
} }
/* Touching the scroll-track directly makes the scroll-track bolder */ /* Touching the scroll-track directly makes the scroll-track bolder */
.scrollbar-layout-main-horizontal.public-scrollbar-main-active, .scrollbar-layout-main-horizontal.public-scrollbar-main-active,
@ -1258,7 +1281,7 @@ li.CodeMirror-hint-active {
*/ */
/* Touching the scroll-track directly makes the scroll-track bolder */ /* Touching the scroll-track directly makes the scroll-track bolder */
.public-scrollbar-face:after { .public-scrollbar-face:after {
background-color: #c2c2c2; background-color: #e2e2e2;
} }
.bi-theme-dark .public-scrollbar-face:after { .bi-theme-dark .public-scrollbar-face:after {
background-color: #7d7d7d; background-color: #7d7d7d;
@ -1271,15 +1294,12 @@ li.CodeMirror-hint-active {
.bi-theme-dark .public-scrollbar-main:hover .public-scrollbar-face:after, .bi-theme-dark .public-scrollbar-main:hover .public-scrollbar-face:after,
.bi-theme-dark .public-scrollbar-main-active .public-scrollbar-face:after, .bi-theme-dark .public-scrollbar-main-active .public-scrollbar-face:after,
.bi-theme-dark .public-scrollbar-faceActive:after { .bi-theme-dark .public-scrollbar-faceActive:after {
background-color: #c2c2c2; background-color: #e2e2e2;
} }
.horizontal-scrollbar { .horizontal-scrollbar {
bottom: 0; bottom: 0;
position: absolute; position: absolute;
} }
.horizontal-scrollbar .public-scrollbar-main-horizontal {
background-color: #fff;
}
/****添加计算宽度的--运算符直接需要space****/ /****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
@ -1389,12 +1409,12 @@ li.CodeMirror-hint-active {
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
.bi-float-box { .bi-float-box {
background: #ffffff; background-color: #ffffff;
color: #1a1a1a;
} }
.bi-float-box .float-box-button { .bi-theme-dark .bi-float-box {
color: #ffffff; background-color: #202237;
background: #009de3; color: #b2b2b2;
border: 1px solid #d4dadd;
} }
/****添加计算宽度的--运算符直接需要space****/ /****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
@ -1428,5 +1448,5 @@ li.CodeMirror-hint-active {
} }
.bi-theme-dark .bi-list-view .list-view-outer { .bi-theme-dark .bi-list-view .list-view-outer {
color: #b2b2b2; color: #b2b2b2;
background: #191a2c; background: #202237;
} }

2
bi/case.js
Unescape View File

@ -2479,7 +2479,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
el: { el: {
type: "bi.text_item", type: "bi.text_item",
cls: "color-chooser-popup-more", cls: "color-chooser-popup-more bi-list-item",
textAlign: "center", textAlign: "center",
height: 20, height: 20,
text: BI.i18nText("BI-Basic_More") + "..." text: BI.i18nText("BI-Basic_More") + "..."

24
bi/core.css
Unescape View File

@ -3062,29 +3062,29 @@
.bi-list-item-select.disabled:active .bi-high-light { .bi-list-item-select.disabled:active .bi-high-light {
color: #c4c6c6 !important; color: #c4c6c6 !important;
} }
.bi-theme-dark .list-item-select:hover, .bi-theme-dark .bi-list-item-select:hover,
.bi-theme-dark .list-item-select.hover { .bi-theme-dark .bi-list-item-select.hover {
color: #009de3; color: #009de3;
background-color: #04070d; background-color: #04070d;
} }
.bi-theme-dark .list-item-select:active, .bi-theme-dark .bi-list-item-select:active,
.bi-theme-dark .list-item-select.active { .bi-theme-dark .bi-list-item-select.active {
color: #ffffff; color: #ffffff;
background-color: #009de3; background-color: #009de3;
} }
.bi-theme-dark .list-item-select:active .bi-high-light, .bi-theme-dark .bi-list-item-select:active .bi-high-light,
.bi-theme-dark .list-item-select.active .bi-high-light { .bi-theme-dark .bi-list-item-select.active .bi-high-light {
color: #ffffff; color: #ffffff;
} }
.bi-theme-dark .list-item-select.disabled, .bi-theme-dark .bi-list-item-select.disabled,
.bi-theme-dark .list-item-select.disabled:hover, .bi-theme-dark .bi-list-item-select.disabled:hover,
.bi-theme-dark .list-item-select.disabled:active { .bi-theme-dark .bi-list-item-select.disabled:active {
color: #c4c6c6 !important; color: #c4c6c6 !important;
background-color: transparent !important; background-color: transparent !important;
} }
.bi-theme-dark .list-item-select.disabled .bi-high-light, .bi-theme-dark .bi-list-item-select.disabled .bi-high-light,
.bi-theme-dark .list-item-select.disabled:hover .bi-high-light, .bi-theme-dark .bi-list-item-select.disabled:hover .bi-high-light,
.bi-theme-dark .list-item-select.disabled:active .bi-high-light { .bi-theme-dark .bi-list-item-select.disabled:active .bi-high-light {
color: #c4c6c6 !important; color: #c4c6c6 !important;
} }
/*****************cursor*****************/ /*****************cursor*****************/

20
bi/core.js
Unescape View File

@ -17007,6 +17007,24 @@ $(function () {
}); });
}, },
isColor: function (color) {
return this.isRGBColor(color) || this.isHexColor(color);
},
isRGBColor: function (color) {
if (!color) {
return false;
}
return color.substr(0, 3) === "rgb";
},
isHexColor: function (color) {
if (!color) {
return false;
}
return color[0] === "#" && color.length === 7;
},
isDarkColor: function (hex) { isDarkColor: function (hex) {
if (!hex) { if (!hex) {
return false; return false;
@ -17022,7 +17040,7 @@ $(function () {
//获取对比颜色 //获取对比颜色
getContrastColor: function (color) { getContrastColor: function (color) {
if (this.isDarkColor(color)) { if (this.isDarkColor(color)) {
return "#ffffff"; return "#b2b2b2";
} }
return "#1a1a1a"; return "#1a1a1a";
}, },

54
docs/base.css
Unescape View File

@ -11,8 +11,11 @@
.bi-color-chooser-popup .color-chooser-popup-more { .bi-color-chooser-popup .color-chooser-popup-more {
background: #f4f4f4; background: #f4f4f4;
} }
.bi-color-chooser-popup .color-chooser-popup-more:hover { .bi-theme-dark .bi-color-chooser-popup .color-chooser-popup-title {
background: #d4dadd; background: #191a2c;
}
.bi-theme-dark .bi-color-chooser-popup .color-chooser-popup-more {
background: #191a2c;
} }
/****添加计算宽度的--运算符直接需要space****/ /****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
@ -667,6 +670,10 @@ li.CodeMirror-hint-active {
font-size: 16px; font-size: 16px;
cursor: pointer; cursor: pointer;
} }
.bi-theme-dark .bi-message-title {
background-color: #191a2c;
color: #b2b2b2;
}
.bi-message-text { .bi-message-text {
font-size: 16px; font-size: 16px;
-webkit-user-select: text; -webkit-user-select: text;
@ -681,6 +688,10 @@ li.CodeMirror-hint-active {
color: #808080; color: #808080;
font-size: 16px; font-size: 16px;
} }
.bi-theme-dark .bi-message-content {
background-color: #202237;
color: #b2b2b2;
}
.bi-message-close { .bi-message-close {
font-size: 25px; font-size: 25px;
} }
@ -698,6 +709,9 @@ li.CodeMirror-hint-active {
background: #f4f4f4; background: #f4f4f4;
border-bottom: 1px solid #d4dadd; border-bottom: 1px solid #d4dadd;
} }
.bi-theme-dark .bi-popup-panel .popup-panel-title {
background: #191a2c;
}
/****添加计算宽度的--运算符直接需要space****/ /****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
@ -1176,6 +1190,9 @@ li.CodeMirror-hint-active {
.bi-grid-table-cell.first-col { .bi-grid-table-cell.first-col {
border-left: 1px solid #eaeaea; border-left: 1px solid #eaeaea;
} }
/****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/
.scrollbar-layout-main { .scrollbar-layout-main {
box-sizing: border-box; box-sizing: border-box;
outline: none; outline: none;
@ -1184,10 +1201,13 @@ li.CodeMirror-hint-active {
transition-duration: 250ms; transition-duration: 250ms;
transition-timing-function: ease; transition-timing-function: ease;
user-select: none; user-select: none;
background-color: rgba(0, 0, 0, 0.1); background-color: #f4f4f4;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19000000,endColorstr=#19000000);
border-radius: 5px; border-radius: 5px;
} }
.bi-theme-dark .scrollbar-layout-main {
background-color: rgba(255, 255, 255, 0.1);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19ffffff,endColorstr=#19ffffff);
}
.scrollbar-layout-main-vertical { .scrollbar-layout-main-vertical {
bottom: 0; bottom: 0;
right: 0; right: 0;
@ -1204,8 +1224,11 @@ li.CodeMirror-hint-active {
height: 10px; height: 10px;
left: 0; left: 0;
transition-property: background-color; transition-property: background-color;
background-color: rgba(0, 0, 0, 0.1); background-color: #f4f4f4;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19000000,endColorstr=#19000000); }
.bi-theme-dark .scrollbar-layout-main-horizontal {
background-color: rgba(255, 255, 255, 0.1);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19ffffff,endColorstr=#19ffffff);
} }
/* Touching the scroll-track directly makes the scroll-track bolder */ /* Touching the scroll-track directly makes the scroll-track bolder */
.scrollbar-layout-main-horizontal.public-scrollbar-main-active, .scrollbar-layout-main-horizontal.public-scrollbar-main-active,
@ -1258,7 +1281,7 @@ li.CodeMirror-hint-active {
*/ */
/* Touching the scroll-track directly makes the scroll-track bolder */ /* Touching the scroll-track directly makes the scroll-track bolder */
.public-scrollbar-face:after { .public-scrollbar-face:after {
background-color: #c2c2c2; background-color: #e2e2e2;
} }
.bi-theme-dark .public-scrollbar-face:after { .bi-theme-dark .public-scrollbar-face:after {
background-color: #7d7d7d; background-color: #7d7d7d;
@ -1271,15 +1294,12 @@ li.CodeMirror-hint-active {
.bi-theme-dark .public-scrollbar-main:hover .public-scrollbar-face:after, .bi-theme-dark .public-scrollbar-main:hover .public-scrollbar-face:after,
.bi-theme-dark .public-scrollbar-main-active .public-scrollbar-face:after, .bi-theme-dark .public-scrollbar-main-active .public-scrollbar-face:after,
.bi-theme-dark .public-scrollbar-faceActive:after { .bi-theme-dark .public-scrollbar-faceActive:after {
background-color: #c2c2c2; background-color: #e2e2e2;
} }
.horizontal-scrollbar { .horizontal-scrollbar {
bottom: 0; bottom: 0;
position: absolute; position: absolute;
} }
.horizontal-scrollbar .public-scrollbar-main-horizontal {
background-color: #fff;
}
/****添加计算宽度的--运算符直接需要space****/ /****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
@ -1389,12 +1409,12 @@ li.CodeMirror-hint-active {
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
.bi-float-box { .bi-float-box {
background: #ffffff; background-color: #ffffff;
color: #1a1a1a;
} }
.bi-float-box .float-box-button { .bi-theme-dark .bi-float-box {
color: #ffffff; background-color: #202237;
background: #009de3; color: #b2b2b2;
border: 1px solid #d4dadd;
} }
/****添加计算宽度的--运算符直接需要space****/ /****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
@ -1428,5 +1448,5 @@ li.CodeMirror-hint-active {
} }
.bi-theme-dark .bi-list-view .list-view-outer { .bi-theme-dark .bi-list-view .list-view-outer {
color: #b2b2b2; color: #b2b2b2;
background: #191a2c; background: #202237;
} }

2
docs/case.js
Unescape View File

@ -2479,7 +2479,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
el: { el: {
type: "bi.text_item", type: "bi.text_item",
cls: "color-chooser-popup-more", cls: "color-chooser-popup-more bi-list-item",
textAlign: "center", textAlign: "center",
height: 20, height: 20,
text: BI.i18nText("BI-Basic_More") + "..." text: BI.i18nText("BI-Basic_More") + "..."

24
docs/core.css
Unescape View File

@ -3062,29 +3062,29 @@
.bi-list-item-select.disabled:active .bi-high-light { .bi-list-item-select.disabled:active .bi-high-light {
color: #c4c6c6 !important; color: #c4c6c6 !important;
} }
.bi-theme-dark .list-item-select:hover, .bi-theme-dark .bi-list-item-select:hover,
.bi-theme-dark .list-item-select.hover { .bi-theme-dark .bi-list-item-select.hover {
color: #009de3; color: #009de3;
background-color: #04070d; background-color: #04070d;
} }
.bi-theme-dark .list-item-select:active, .bi-theme-dark .bi-list-item-select:active,
.bi-theme-dark .list-item-select.active { .bi-theme-dark .bi-list-item-select.active {
color: #ffffff; color: #ffffff;
background-color: #009de3; background-color: #009de3;
} }
.bi-theme-dark .list-item-select:active .bi-high-light, .bi-theme-dark .bi-list-item-select:active .bi-high-light,
.bi-theme-dark .list-item-select.active .bi-high-light { .bi-theme-dark .bi-list-item-select.active .bi-high-light {
color: #ffffff; color: #ffffff;
} }
.bi-theme-dark .list-item-select.disabled, .bi-theme-dark .bi-list-item-select.disabled,
.bi-theme-dark .list-item-select.disabled:hover, .bi-theme-dark .bi-list-item-select.disabled:hover,
.bi-theme-dark .list-item-select.disabled:active { .bi-theme-dark .bi-list-item-select.disabled:active {
color: #c4c6c6 !important; color: #c4c6c6 !important;
background-color: transparent !important; background-color: transparent !important;
} }
.bi-theme-dark .list-item-select.disabled .bi-high-light, .bi-theme-dark .bi-list-item-select.disabled .bi-high-light,
.bi-theme-dark .list-item-select.disabled:hover .bi-high-light, .bi-theme-dark .bi-list-item-select.disabled:hover .bi-high-light,
.bi-theme-dark .list-item-select.disabled:active .bi-high-light { .bi-theme-dark .bi-list-item-select.disabled:active .bi-high-light {
color: #c4c6c6 !important; color: #c4c6c6 !important;
} }
/*****************cursor*****************/ /*****************cursor*****************/

20
docs/core.js
Unescape View File

@ -22631,6 +22631,24 @@ $(function () {
}); });
}, },
isColor: function (color) {
return this.isRGBColor(color) || this.isHexColor(color);
},
isRGBColor: function (color) {
if (!color) {
return false;
}
return color.substr(0, 3) === "rgb";
},
isHexColor: function (color) {
if (!color) {
return false;
}
return color[0] === "#" && color.length === 7;
},
isDarkColor: function (hex) { isDarkColor: function (hex) {
if (!hex) { if (!hex) {
return false; return false;
@ -22646,7 +22664,7 @@ $(function () {
//获取对比颜色 //获取对比颜色
getContrastColor: function (color) { getContrastColor: function (color) {
if (this.isDarkColor(color)) { if (this.isDarkColor(color)) {
return "#ffffff"; return "#b2b2b2";
} }
return "#1a1a1a"; return "#1a1a1a";
}, },

2
docs/resource.css
Unescape View File

@ -109,7 +109,7 @@ textarea::-webkit-scrollbar-thumb {
.bi-theme-dark div::-webkit-scrollbar, .bi-theme-dark div::-webkit-scrollbar,
.bi-theme-dark textarea::-webkit-scrollbar { .bi-theme-dark textarea::-webkit-scrollbar {
-webkit-appearance: none; -webkit-appearance: none;
background-color: #191a2c; background-color: rgba(255, 255, 255, 0.1);
width: 6px; width: 6px;
height: 6px; height: 6px;
} }

2
src/case/colorchooser/colorchooser.popup.js
Unescape View File

@ -94,7 +94,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
el: { el: {
type: "bi.text_item", type: "bi.text_item",
cls: "color-chooser-popup-more", cls: "color-chooser-popup-more bi-list-item",
textAlign: "center", textAlign: "center",
height: 20, height: 20,
text: BI.i18nText("BI-Basic_More") + "..." text: BI.i18nText("BI-Basic_More") + "..."

20
src/core/func/function.js
Unescape View File

@ -105,6 +105,24 @@ $(function () {
}); });
}, },
isColor: function (color) {
return this.isRGBColor(color) || this.isHexColor(color);
},
isRGBColor: function (color) {
if (!color) {
return false;
}
return color.substr(0, 3) === "rgb";
},
isHexColor: function (color) {
if (!color) {
return false;
}
return color[0] === "#" && color.length === 7;
},
isDarkColor: function (hex) { isDarkColor: function (hex) {
if (!hex) { if (!hex) {
return false; return false;
@ -120,7 +138,7 @@ $(function () {
//获取对比颜色 //获取对比颜色
getContrastColor: function (color) { getContrastColor: function (color) {
if (this.isDarkColor(color)) { if (this.isDarkColor(color)) {
return "#ffffff"; return "#b2b2b2";
} }
return "#1a1a1a"; return "#1a1a1a";
}, },

7
src/css/base/colorchooser/colorchooser.popup.css
Unescape View File

@ -8,6 +8,9 @@
.bi-color-chooser-popup .color-chooser-popup-more { .bi-color-chooser-popup .color-chooser-popup-more {
background: #f4f4f4; background: #f4f4f4;
} }
.bi-color-chooser-popup .color-chooser-popup-more:hover { .bi-theme-dark .bi-color-chooser-popup .color-chooser-popup-title {
background: #d4dadd; background: #191a2c;
}
.bi-theme-dark .bi-color-chooser-popup .color-chooser-popup-more {
background: #191a2c;
} }

8
src/css/base/foundation/bi.message.css
Unescape View File

@ -12,6 +12,10 @@
font-size: 16px; font-size: 16px;
cursor: pointer; cursor: pointer;
} }
.bi-theme-dark .bi-message-title {
background-color: #191a2c;
color: #b2b2b2;
}
.bi-message-text { .bi-message-text {
font-size: 16px; font-size: 16px;
-webkit-user-select: text; -webkit-user-select: text;
@ -26,6 +30,10 @@
color: #808080; color: #808080;
font-size: 16px; font-size: 16px;
} }
.bi-theme-dark .bi-message-content {
background-color: #202237;
color: #b2b2b2;
}
.bi-message-close { .bi-message-close {
font-size: 25px; font-size: 25px;
} }

3
src/css/base/layer/layer.panel.css
Unescape View File

@ -5,3 +5,6 @@
background: #f4f4f4; background: #f4f4f4;
border-bottom: 1px solid #d4dadd; border-bottom: 1px solid #d4dadd;
} }
.bi-theme-dark .bi-popup-panel .popup-panel-title {
background: #191a2c;
}

24
src/css/base/table/table.grid.scrollbar.css
Unescape View File

@ -1,3 +1,6 @@
/****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/
.scrollbar-layout-main { .scrollbar-layout-main {
box-sizing: border-box; box-sizing: border-box;
outline: none; outline: none;
@ -6,10 +9,13 @@
transition-duration: 250ms; transition-duration: 250ms;
transition-timing-function: ease; transition-timing-function: ease;
user-select: none; user-select: none;
background-color: rgba(0, 0, 0, 0.1); background-color: #f4f4f4;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19000000,endColorstr=#19000000);
border-radius: 5px; border-radius: 5px;
} }
.bi-theme-dark .scrollbar-layout-main {
background-color: rgba(255, 255, 255, 0.1);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19ffffff,endColorstr=#19ffffff);
}
.scrollbar-layout-main-vertical { .scrollbar-layout-main-vertical {
bottom: 0; bottom: 0;
right: 0; right: 0;
@ -26,8 +32,11 @@
height: 10px; height: 10px;
left: 0; left: 0;
transition-property: background-color; transition-property: background-color;
background-color: rgba(0, 0, 0, 0.1); background-color: #f4f4f4;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19000000,endColorstr=#19000000); }
.bi-theme-dark .scrollbar-layout-main-horizontal {
background-color: rgba(255, 255, 255, 0.1);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19ffffff,endColorstr=#19ffffff);
} }
/* Touching the scroll-track directly makes the scroll-track bolder */ /* Touching the scroll-track directly makes the scroll-track bolder */
.scrollbar-layout-main-horizontal.public-scrollbar-main-active, .scrollbar-layout-main-horizontal.public-scrollbar-main-active,
@ -80,7 +89,7 @@
*/ */
/* Touching the scroll-track directly makes the scroll-track bolder */ /* Touching the scroll-track directly makes the scroll-track bolder */
.public-scrollbar-face:after { .public-scrollbar-face:after {
background-color: #c2c2c2; background-color: #e2e2e2;
} }
.bi-theme-dark .public-scrollbar-face:after { .bi-theme-dark .public-scrollbar-face:after {
background-color: #7d7d7d; background-color: #7d7d7d;
@ -93,12 +102,9 @@
.bi-theme-dark .public-scrollbar-main:hover .public-scrollbar-face:after, .bi-theme-dark .public-scrollbar-main:hover .public-scrollbar-face:after,
.bi-theme-dark .public-scrollbar-main-active .public-scrollbar-face:after, .bi-theme-dark .public-scrollbar-main-active .public-scrollbar-face:after,
.bi-theme-dark .public-scrollbar-faceActive:after { .bi-theme-dark .public-scrollbar-faceActive:after {
background-color: #c2c2c2; background-color: #e2e2e2;
} }
.horizontal-scrollbar { .horizontal-scrollbar {
bottom: 0; bottom: 0;
position: absolute; position: absolute;
} }
.horizontal-scrollbar .public-scrollbar-main-horizontal {
background-color: #fff;
}

10
src/css/base/view/floatboxview.css
Unescape View File

@ -2,10 +2,10 @@
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
.bi-float-box { .bi-float-box {
background: #ffffff; background-color: #ffffff;
color: #1a1a1a;
} }
.bi-float-box .float-box-button { .bi-theme-dark .bi-float-box {
color: #ffffff; background-color: #202237;
background: #009de3; color: #b2b2b2;
border: 1px solid #d4dadd;
} }

2
src/css/base/view/popupview.css
Unescape View File

@ -30,5 +30,5 @@
} }
.bi-theme-dark .bi-list-view .list-view-outer { .bi-theme-dark .bi-list-view .list-view-outer {
color: #b2b2b2; color: #b2b2b2;
background: #191a2c; background: #202237;
} }

24
src/css/core/utils/common.css
Unescape View File

@ -160,28 +160,28 @@
.bi-list-item-select.disabled:active .bi-high-light { .bi-list-item-select.disabled:active .bi-high-light {
color: #c4c6c6 !important; color: #c4c6c6 !important;
} }
.bi-theme-dark .list-item-select:hover, .bi-theme-dark .bi-list-item-select:hover,
.bi-theme-dark .list-item-select.hover { .bi-theme-dark .bi-list-item-select.hover {
color: #009de3; color: #009de3;
background-color: #04070d; background-color: #04070d;
} }
.bi-theme-dark .list-item-select:active, .bi-theme-dark .bi-list-item-select:active,
.bi-theme-dark .list-item-select.active { .bi-theme-dark .bi-list-item-select.active {
color: #ffffff; color: #ffffff;
background-color: #009de3; background-color: #009de3;
} }
.bi-theme-dark .list-item-select:active .bi-high-light, .bi-theme-dark .bi-list-item-select:active .bi-high-light,
.bi-theme-dark .list-item-select.active .bi-high-light { .bi-theme-dark .bi-list-item-select.active .bi-high-light {
color: #ffffff; color: #ffffff;
} }
.bi-theme-dark .list-item-select.disabled, .bi-theme-dark .bi-list-item-select.disabled,
.bi-theme-dark .list-item-select.disabled:hover, .bi-theme-dark .bi-list-item-select.disabled:hover,
.bi-theme-dark .list-item-select.disabled:active { .bi-theme-dark .bi-list-item-select.disabled:active {
color: #c4c6c6 !important; color: #c4c6c6 !important;
background-color: transparent !important; background-color: transparent !important;
} }
.bi-theme-dark .list-item-select.disabled .bi-high-light, .bi-theme-dark .bi-list-item-select.disabled .bi-high-light,
.bi-theme-dark .list-item-select.disabled:hover .bi-high-light, .bi-theme-dark .bi-list-item-select.disabled:hover .bi-high-light,
.bi-theme-dark .list-item-select.disabled:active .bi-high-light { .bi-theme-dark .bi-list-item-select.disabled:active .bi-high-light {
color: #c4c6c6 !important; color: #c4c6c6 !important;
} }

2
src/css/resource/app.css
Unescape View File

@ -109,7 +109,7 @@ textarea::-webkit-scrollbar-thumb {
.bi-theme-dark div::-webkit-scrollbar, .bi-theme-dark div::-webkit-scrollbar,
.bi-theme-dark textarea::-webkit-scrollbar { .bi-theme-dark textarea::-webkit-scrollbar {
-webkit-appearance: none; -webkit-appearance: none;
background-color: #191a2c; background-color: rgba(255, 255, 255, 0.1);
width: 6px; width: 6px;
height: 6px; height: 6px;
} }

12
src/less/base/colorchooser/colorchooser.popup.less
Unescape View File

@ -7,8 +7,16 @@
} }
& .color-chooser-popup-more { & .color-chooser-popup-more {
background: @color-bi-background-gray; background: @color-bi-background-gray;
&:hover{ }
background: @color-bi-background-dark; }
.bi-theme-dark {
.bi-color-chooser-popup {
& .color-chooser-popup-title {
background: @color-bi-background-normal-theme-dark;
}
& .color-chooser-popup-more {
background: @color-bi-background-normal-theme-dark;
} }
} }
} }

16
src/less/base/foundation/bi.message.less
Unescape View File

@ -11,16 +11,32 @@
font-size: 16px; font-size: 16px;
cursor: pointer; cursor: pointer;
} }
.bi-theme-dark {
.bi-message-title {
background-color: @color-bi-background-normal-theme-dark;
color: @color-bi-text-theme-dark;
}
}
.bi-message-text { .bi-message-text {
font-size: 16px; font-size: 16px;
.user-select(text); .user-select(text);
} }
.bi-message-content { .bi-message-content {
background-color: @color-bi-background-default; background-color: @color-bi-background-default;
color: @color-bi-text-gray; color: @color-bi-text-gray;
font-size: 16px; font-size: 16px;
} }
.bi-theme-dark {
.bi-message-content {
background-color: @color-bi-background-default-theme-dark;
color: @color-bi-text-theme-dark;
}
}
.bi-message-close { .bi-message-close {
font-size: 25px; font-size: 25px;
} }

8
src/less/base/layer/layer.panel.less
Unescape View File

@ -6,3 +6,11 @@
border-bottom: 1px solid @color-bi-split-dark; border-bottom: 1px solid @color-bi-split-dark;
} }
} }
.bi-theme-dark {
.bi-popup-panel {
& .popup-panel-title {
background: @color-bi-background-normal-theme-dark;
}
}
}

32
src/less/base/table/table.grid.scrollbar.less
Unescape View File

@ -1,3 +1,4 @@
@import "../../bibase";
.scrollbar-layout-main { .scrollbar-layout-main {
box-sizing: border-box; box-sizing: border-box;
outline: none; outline: none;
@ -6,11 +7,17 @@
transition-duration: 250ms; transition-duration: 250ms;
transition-timing-function: ease; transition-timing-function: ease;
user-select: none; user-select: none;
background-color: rgba(0, 0, 0, 0.1); background-color: @scroll-color;
filter:~"progid:DXImageTransform.Microsoft.gradient(startColorstr=#19000000,endColorstr=#19000000)";
border-radius: 5px; border-radius: 5px;
} }
.bi-theme-dark {
.scrollbar-layout-main {
background-color: @scroll-color-theme-dark;
filter:~"progid:DXImageTransform.Microsoft.gradient(startColorstr=#19ffffff,endColorstr=#19ffffff)";
}
}
.scrollbar-layout-main-vertical { .scrollbar-layout-main-vertical {
bottom: 0; bottom: 0;
right: 0; right: 0;
@ -29,8 +36,14 @@
height: 10px; height: 10px;
left: 0; left: 0;
transition-property: background-color; transition-property: background-color;
background-color: rgba(0, 0, 0, 0.1); background-color: @scroll-color;
filter:~"progid:DXImageTransform.Microsoft.gradient(startColorstr=#19000000,endColorstr=#19000000)"; }
.bi-theme-dark {
.scrollbar-layout-main-horizontal {
background-color: @scroll-color-theme-dark;
filter:~"progid:DXImageTransform.Microsoft.gradient(startColorstr=#19ffffff,endColorstr=#19ffffff)";
}
} }
/* Touching the scroll-track directly makes the scroll-track bolder */ /* Touching the scroll-track directly makes the scroll-track bolder */
@ -103,26 +116,26 @@
} }
.public-scrollbar-face:after { .public-scrollbar-face:after {
background-color: #c2c2c2; background-color: @scroll-thumb-color;
} }
.bi-theme-dark { .bi-theme-dark {
.public-scrollbar-face:after { .public-scrollbar-face:after {
background-color: #7d7d7d; background-color: @scroll-thumb-color-theme-dark;
} }
} }
.public-scrollbar-main:hover .public-scrollbar-face:after, .public-scrollbar-main:hover .public-scrollbar-face:after,
.public-scrollbar-main-active .public-scrollbar-face:after, .public-scrollbar-main-active .public-scrollbar-face:after,
.public-scrollbar-faceActive:after { .public-scrollbar-faceActive:after {
background-color: #7d7d7d; background-color: @scroll-thumb-focus-color;
} }
.bi-theme-dark { .bi-theme-dark {
.public-scrollbar-main:hover .public-scrollbar-face:after, .public-scrollbar-main:hover .public-scrollbar-face:after,
.public-scrollbar-main-active .public-scrollbar-face:after, .public-scrollbar-main-active .public-scrollbar-face:after,
.public-scrollbar-faceActive:after { .public-scrollbar-faceActive:after {
background-color: #c2c2c2; background-color: @scroll-thumb-focus-color-theme-dark;
} }
} }
@ -130,8 +143,5 @@
.horizontal-scrollbar { .horizontal-scrollbar {
bottom: 0; bottom: 0;
position: absolute; position: absolute;
& .public-scrollbar-main-horizontal {
background-color: #fff;
}
} }

14
src/less/base/view/floatboxview.less
Unescape View File

@ -1,9 +1,13 @@
@import "../../bibase"; @import "../../bibase";
.bi-float-box { .bi-float-box {
background: @color-bi-background-default; background-color: @color-bi-background-default;
& .float-box-button{ color: @color-bi-text-black;
color: @color-bi-text; }
background: @color-bi-background-highlight;
border: 1px solid @color-bi-border-normal; .bi-theme-dark {
.bi-float-box {
background-color: @color-bi-background-default-theme-dark;
color: @color-bi-text-theme-dark;
} }
} }

2
src/less/base/view/popupview.less
Unescape View File

@ -30,7 +30,7 @@
.bi-list-view { .bi-list-view {
& .list-view-outer { & .list-view-outer {
color: @color-bi-text-theme-dark; color: @color-bi-text-theme-dark;
background: @color-bi-background-theme-dark; background: @color-bi-background-default-theme-dark;
} }
} }
} }

2
src/less/core/utils/common.less
Unescape View File

@ -132,7 +132,7 @@
} }
.bi-theme-dark { .bi-theme-dark {
.list-item-select { .bi-list-item-select {
&:hover, &.hover { &:hover, &.hover {
color: @color-bi-text-highlight; color: @color-bi-text-highlight;
background-color: @color-list-item-hover; background-color: @color-list-item-hover;

7
src/less/lib/colors.less
Unescape View File

@ -26,12 +26,13 @@
//标红色 //标红色
@color-bi-text-redmark: @font-color-redmark; @color-bi-text-redmark: @font-color-redmark;
//普通背景
@color-bi-background-normal: @background-color-normal;
@color-bi-background-normal-theme-dark: #191A2C;
//默认背景 //默认背景
@color-bi-background-default: @background-color-default; @color-bi-background-default: @background-color-default;
//深色主题默认背景 //深色主题默认背景
@color-bi-background-theme-dark: #191A2C; @color-bi-background-default-theme-dark: #202237;
//普通背景
@color-bi-background-normal: @background-color-normal;
//黑色背景 //黑色背景
@color-bi-background-black: @background-color-black; @color-bi-background-black: @background-color-black;
//深灰色背景 //深灰色背景

5
src/less/lib/constant.less
Unescape View File

@ -80,6 +80,11 @@
//scroll color //scroll color
@scroll-color: #f4f4f4; @scroll-color: #f4f4f4;
@scroll-thumb-color: #e2e2e2; @scroll-thumb-color: #e2e2e2;
@scroll-thumb-focus-color: #7d7d7d;
@scroll-color-theme-dark: rgba(255,255,255,.1);
@scroll-thumb-color-theme-dark: #7d7d7d;
@scroll-thumb-focus-color-theme-dark: #e2e2e2;
@water-mark-color: #cccccc; @water-mark-color: #cccccc;

4
src/less/resource/app.less
Unescape View File

@ -112,13 +112,13 @@ div, textarea {
div, textarea { div, textarea {
&::-webkit-scrollbar { &::-webkit-scrollbar {
-webkit-appearance: none; -webkit-appearance: none;
background-color: @color-bi-background-theme-dark; background-color: @scroll-color-theme-dark;
width: 6px; width: 6px;
height: 6px; height: 6px;
} }
&::-webkit-scrollbar-thumb { &::-webkit-scrollbar-thumb {
.border-radius(0); .border-radius(0);
background-color: #7d7d7d; background-color: @scroll-thumb-color-theme-dark;
} }
} }
} }

2
src/less/theme/dark.less
Unescape View File

@ -1,7 +1,7 @@
@import "../bibase"; @import "../bibase";
.bi-theme-dark { .bi-theme-dark {
background-color: @color-bi-background-theme-dark; background-color: @color-bi-background-normal-theme-dark;
color: @color-bi-text-theme-dark; color: @color-bi-text-theme-dark;
& .bi-input { & .bi-input {
color: @color-bi-text; color: @color-bi-text;

2
src/less/widget/multiselect/trigger/button.checkselected.less
Unescape View File

@ -10,6 +10,6 @@
.bi-theme-dark { .bi-theme-dark {
.bi-multi-select-check-selected-button { .bi-multi-select-check-selected-button {
background-color: @color-bi-background-theme-dark; background-color: @color-bi-background-normal-theme-dark;
} }
} }
Write Preview
Loading…
Cancel
Save