Browse Source

Merge pull request #582 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit '2abe80c95d876d1743fef50eedc15daa779a5649':
  无JIRA任务 视觉样式修改
es6
windy 6 years ago
parent
commit
e3e17ef85d
  1. 17
      dist/base.css
  2. 63
      dist/bundle.css
  3. 2
      dist/bundle.min.css
  4. 46
      dist/core.css
  5. 46
      dist/core_without_normalize.css
  6. 63
      dist/fineui.css
  7. 2
      dist/fineui.min.css
  8. 12
      src/css/base/single/button/button.css
  9. 5
      src/css/base/view/popupview.css
  10. 46
      src/css/core/utils/common.css
  11. 10
      src/less/base/single/button/button.less
  12. 3
      src/less/base/view/popupview.less
  13. 80
      src/less/core/utils/common.less
  14. 6
      src/less/lib/colors.less

17
dist/base.css vendored

@ -718,7 +718,7 @@ body .bi-button.button-common.ghost:active,
} }
body .bi-button.button-ignore, body .bi-button.button-ignore,
#body .bi-button.button-ignore { #body .bi-button.button-ignore {
background-color: #ffffff; background-color: transparent;
border-color: #3685f2; border-color: #3685f2;
} }
body .bi-button.button-ignore, body .bi-button.button-ignore,
@ -977,7 +977,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
background-color: rgba(54, 133, 242, 0.05); background-color: rgba(54, 133, 242, 0.05);
} }
.bi-basic-button.button-ignore:active { .bi-basic-button.button-ignore:active {
background-color: #eaf2fd; background-color: rgba(54, 133, 242, 0.1);
} }
.bi-basic-button .popup-content { .bi-basic-button .popup-content {
font-size: 14px; font-size: 14px;
@ -999,6 +999,14 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
background-color: rgba(255, 255, 255, 0.9); background-color: rgba(255, 255, 255, 0.9);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#e6ffffff,endColorstr=#e6ffffff); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#e6ffffff,endColorstr=#e6ffffff);
} }
.bi-theme-dark body .bi-button.button-ignore:hover,
.bi-theme-dark #body .bi-button.button-ignore:hover {
background-color: rgba(54, 133, 242, 0.05);
}
.bi-theme-dark body .bi-button.button-ignore:active,
.bi-theme-dark #body .bi-button.button-ignore:active {
background-color: rgba(54, 133, 242, 0.1);
}
.bi-theme-dark body .bi-button.button-common.disabled.ghost, .bi-theme-dark body .bi-button.button-common.disabled.ghost,
.bi-theme-dark #body .bi-button.button-common.disabled.ghost { .bi-theme-dark #body .bi-button.button-common.disabled.ghost {
background: transparent !important; background: transparent !important;
@ -1493,3 +1501,8 @@ ul.ztree.zTreeDragUL {
.bi-theme-dark .bi-popup-view .list-view-toolbar > .first-element { .bi-theme-dark .bi-popup-view .list-view-toolbar > .first-element {
border-left: none; border-left: none;
} }
.bi-theme-dark .list-view-shadow {
-webkit-box-shadow: 0 1px 5px 0 rgba(25, 27, 43, 0.8);
-moz-box-shadow: 0 1px 5px 0 rgba(25, 27, 43, 0.8);
box-shadow: 0 1px 5px 0 rgba(25, 27, 43, 0.8);
}

63
dist/bundle.css vendored

@ -364,13 +364,13 @@ textarea {
} }
.bi-theme-dark .bi-header-background { .bi-theme-dark .bi-header-background {
background-color: #2F3149; background-color: #2F3149;
color: #3d4d66; color: #d6e0dc;
} }
.bi-theme-dark .bi-header-background .bi-input { .bi-theme-dark .bi-header-background .bi-input {
color: #3d4d66; color: #d6e0dc;
} }
.bi-theme-dark .bi-header-background .bi-textarea { .bi-theme-dark .bi-header-background .bi-textarea {
color: #3d4d66; color: #d6e0dc;
} }
.bi-card { .bi-card {
background-color: #ffffff; background-color: #ffffff;
@ -422,6 +422,15 @@ textarea {
.bi-border { .bi-border {
border: 1px solid #e8eaed; border: 1px solid #e8eaed;
} }
.bi-theme-dark .bi-border {
border: 1px solid #3a3c53;
}
.bi-split {
border: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-border {
border: 1px solid #2F3149;
}
.bi-border-radius { .bi-border-radius {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;
@ -430,9 +439,6 @@ textarea {
.bi-font-bold { .bi-font-bold {
font-weight: 700; font-weight: 700;
} }
.bi-theme-dark .bi-border {
border: 1px solid #3a3c53;
}
.bi-border-left { .bi-border-left {
border-left: 1px solid #e8eaed; border-left: 1px solid #e8eaed;
} }
@ -457,6 +463,30 @@ textarea {
.bi-theme-dark .bi-border-bottom { .bi-theme-dark .bi-border-bottom {
border-bottom: 1px solid #3a3c53; border-bottom: 1px solid #3a3c53;
} }
.bi-split-left {
border-left: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-split-left {
border-left: 1px solid #2F3149;
}
.bi-split-right {
border-right: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-split-right {
border-right: 1px solid #2F3149;
}
.bi-split-top {
border-top: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-split-top {
border-top: 1px solid #2F3149;
}
.bi-border-bottom {
border-bottom: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-border-bottom {
border-bottom: 1px solid #2F3149;
}
.bi-keyword-red-mark { .bi-keyword-red-mark {
color: #faaa39; color: #faaa39;
} }
@ -561,6 +591,10 @@ textarea {
background-color: rgba(35, 46, 64, 0.5); background-color: rgba(35, 46, 64, 0.5);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#80232e40,endColorstr=#80232e40); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#80232e40,endColorstr=#80232e40);
} }
.bi-theme-dark .bi-z-index-mask {
background-color: rgba(25, 27, 43, 0.8);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#cc191b2b,endColorstr=#cc191b2b);
}
.bi-list-item:hover, .bi-list-item:hover,
.bi-list-item.hover { .bi-list-item.hover {
color: #232e40; color: #232e40;
@ -2614,7 +2648,7 @@ body .bi-button.button-common.ghost:active,
} }
body .bi-button.button-ignore, body .bi-button.button-ignore,
#body .bi-button.button-ignore { #body .bi-button.button-ignore {
background-color: #ffffff; background-color: transparent;
border-color: #3685f2; border-color: #3685f2;
} }
body .bi-button.button-ignore, body .bi-button.button-ignore,
@ -2873,7 +2907,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
background-color: rgba(54, 133, 242, 0.05); background-color: rgba(54, 133, 242, 0.05);
} }
.bi-basic-button.button-ignore:active { .bi-basic-button.button-ignore:active {
background-color: #eaf2fd; background-color: rgba(54, 133, 242, 0.1);
} }
.bi-basic-button .popup-content { .bi-basic-button .popup-content {
font-size: 14px; font-size: 14px;
@ -2895,6 +2929,14 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
background-color: rgba(255, 255, 255, 0.9); background-color: rgba(255, 255, 255, 0.9);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#e6ffffff,endColorstr=#e6ffffff); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#e6ffffff,endColorstr=#e6ffffff);
} }
.bi-theme-dark body .bi-button.button-ignore:hover,
.bi-theme-dark #body .bi-button.button-ignore:hover {
background-color: rgba(54, 133, 242, 0.05);
}
.bi-theme-dark body .bi-button.button-ignore:active,
.bi-theme-dark #body .bi-button.button-ignore:active {
background-color: rgba(54, 133, 242, 0.1);
}
.bi-theme-dark body .bi-button.button-common.disabled.ghost, .bi-theme-dark body .bi-button.button-common.disabled.ghost,
.bi-theme-dark #body .bi-button.button-common.disabled.ghost { .bi-theme-dark #body .bi-button.button-common.disabled.ghost {
background: transparent !important; background: transparent !important;
@ -3389,6 +3431,11 @@ ul.ztree.zTreeDragUL {
.bi-theme-dark .bi-popup-view .list-view-toolbar > .first-element { .bi-theme-dark .bi-popup-view .list-view-toolbar > .first-element {
border-left: none; border-left: none;
} }
.bi-theme-dark .list-view-shadow {
-webkit-box-shadow: 0 1px 5px 0 rgba(25, 27, 43, 0.8);
-moz-box-shadow: 0 1px 5px 0 rgba(25, 27, 43, 0.8);
box-shadow: 0 1px 5px 0 rgba(25, 27, 43, 0.8);
}
.bi-date-trigger { .bi-date-trigger {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

46
dist/core.css vendored

@ -364,13 +364,13 @@ textarea {
} }
.bi-theme-dark .bi-header-background { .bi-theme-dark .bi-header-background {
background-color: #2F3149; background-color: #2F3149;
color: #3d4d66; color: #d6e0dc;
} }
.bi-theme-dark .bi-header-background .bi-input { .bi-theme-dark .bi-header-background .bi-input {
color: #3d4d66; color: #d6e0dc;
} }
.bi-theme-dark .bi-header-background .bi-textarea { .bi-theme-dark .bi-header-background .bi-textarea {
color: #3d4d66; color: #d6e0dc;
} }
.bi-card { .bi-card {
background-color: #ffffff; background-color: #ffffff;
@ -422,6 +422,15 @@ textarea {
.bi-border { .bi-border {
border: 1px solid #e8eaed; border: 1px solid #e8eaed;
} }
.bi-theme-dark .bi-border {
border: 1px solid #3a3c53;
}
.bi-split {
border: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-border {
border: 1px solid #2F3149;
}
.bi-border-radius { .bi-border-radius {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;
@ -430,9 +439,6 @@ textarea {
.bi-font-bold { .bi-font-bold {
font-weight: 700; font-weight: 700;
} }
.bi-theme-dark .bi-border {
border: 1px solid #3a3c53;
}
.bi-border-left { .bi-border-left {
border-left: 1px solid #e8eaed; border-left: 1px solid #e8eaed;
} }
@ -457,6 +463,30 @@ textarea {
.bi-theme-dark .bi-border-bottom { .bi-theme-dark .bi-border-bottom {
border-bottom: 1px solid #3a3c53; border-bottom: 1px solid #3a3c53;
} }
.bi-split-left {
border-left: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-split-left {
border-left: 1px solid #2F3149;
}
.bi-split-right {
border-right: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-split-right {
border-right: 1px solid #2F3149;
}
.bi-split-top {
border-top: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-split-top {
border-top: 1px solid #2F3149;
}
.bi-border-bottom {
border-bottom: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-border-bottom {
border-bottom: 1px solid #2F3149;
}
.bi-keyword-red-mark { .bi-keyword-red-mark {
color: #faaa39; color: #faaa39;
} }
@ -561,6 +591,10 @@ textarea {
background-color: rgba(35, 46, 64, 0.5); background-color: rgba(35, 46, 64, 0.5);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#80232e40,endColorstr=#80232e40); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#80232e40,endColorstr=#80232e40);
} }
.bi-theme-dark .bi-z-index-mask {
background-color: rgba(25, 27, 43, 0.8);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#cc191b2b,endColorstr=#cc191b2b);
}
.bi-list-item:hover, .bi-list-item:hover,
.bi-list-item.hover { .bi-list-item.hover {
color: #232e40; color: #232e40;

46
dist/core_without_normalize.css vendored

@ -83,13 +83,13 @@ textarea {
} }
.bi-theme-dark .bi-header-background { .bi-theme-dark .bi-header-background {
background-color: #2F3149; background-color: #2F3149;
color: #3d4d66; color: #d6e0dc;
} }
.bi-theme-dark .bi-header-background .bi-input { .bi-theme-dark .bi-header-background .bi-input {
color: #3d4d66; color: #d6e0dc;
} }
.bi-theme-dark .bi-header-background .bi-textarea { .bi-theme-dark .bi-header-background .bi-textarea {
color: #3d4d66; color: #d6e0dc;
} }
.bi-card { .bi-card {
background-color: #ffffff; background-color: #ffffff;
@ -141,6 +141,15 @@ textarea {
.bi-border { .bi-border {
border: 1px solid #e8eaed; border: 1px solid #e8eaed;
} }
.bi-theme-dark .bi-border {
border: 1px solid #3a3c53;
}
.bi-split {
border: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-border {
border: 1px solid #2F3149;
}
.bi-border-radius { .bi-border-radius {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;
@ -149,9 +158,6 @@ textarea {
.bi-font-bold { .bi-font-bold {
font-weight: 700; font-weight: 700;
} }
.bi-theme-dark .bi-border {
border: 1px solid #3a3c53;
}
.bi-border-left { .bi-border-left {
border-left: 1px solid #e8eaed; border-left: 1px solid #e8eaed;
} }
@ -176,6 +182,30 @@ textarea {
.bi-theme-dark .bi-border-bottom { .bi-theme-dark .bi-border-bottom {
border-bottom: 1px solid #3a3c53; border-bottom: 1px solid #3a3c53;
} }
.bi-split-left {
border-left: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-split-left {
border-left: 1px solid #2F3149;
}
.bi-split-right {
border-right: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-split-right {
border-right: 1px solid #2F3149;
}
.bi-split-top {
border-top: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-split-top {
border-top: 1px solid #2F3149;
}
.bi-border-bottom {
border-bottom: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-border-bottom {
border-bottom: 1px solid #2F3149;
}
.bi-keyword-red-mark { .bi-keyword-red-mark {
color: #faaa39; color: #faaa39;
} }
@ -280,6 +310,10 @@ textarea {
background-color: rgba(35, 46, 64, 0.5); background-color: rgba(35, 46, 64, 0.5);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#80232e40,endColorstr=#80232e40); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#80232e40,endColorstr=#80232e40);
} }
.bi-theme-dark .bi-z-index-mask {
background-color: rgba(25, 27, 43, 0.8);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#cc191b2b,endColorstr=#cc191b2b);
}
.bi-list-item:hover, .bi-list-item:hover,
.bi-list-item.hover { .bi-list-item.hover {
color: #232e40; color: #232e40;

63
dist/fineui.css vendored

@ -364,13 +364,13 @@ textarea {
} }
.bi-theme-dark .bi-header-background { .bi-theme-dark .bi-header-background {
background-color: #2F3149; background-color: #2F3149;
color: #3d4d66; color: #d6e0dc;
} }
.bi-theme-dark .bi-header-background .bi-input { .bi-theme-dark .bi-header-background .bi-input {
color: #3d4d66; color: #d6e0dc;
} }
.bi-theme-dark .bi-header-background .bi-textarea { .bi-theme-dark .bi-header-background .bi-textarea {
color: #3d4d66; color: #d6e0dc;
} }
.bi-card { .bi-card {
background-color: #ffffff; background-color: #ffffff;
@ -422,6 +422,15 @@ textarea {
.bi-border { .bi-border {
border: 1px solid #e8eaed; border: 1px solid #e8eaed;
} }
.bi-theme-dark .bi-border {
border: 1px solid #3a3c53;
}
.bi-split {
border: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-border {
border: 1px solid #2F3149;
}
.bi-border-radius { .bi-border-radius {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;
@ -430,9 +439,6 @@ textarea {
.bi-font-bold { .bi-font-bold {
font-weight: 700; font-weight: 700;
} }
.bi-theme-dark .bi-border {
border: 1px solid #3a3c53;
}
.bi-border-left { .bi-border-left {
border-left: 1px solid #e8eaed; border-left: 1px solid #e8eaed;
} }
@ -457,6 +463,30 @@ textarea {
.bi-theme-dark .bi-border-bottom { .bi-theme-dark .bi-border-bottom {
border-bottom: 1px solid #3a3c53; border-bottom: 1px solid #3a3c53;
} }
.bi-split-left {
border-left: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-split-left {
border-left: 1px solid #2F3149;
}
.bi-split-right {
border-right: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-split-right {
border-right: 1px solid #2F3149;
}
.bi-split-top {
border-top: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-split-top {
border-top: 1px solid #2F3149;
}
.bi-border-bottom {
border-bottom: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-border-bottom {
border-bottom: 1px solid #2F3149;
}
.bi-keyword-red-mark { .bi-keyword-red-mark {
color: #faaa39; color: #faaa39;
} }
@ -561,6 +591,10 @@ textarea {
background-color: rgba(35, 46, 64, 0.5); background-color: rgba(35, 46, 64, 0.5);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#80232e40,endColorstr=#80232e40); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#80232e40,endColorstr=#80232e40);
} }
.bi-theme-dark .bi-z-index-mask {
background-color: rgba(25, 27, 43, 0.8);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#cc191b2b,endColorstr=#cc191b2b);
}
.bi-list-item:hover, .bi-list-item:hover,
.bi-list-item.hover { .bi-list-item.hover {
color: #232e40; color: #232e40;
@ -2614,7 +2648,7 @@ body .bi-button.button-common.ghost:active,
} }
body .bi-button.button-ignore, body .bi-button.button-ignore,
#body .bi-button.button-ignore { #body .bi-button.button-ignore {
background-color: #ffffff; background-color: transparent;
border-color: #3685f2; border-color: #3685f2;
} }
body .bi-button.button-ignore, body .bi-button.button-ignore,
@ -2873,7 +2907,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
background-color: rgba(54, 133, 242, 0.05); background-color: rgba(54, 133, 242, 0.05);
} }
.bi-basic-button.button-ignore:active { .bi-basic-button.button-ignore:active {
background-color: #eaf2fd; background-color: rgba(54, 133, 242, 0.1);
} }
.bi-basic-button .popup-content { .bi-basic-button .popup-content {
font-size: 14px; font-size: 14px;
@ -2895,6 +2929,14 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
background-color: rgba(255, 255, 255, 0.9); background-color: rgba(255, 255, 255, 0.9);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#e6ffffff,endColorstr=#e6ffffff); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#e6ffffff,endColorstr=#e6ffffff);
} }
.bi-theme-dark body .bi-button.button-ignore:hover,
.bi-theme-dark #body .bi-button.button-ignore:hover {
background-color: rgba(54, 133, 242, 0.05);
}
.bi-theme-dark body .bi-button.button-ignore:active,
.bi-theme-dark #body .bi-button.button-ignore:active {
background-color: rgba(54, 133, 242, 0.1);
}
.bi-theme-dark body .bi-button.button-common.disabled.ghost, .bi-theme-dark body .bi-button.button-common.disabled.ghost,
.bi-theme-dark #body .bi-button.button-common.disabled.ghost { .bi-theme-dark #body .bi-button.button-common.disabled.ghost {
background: transparent !important; background: transparent !important;
@ -3389,6 +3431,11 @@ ul.ztree.zTreeDragUL {
.bi-theme-dark .bi-popup-view .list-view-toolbar > .first-element { .bi-theme-dark .bi-popup-view .list-view-toolbar > .first-element {
border-left: none; border-left: none;
} }
.bi-theme-dark .list-view-shadow {
-webkit-box-shadow: 0 1px 5px 0 rgba(25, 27, 43, 0.8);
-moz-box-shadow: 0 1px 5px 0 rgba(25, 27, 43, 0.8);
box-shadow: 0 1px 5px 0 rgba(25, 27, 43, 0.8);
}
.bi-date-trigger { .bi-date-trigger {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

12
src/css/base/single/button/button.css

@ -67,7 +67,7 @@ body .bi-button.button-common.ghost:active,
} }
body .bi-button.button-ignore, body .bi-button.button-ignore,
#body .bi-button.button-ignore { #body .bi-button.button-ignore {
background-color: #ffffff; background-color: transparent;
border-color: #3685f2; border-color: #3685f2;
} }
body .bi-button.button-ignore, body .bi-button.button-ignore,
@ -326,7 +326,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
background-color: rgba(54, 133, 242, 0.05); background-color: rgba(54, 133, 242, 0.05);
} }
.bi-basic-button.button-ignore:active { .bi-basic-button.button-ignore:active {
background-color: #eaf2fd; background-color: rgba(54, 133, 242, 0.1);
} }
.bi-basic-button .popup-content { .bi-basic-button .popup-content {
font-size: 14px; font-size: 14px;
@ -348,6 +348,14 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
background-color: rgba(255, 255, 255, 0.9); background-color: rgba(255, 255, 255, 0.9);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#e6ffffff,endColorstr=#e6ffffff); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#e6ffffff,endColorstr=#e6ffffff);
} }
.bi-theme-dark body .bi-button.button-ignore:hover,
.bi-theme-dark #body .bi-button.button-ignore:hover {
background-color: rgba(54, 133, 242, 0.05);
}
.bi-theme-dark body .bi-button.button-ignore:active,
.bi-theme-dark #body .bi-button.button-ignore:active {
background-color: rgba(54, 133, 242, 0.1);
}
.bi-theme-dark body .bi-button.button-common.disabled.ghost, .bi-theme-dark body .bi-button.button-common.disabled.ghost,
.bi-theme-dark #body .bi-button.button-common.disabled.ghost { .bi-theme-dark #body .bi-button.button-common.disabled.ghost {
background: transparent !important; background: transparent !important;

5
src/css/base/view/popupview.css

@ -35,3 +35,8 @@
.bi-theme-dark .bi-popup-view .list-view-toolbar > .first-element { .bi-theme-dark .bi-popup-view .list-view-toolbar > .first-element {
border-left: none; border-left: none;
} }
.bi-theme-dark .list-view-shadow {
-webkit-box-shadow: 0 1px 5px 0 rgba(25, 27, 43, 0.8);
-moz-box-shadow: 0 1px 5px 0 rgba(25, 27, 43, 0.8);
box-shadow: 0 1px 5px 0 rgba(25, 27, 43, 0.8);
}

46
src/css/core/utils/common.css

@ -83,13 +83,13 @@ textarea {
} }
.bi-theme-dark .bi-header-background { .bi-theme-dark .bi-header-background {
background-color: #2F3149; background-color: #2F3149;
color: #3d4d66; color: #d6e0dc;
} }
.bi-theme-dark .bi-header-background .bi-input { .bi-theme-dark .bi-header-background .bi-input {
color: #3d4d66; color: #d6e0dc;
} }
.bi-theme-dark .bi-header-background .bi-textarea { .bi-theme-dark .bi-header-background .bi-textarea {
color: #3d4d66; color: #d6e0dc;
} }
.bi-card { .bi-card {
background-color: #ffffff; background-color: #ffffff;
@ -141,6 +141,15 @@ textarea {
.bi-border { .bi-border {
border: 1px solid #e8eaed; border: 1px solid #e8eaed;
} }
.bi-theme-dark .bi-border {
border: 1px solid #3a3c53;
}
.bi-split {
border: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-border {
border: 1px solid #2F3149;
}
.bi-border-radius { .bi-border-radius {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;
@ -149,9 +158,6 @@ textarea {
.bi-font-bold { .bi-font-bold {
font-weight: 700; font-weight: 700;
} }
.bi-theme-dark .bi-border {
border: 1px solid #3a3c53;
}
.bi-border-left { .bi-border-left {
border-left: 1px solid #e8eaed; border-left: 1px solid #e8eaed;
} }
@ -176,6 +182,30 @@ textarea {
.bi-theme-dark .bi-border-bottom { .bi-theme-dark .bi-border-bottom {
border-bottom: 1px solid #3a3c53; border-bottom: 1px solid #3a3c53;
} }
.bi-split-left {
border-left: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-split-left {
border-left: 1px solid #2F3149;
}
.bi-split-right {
border-right: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-split-right {
border-right: 1px solid #2F3149;
}
.bi-split-top {
border-top: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-split-top {
border-top: 1px solid #2F3149;
}
.bi-border-bottom {
border-bottom: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-border-bottom {
border-bottom: 1px solid #2F3149;
}
.bi-keyword-red-mark { .bi-keyword-red-mark {
color: #faaa39; color: #faaa39;
} }
@ -280,6 +310,10 @@ textarea {
background-color: rgba(35, 46, 64, 0.5); background-color: rgba(35, 46, 64, 0.5);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#80232e40,endColorstr=#80232e40); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#80232e40,endColorstr=#80232e40);
} }
.bi-theme-dark .bi-z-index-mask {
background-color: rgba(25, 27, 43, 0.8);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#cc191b2b,endColorstr=#cc191b2b);
}
.bi-list-item:hover, .bi-list-item:hover,
.bi-list-item.hover { .bi-list-item.hover {
color: #232e40; color: #232e40;

10
src/less/base/single/button/button.less

@ -52,7 +52,7 @@ body .bi-button, #body .bi-button {
&, & .b-font:before { &, & .b-font:before {
color: @color-bi-text-highlight; color: @color-bi-text-highlight;
} }
background-color: @color-bi-background-default; background-color: transparent;
border-color: @color-bi-border-highlight; border-color: @color-bi-border-highlight;
} }
&.clear { &.clear {
@ -198,6 +198,14 @@ body .bi-button, #body .bi-button {
} }
} }
} }
&.button-ignore {
&:hover{
background-color: @color-bi-blue-5;
}
&:active{
background-color: @color-bi-blue-10;
}
}
&.button-common.disabled{ &.button-common.disabled{
&.ghost { &.ghost {
&, & .b-font:before { &, & .b-font:before {

3
src/less/base/view/popupview.less

@ -39,4 +39,7 @@
} }
} }
} }
& .list-view-shadow {
.box-shadow(0 1px 5px 0, fade(@background-color-normal-theme-dark, 80));
}
} }

80
src/less/core/utils/common.less

@ -94,12 +94,12 @@ textarea {
.bi-theme-dark { .bi-theme-dark {
.bi-header-background { .bi-header-background {
background-color: @color-bi-background-light-gray-theme-dark; background-color: @color-bi-background-light-gray-theme-dark;
color: @color-bi-text-normal; color: @color-bi-text-normal-theme-dark;
& .bi-input { & .bi-input {
color: @color-bi-text-normal; color: @color-bi-text-normal-theme-dark;
} }
& .bi-textarea { & .bi-textarea {
color: @color-bi-text-normal; color: @color-bi-text-normal-theme-dark;
} }
} }
} }
@ -167,20 +167,31 @@ textarea {
border: 1px solid @color-bi-border-line; border: 1px solid @color-bi-border-line;
} }
.bi-border-radius { .bi-theme-dark {
.border-radius(2px); .bi-border {
border: 1px solid @color-bi-border-line-theme-dark;
}
} }
.bi-font-bold { //分割线
font-weight: 700; .bi-split {
border: 1px solid @border-color-light-line;
} }
.bi-theme-dark { .bi-theme-dark {
.bi-border { .bi-border {
border: 1px solid @color-bi-border-line-theme-dark; border: 1px solid @border-color-light-line-theme-dark;
} }
} }
.bi-border-radius {
.border-radius(2px);
}
.bi-font-bold {
font-weight: 700;
}
.bi-border-left { .bi-border-left {
border-left: 1px solid @color-bi-border-line; border-left: 1px solid @color-bi-border-line;
} }
@ -221,6 +232,46 @@ textarea {
} }
} }
.bi-split-left {
border-left: 1px solid @border-color-light-line;
}
.bi-theme-dark {
.bi-split-left {
border-left: 1px solid @border-color-light-line-theme-dark;
}
}
.bi-split-right {
border-right: 1px solid @border-color-light-line;
}
.bi-theme-dark {
.bi-split-right {
border-right: 1px solid @border-color-light-line-theme-dark;
}
}
.bi-split-top {
border-top: 1px solid @border-color-light-line;
}
.bi-theme-dark {
.bi-split-top {
border-top: 1px solid @border-color-light-line-theme-dark;
}
}
.bi-border-bottom {
border-bottom: 1px solid @border-color-light-line;
}
.bi-theme-dark {
.bi-border-bottom {
border-bottom: 1px solid @border-color-light-line-theme-dark;
}
}
//标红 //标红
.bi-keyword-red-mark { .bi-keyword-red-mark {
color: @color-bi-text-redmark; color: @color-bi-text-redmark;
@ -352,6 +403,19 @@ textarea {
.background-color(@color-bi-background-black, 50%); .background-color(@color-bi-background-black, 50%);
} }
.bi-theme-dark {
.bi-z-index-mask {
//color: @color-bi-background-default;
//& .bi-input {
// color: @color-bi-background-default;
//}
//& .bi-textarea {
// color: @color-bi-background-default;
//}
.background-color(@background-color-normal-theme-dark, 80%);
}
}
//只有背景变化 //只有背景变化
.bi-list-item { .bi-list-item {
&:hover, &.hover { &:hover, &.hover {

6
src/less/lib/colors.less

@ -4,6 +4,8 @@
//默认字体颜色 //默认字体颜色
@color-bi-text-normal: @font-color-normal; @color-bi-text-normal: @font-color-normal;
//默认字体颜色深色系
@color-bi-text-normal-theme-dark: @font-color-normal-theme-dark;
//黑色字体颜色 //黑色字体颜色
@color-bi-text-black: @font-color-black; @color-bi-text-black: @font-color-black;
//深色主题默认字体颜色 //深色主题默认字体颜色
@ -112,8 +114,8 @@
@color-bi-blue-60: fade(@font-color-highlight, 60); @color-bi-blue-60: fade(@font-color-highlight, 60);
@color-bi-blue-40: fade(@font-color-highlight, 40); @color-bi-blue-40: fade(@font-color-highlight, 40);
@color-bi-blue-30: fade(@font-color-highlight, 30); @color-bi-blue-30: fade(@font-color-highlight, 30);
@color-bi-blue-20: @background-color-medium-highlight; @color-bi-blue-20: fade(@font-color-highlight, 20);
@color-bi-blue-10: @background-color-light-highlight; @color-bi-blue-10: fade(@font-color-highlight, 10);
@color-bi-blue-5: fade(@font-color-highlight, 5); @color-bi-blue-5: fade(@font-color-highlight, 5);
//light-blue //light-blue

Loading…
Cancel
Save