Browse Source

Pull request #3226: 无jira任务 自动更新 VISUAL/fineui master分支 Tue Nov 22 2022 13:46:21 GMT+0800 (中国标准时间)

Merge in VISUAL/fineui from DEC/fineui:release/11.0 to master

* commit 'ec5fa0512b2049a50872a71dfacd6d173a09523a':
  BI-117324 深色主题树节点查看已选文字看不清
es6
Aeolus.Zhang-张敬峥 2 years ago committed by Teller-杨派
parent
commit
4d16c3316f
  1. 8
      src/less/base/tree/tree.display.less
  2. 6
      src/less/base/tree/ztree.less
  3. 1
      src/less/lib/colors.less
  4. 1
      src/less/lib/constant.less
  5. 1
      src/less/lib/theme.less

8
src/less/base/tree/tree.display.less

@ -17,4 +17,12 @@
background-color: inherit; background-color: inherit;
.opacity(1); .opacity(1);
} }
}
.bi-theme-dark {
.bi-display-tree {
.ztree * {
color: @color-bi-text-display-tree-theme-dark;
}
}
} }

6
src/less/base/tree/ztree.less

@ -90,6 +90,12 @@
} }
} }
.ztree li span.button.chk {
&.bi-checkbox {
border-color: @color-bi-border-dark-line-theme-dark;
}
}
&.bi-half-button { &.bi-half-button {
border: 1px solid @color-bi-border-hover-active-checkbox-theme-dark; border: 1px solid @color-bi-border-hover-active-checkbox-theme-dark;
} }

1
src/less/lib/colors.less

@ -13,6 +13,7 @@
@color-bi-text-black-theme-dark: @font-color-normal-theme-dark; @color-bi-text-black-theme-dark: @font-color-normal-theme-dark;
//灰色字体颜色 //灰色字体颜色
@color-bi-text-gray: @font-color-gray; @color-bi-text-gray: @font-color-gray;
@color-bi-text-gray-theme-dark: @font-color-gray-theme-dark;
//浅灰色字体 //浅灰色字体
@color-bi-text-light-gray: @font-color-light-gray; @color-bi-text-light-gray: @font-color-light-gray;
//深色主题浅灰色字体 //深色主题浅灰色字体

1
src/less/lib/constant.less

@ -167,6 +167,7 @@
@font-color-light-disabled: @color-dark-gray; @font-color-light-disabled: @color-dark-gray;
@font-color-light-disabled-theme-dark: @color-dark-gray-theme-dark; @font-color-light-disabled-theme-dark: @color-dark-gray-theme-dark;
@font-color-gray: #999999; @font-color-gray: #999999;
@font-color-gray-theme-dark: @color-gray-theme-dark;
@font-color-white: @color-white; @font-color-white: @color-white;
@font-color-white-theme-dark: @color-white-theme-dark; @font-color-white-theme-dark: @color-white-theme-dark;
@font-color-light-highlight: @color-light-blue-100; @font-color-light-highlight: @color-light-blue-100;

1
src/less/lib/theme.less

@ -233,6 +233,7 @@
@color-bi-color-error-input-text-area: @color-bi-text-failure; @color-bi-color-error-input-text-area: @color-bi-text-failure;
// tree // tree
@color-bi-text-display-tree: @color-bi-text-gray; @color-bi-text-display-tree: @color-bi-text-gray;
@color-bi-text-display-tree-theme-dark: @color-bi-text-gray-theme-dark;
@color-bi-border-tree-expander-popup-line: @color-bi-border-dark-gray-line; @color-bi-border-tree-expander-popup-line: @color-bi-border-dark-gray-line;
@color-bi-border-tree-expander-popup-line-theme-dark: @color-bi-border-dark-gray-line-theme-dark; @color-bi-border-tree-expander-popup-line-theme-dark: @color-bi-border-dark-gray-line-theme-dark;
// popup // popup

Loading…
Cancel
Save