Browse Source

Merge pull request #436 in FUI/fineui from ~WINDY/fui:master to master

* commit '2a6f21eb7a144d4fbc848aefba9ff4415397d66e':
  BI-23856 绿色文档改了
master
richie 7 years ago
parent
commit
7a00a2b1d9
  1. 14
      dist/base.css
  2. 24
      dist/bundle.css
  3. 2
      dist/bundle.min.css
  4. 4
      dist/core.css
  5. 4
      dist/core_without_normalize.css
  6. 24
      dist/fineui.css
  7. 2
      dist/fineui.min.css
  8. 4
      dist/resource.css
  9. 2
      dist/widget.css
  10. 4
      public/css/font.css
  11. 6
      src/css/base/single/button/button.css
  12. 4
      src/css/base/single/tip/tip.css
  13. 4
      src/css/base/table/table.css
  14. 4
      src/css/core/utils/common.css
  15. 4
      src/css/resource/font.css
  16. 2
      src/css/widget/filter/operation/filter.css
  17. 6
      src/less/lib/constant.less
  18. 4
      ui/css/font.css

14
dist/base.css vendored

@ -1093,8 +1093,8 @@ body .bi-button.button-ignore.clear,
} }
body .bi-button.button-success, body .bi-button.button-success,
#body .bi-button.button-success { #body .bi-button.button-success {
background-color: #58cc7d; background-color: #13cd66;
border-color: #58cc7d; border-color: #13cd66;
} }
body .bi-button.button-success, body .bi-button.button-success,
#body .bi-button.button-success, #body .bi-button.button-success,
@ -1111,7 +1111,7 @@ body .bi-button.button-success.clear,
#body .bi-button.button-success.clear, #body .bi-button.button-success.clear,
body .bi-button.button-success.clear .b-font:before, body .bi-button.button-success.clear .b-font:before,
#body .bi-button.button-success.clear .b-font:before { #body .bi-button.button-success.clear .b-font:before {
color: #5cb75d; color: #13cd66;
} }
body .bi-button.button-warning, body .bi-button.button-warning,
#body .bi-button.button-warning { #body .bi-button.button-warning {
@ -1563,7 +1563,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
} }
.bi-bubble .bubble-success { .bi-bubble .bubble-success {
background: #e1f4e7; background: #e1f4e7;
color: #5cb75d; color: #13cd66;
} }
.bi-bubble .bubble-warning { .bi-bubble .bubble-warning {
background: #feeed7; background: #feeed7;
@ -1584,7 +1584,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
border-radius: 2px; border-radius: 2px;
} }
.bi-toast.toast-success { .bi-toast.toast-success {
background: #58cc7d; background: #13cd66;
} }
.bi-toast.toast-warning { .bi-toast.toast-warning {
background: #faaa39; background: #faaa39;
@ -1961,7 +1961,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
background-color: #3f8ce8; background-color: #3f8ce8;
} }
.bi-resizable-table-cell .resizable-table-cell-resizer-container.suitable .resizable-table-cell-resizer-knob { .bi-resizable-table-cell .resizable-table-cell-resizer-container.suitable .resizable-table-cell-resizer-knob {
background-color: #58cc7d; background-color: #13cd66;
} }
.bi-resizable-table .resizable-table-resizer { .bi-resizable-table .resizable-table-resizer {
@ -1970,7 +1970,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
background-color: #3f8ce8; background-color: #3f8ce8;
} }
.bi-resizable-table .resizable-table-resizer.suitable { .bi-resizable-table .resizable-table-resizer.suitable {
background-color: #58cc7d; background-color: #13cd66;
} }
.bi-resizable-table .resizable-table-region-resizer { .bi-resizable-table .resizable-table-region-resizer {
cursor: ew-resize; cursor: ew-resize;

24
dist/bundle.css vendored

@ -921,7 +921,7 @@ textarea {
.bi-list-item-select.button-success:active, .bi-list-item-select.button-success:active,
.bi-list-item-select.button-success.active { .bi-list-item-select.button-success.active {
color: #ffffff; color: #ffffff;
background-color: #58cc7d; background-color: #13cd66;
} }
.bi-list-item-select.button-success:active .bi-input, .bi-list-item-select.button-success:active .bi-input,
.bi-list-item-select.button-success.active .bi-input { .bi-list-item-select.button-success.active .bi-input {
@ -937,7 +937,7 @@ textarea {
} }
.bi-list-item-select.button-success:active.bi-high-light-border, .bi-list-item-select.button-success:active.bi-high-light-border,
.bi-list-item-select.button-success.active.bi-high-light-border { .bi-list-item-select.button-success.active.bi-high-light-border {
border-color: #58cc7d; border-color: #13cd66;
} }
.bi-list-item-select.button-warning { .bi-list-item-select.button-warning {
color: #ff4949; color: #ff4949;
@ -3139,8 +3139,8 @@ body .bi-button.button-ignore.clear,
} }
body .bi-button.button-success, body .bi-button.button-success,
#body .bi-button.button-success { #body .bi-button.button-success {
background-color: #58cc7d; background-color: #13cd66;
border-color: #58cc7d; border-color: #13cd66;
} }
body .bi-button.button-success, body .bi-button.button-success,
#body .bi-button.button-success, #body .bi-button.button-success,
@ -3157,7 +3157,7 @@ body .bi-button.button-success.clear,
#body .bi-button.button-success.clear, #body .bi-button.button-success.clear,
body .bi-button.button-success.clear .b-font:before, body .bi-button.button-success.clear .b-font:before,
#body .bi-button.button-success.clear .b-font:before { #body .bi-button.button-success.clear .b-font:before {
color: #5cb75d; color: #13cd66;
} }
body .bi-button.button-warning, body .bi-button.button-warning,
#body .bi-button.button-warning { #body .bi-button.button-warning {
@ -3609,7 +3609,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
} }
.bi-bubble .bubble-success { .bi-bubble .bubble-success {
background: #e1f4e7; background: #e1f4e7;
color: #5cb75d; color: #13cd66;
} }
.bi-bubble .bubble-warning { .bi-bubble .bubble-warning {
background: #feeed7; background: #feeed7;
@ -3630,7 +3630,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
border-radius: 2px; border-radius: 2px;
} }
.bi-toast.toast-success { .bi-toast.toast-success {
background: #58cc7d; background: #13cd66;
} }
.bi-toast.toast-warning { .bi-toast.toast-warning {
background: #faaa39; background: #faaa39;
@ -4007,7 +4007,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
background-color: #3f8ce8; background-color: #3f8ce8;
} }
.bi-resizable-table-cell .resizable-table-cell-resizer-container.suitable .resizable-table-cell-resizer-knob { .bi-resizable-table-cell .resizable-table-cell-resizer-container.suitable .resizable-table-cell-resizer-knob {
background-color: #58cc7d; background-color: #13cd66;
} }
.bi-resizable-table .resizable-table-resizer { .bi-resizable-table .resizable-table-resizer {
@ -4016,7 +4016,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
background-color: #3f8ce8; background-color: #3f8ce8;
} }
.bi-resizable-table .resizable-table-resizer.suitable { .bi-resizable-table .resizable-table-resizer.suitable {
background-color: #58cc7d; background-color: #13cd66;
} }
.bi-resizable-table .resizable-table-region-resizer { .bi-resizable-table .resizable-table-region-resizer {
cursor: ew-resize; cursor: ew-resize;
@ -4640,7 +4640,7 @@ ul.ztree.zTreeDragUL {
} }
.bi-filter-operation .operation-trigger.hover, .bi-filter-operation .operation-trigger.hover,
.bi-filter-operation .operation-trigger:hover { .bi-filter-operation .operation-trigger:hover {
color: #58cc7d; color: #13cd66;
} }
.bi-filter-pane { .bi-filter-pane {
min-width: 100%; min-width: 100%;
@ -6397,11 +6397,11 @@ textarea::-webkit-scrollbar-thumb:hover {
} }
.text-add-tip-font .b-font:before { .text-add-tip-font .b-font:before {
content: "\e6dd"; content: "\e6dd";
color: #5cb75d; color: #13cd66;
} }
.text-add-tip-font.disabled .b-font:before { .text-add-tip-font.disabled .b-font:before {
content: "\e6dd"; content: "\e6dd";
color: #5cb75d; color: #13cd66;
} }
.tree-collapse-icon-type1 .x-icon { .tree-collapse-icon-type1 .x-icon {
display: block; display: block;

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/core.css vendored

@ -921,7 +921,7 @@ textarea {
.bi-list-item-select.button-success:active, .bi-list-item-select.button-success:active,
.bi-list-item-select.button-success.active { .bi-list-item-select.button-success.active {
color: #ffffff; color: #ffffff;
background-color: #58cc7d; background-color: #13cd66;
} }
.bi-list-item-select.button-success:active .bi-input, .bi-list-item-select.button-success:active .bi-input,
.bi-list-item-select.button-success.active .bi-input { .bi-list-item-select.button-success.active .bi-input {
@ -937,7 +937,7 @@ textarea {
} }
.bi-list-item-select.button-success:active.bi-high-light-border, .bi-list-item-select.button-success:active.bi-high-light-border,
.bi-list-item-select.button-success.active.bi-high-light-border { .bi-list-item-select.button-success.active.bi-high-light-border {
border-color: #58cc7d; border-color: #13cd66;
} }
.bi-list-item-select.button-warning { .bi-list-item-select.button-warning {
color: #ff4949; color: #ff4949;

4
dist/core_without_normalize.css vendored

@ -643,7 +643,7 @@ textarea {
.bi-list-item-select.button-success:active, .bi-list-item-select.button-success:active,
.bi-list-item-select.button-success.active { .bi-list-item-select.button-success.active {
color: #ffffff; color: #ffffff;
background-color: #58cc7d; background-color: #13cd66;
} }
.bi-list-item-select.button-success:active .bi-input, .bi-list-item-select.button-success:active .bi-input,
.bi-list-item-select.button-success.active .bi-input { .bi-list-item-select.button-success.active .bi-input {
@ -659,7 +659,7 @@ textarea {
} }
.bi-list-item-select.button-success:active.bi-high-light-border, .bi-list-item-select.button-success:active.bi-high-light-border,
.bi-list-item-select.button-success.active.bi-high-light-border { .bi-list-item-select.button-success.active.bi-high-light-border {
border-color: #58cc7d; border-color: #13cd66;
} }
.bi-list-item-select.button-warning { .bi-list-item-select.button-warning {
color: #ff4949; color: #ff4949;

24
dist/fineui.css vendored

@ -921,7 +921,7 @@ textarea {
.bi-list-item-select.button-success:active, .bi-list-item-select.button-success:active,
.bi-list-item-select.button-success.active { .bi-list-item-select.button-success.active {
color: #ffffff; color: #ffffff;
background-color: #58cc7d; background-color: #13cd66;
} }
.bi-list-item-select.button-success:active .bi-input, .bi-list-item-select.button-success:active .bi-input,
.bi-list-item-select.button-success.active .bi-input { .bi-list-item-select.button-success.active .bi-input {
@ -937,7 +937,7 @@ textarea {
} }
.bi-list-item-select.button-success:active.bi-high-light-border, .bi-list-item-select.button-success:active.bi-high-light-border,
.bi-list-item-select.button-success.active.bi-high-light-border { .bi-list-item-select.button-success.active.bi-high-light-border {
border-color: #58cc7d; border-color: #13cd66;
} }
.bi-list-item-select.button-warning { .bi-list-item-select.button-warning {
color: #ff4949; color: #ff4949;
@ -3139,8 +3139,8 @@ body .bi-button.button-ignore.clear,
} }
body .bi-button.button-success, body .bi-button.button-success,
#body .bi-button.button-success { #body .bi-button.button-success {
background-color: #58cc7d; background-color: #13cd66;
border-color: #58cc7d; border-color: #13cd66;
} }
body .bi-button.button-success, body .bi-button.button-success,
#body .bi-button.button-success, #body .bi-button.button-success,
@ -3157,7 +3157,7 @@ body .bi-button.button-success.clear,
#body .bi-button.button-success.clear, #body .bi-button.button-success.clear,
body .bi-button.button-success.clear .b-font:before, body .bi-button.button-success.clear .b-font:before,
#body .bi-button.button-success.clear .b-font:before { #body .bi-button.button-success.clear .b-font:before {
color: #5cb75d; color: #13cd66;
} }
body .bi-button.button-warning, body .bi-button.button-warning,
#body .bi-button.button-warning { #body .bi-button.button-warning {
@ -3609,7 +3609,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
} }
.bi-bubble .bubble-success { .bi-bubble .bubble-success {
background: #e1f4e7; background: #e1f4e7;
color: #5cb75d; color: #13cd66;
} }
.bi-bubble .bubble-warning { .bi-bubble .bubble-warning {
background: #feeed7; background: #feeed7;
@ -3630,7 +3630,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
border-radius: 2px; border-radius: 2px;
} }
.bi-toast.toast-success { .bi-toast.toast-success {
background: #58cc7d; background: #13cd66;
} }
.bi-toast.toast-warning { .bi-toast.toast-warning {
background: #faaa39; background: #faaa39;
@ -4007,7 +4007,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
background-color: #3f8ce8; background-color: #3f8ce8;
} }
.bi-resizable-table-cell .resizable-table-cell-resizer-container.suitable .resizable-table-cell-resizer-knob { .bi-resizable-table-cell .resizable-table-cell-resizer-container.suitable .resizable-table-cell-resizer-knob {
background-color: #58cc7d; background-color: #13cd66;
} }
.bi-resizable-table .resizable-table-resizer { .bi-resizable-table .resizable-table-resizer {
@ -4016,7 +4016,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
background-color: #3f8ce8; background-color: #3f8ce8;
} }
.bi-resizable-table .resizable-table-resizer.suitable { .bi-resizable-table .resizable-table-resizer.suitable {
background-color: #58cc7d; background-color: #13cd66;
} }
.bi-resizable-table .resizable-table-region-resizer { .bi-resizable-table .resizable-table-region-resizer {
cursor: ew-resize; cursor: ew-resize;
@ -4640,7 +4640,7 @@ ul.ztree.zTreeDragUL {
} }
.bi-filter-operation .operation-trigger.hover, .bi-filter-operation .operation-trigger.hover,
.bi-filter-operation .operation-trigger:hover { .bi-filter-operation .operation-trigger:hover {
color: #58cc7d; color: #13cd66;
} }
.bi-filter-pane { .bi-filter-pane {
min-width: 100%; min-width: 100%;
@ -6397,11 +6397,11 @@ textarea::-webkit-scrollbar-thumb:hover {
} }
.text-add-tip-font .b-font:before { .text-add-tip-font .b-font:before {
content: "\e6dd"; content: "\e6dd";
color: #5cb75d; color: #13cd66;
} }
.text-add-tip-font.disabled .b-font:before { .text-add-tip-font.disabled .b-font:before {
content: "\e6dd"; content: "\e6dd";
color: #5cb75d; color: #13cd66;
} }
.tree-collapse-icon-type1 .x-icon { .tree-collapse-icon-type1 .x-icon {
display: block; display: block;

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/resource.css vendored

@ -1180,11 +1180,11 @@ textarea::-webkit-scrollbar-thumb:hover {
} }
.text-add-tip-font .b-font:before { .text-add-tip-font .b-font:before {
content: "\e6dd"; content: "\e6dd";
color: #5cb75d; color: #13cd66;
} }
.text-add-tip-font.disabled .b-font:before { .text-add-tip-font.disabled .b-font:before {
content: "\e6dd"; content: "\e6dd";
color: #5cb75d; color: #13cd66;
} }
.tree-collapse-icon-type1 .x-icon { .tree-collapse-icon-type1 .x-icon {
display: block; display: block;

2
dist/widget.css vendored

@ -139,7 +139,7 @@
} }
.bi-filter-operation .operation-trigger.hover, .bi-filter-operation .operation-trigger.hover,
.bi-filter-operation .operation-trigger:hover { .bi-filter-operation .operation-trigger:hover {
color: #58cc7d; color: #13cd66;
} }
.bi-filter-pane { .bi-filter-pane {
min-width: 100%; min-width: 100%;

4
public/css/font.css

@ -859,9 +859,9 @@
} }
.text-add-tip-font .b-font:before { .text-add-tip-font .b-font:before {
content: "\e6dd"; content: "\e6dd";
color: #5cb75d; color: #13cd66;
} }
.text-add-tip-font.disabled .b-font:before { .text-add-tip-font.disabled .b-font:before {
content: "\e6dd"; content: "\e6dd";
color: #5cb75d; color: #13cd66;
} }

6
src/css/base/single/button/button.css

@ -84,8 +84,8 @@ body .bi-button.button-ignore.clear,
} }
body .bi-button.button-success, body .bi-button.button-success,
#body .bi-button.button-success { #body .bi-button.button-success {
background-color: #58cc7d; background-color: #13cd66;
border-color: #58cc7d; border-color: #13cd66;
} }
body .bi-button.button-success, body .bi-button.button-success,
#body .bi-button.button-success, #body .bi-button.button-success,
@ -102,7 +102,7 @@ body .bi-button.button-success.clear,
#body .bi-button.button-success.clear, #body .bi-button.button-success.clear,
body .bi-button.button-success.clear .b-font:before, body .bi-button.button-success.clear .b-font:before,
#body .bi-button.button-success.clear .b-font:before { #body .bi-button.button-success.clear .b-font:before {
color: #5cb75d; color: #13cd66;
} }
body .bi-button.button-warning, body .bi-button.button-warning,
#body .bi-button.button-warning { #body .bi-button.button-warning {

4
src/css/base/single/tip/tip.css

@ -16,7 +16,7 @@
} }
.bi-bubble .bubble-success { .bi-bubble .bubble-success {
background: #e1f4e7; background: #e1f4e7;
color: #5cb75d; color: #13cd66;
} }
.bi-bubble .bubble-warning { .bi-bubble .bubble-warning {
background: #feeed7; background: #feeed7;
@ -37,7 +37,7 @@
border-radius: 2px; border-radius: 2px;
} }
.bi-toast.toast-success { .bi-toast.toast-success {
background: #58cc7d; background: #13cd66;
} }
.bi-toast.toast-warning { .bi-toast.toast-warning {
background: #faaa39; background: #faaa39;

4
src/css/base/table/table.css

@ -252,7 +252,7 @@
background-color: #3f8ce8; background-color: #3f8ce8;
} }
.bi-resizable-table-cell .resizable-table-cell-resizer-container.suitable .resizable-table-cell-resizer-knob { .bi-resizable-table-cell .resizable-table-cell-resizer-container.suitable .resizable-table-cell-resizer-knob {
background-color: #58cc7d; background-color: #13cd66;
} }
.bi-resizable-table .resizable-table-resizer { .bi-resizable-table .resizable-table-resizer {
@ -261,7 +261,7 @@
background-color: #3f8ce8; background-color: #3f8ce8;
} }
.bi-resizable-table .resizable-table-resizer.suitable { .bi-resizable-table .resizable-table-resizer.suitable {
background-color: #58cc7d; background-color: #13cd66;
} }
.bi-resizable-table .resizable-table-region-resizer { .bi-resizable-table .resizable-table-region-resizer {
cursor: ew-resize; cursor: ew-resize;

4
src/css/core/utils/common.css

@ -643,7 +643,7 @@ textarea {
.bi-list-item-select.button-success:active, .bi-list-item-select.button-success:active,
.bi-list-item-select.button-success.active { .bi-list-item-select.button-success.active {
color: #ffffff; color: #ffffff;
background-color: #58cc7d; background-color: #13cd66;
} }
.bi-list-item-select.button-success:active .bi-input, .bi-list-item-select.button-success:active .bi-input,
.bi-list-item-select.button-success.active .bi-input { .bi-list-item-select.button-success.active .bi-input {
@ -659,7 +659,7 @@ textarea {
} }
.bi-list-item-select.button-success:active.bi-high-light-border, .bi-list-item-select.button-success:active.bi-high-light-border,
.bi-list-item-select.button-success.active.bi-high-light-border { .bi-list-item-select.button-success.active.bi-high-light-border {
border-color: #58cc7d; border-color: #13cd66;
} }
.bi-list-item-select.button-warning { .bi-list-item-select.button-warning {
color: #ff4949; color: #ff4949;

4
src/css/resource/font.css

@ -859,9 +859,9 @@
} }
.text-add-tip-font .b-font:before { .text-add-tip-font .b-font:before {
content: "\e6dd"; content: "\e6dd";
color: #5cb75d; color: #13cd66;
} }
.text-add-tip-font.disabled .b-font:before { .text-add-tip-font.disabled .b-font:before {
content: "\e6dd"; content: "\e6dd";
color: #5cb75d; color: #13cd66;
} }

2
src/css/widget/filter/operation/filter.css

@ -1,4 +1,4 @@
.bi-filter-operation .operation-trigger.hover, .bi-filter-operation .operation-trigger.hover,
.bi-filter-operation .operation-trigger:hover { .bi-filter-operation .operation-trigger:hover {
color: #58cc7d; color: #13cd66;
} }

6
src/less/lib/constant.less

@ -25,7 +25,7 @@
@font-color-gray: #999999; @font-color-gray: #999999;
@font-color-white: #ffffff;// @font-color-white: #ffffff;//
@font-color-highlight: #3685f2; @font-color-highlight: #3685f2;
@font-color-success: #5cb75d; @font-color-success: #13cd66;
@font-color-warning: #faaa39;// @font-color-warning: #faaa39;//
@font-color-negative: #ff4949;// @font-color-negative: #ff4949;//
@ -48,7 +48,7 @@
@background-color-light-warning: #feeed7; @background-color-light-warning: #feeed7;
@background-color-warning: #faaa39; @background-color-warning: #faaa39;
@background-color-dark-success: #58cc7d; @background-color-dark-success: #13cd66;
@background-color-light-success: #e1f4e7; @background-color-light-success: #e1f4e7;
@background-color-normal-success: #647185; @background-color-normal-success: #647185;
@ -61,7 +61,7 @@
@border-color-warning: #fbb03b; @border-color-warning: #fbb03b;
@border-color-negative: #e85050; @border-color-negative: #e85050;
@border-color-success: #58cc7d; @border-color-success: #13cd66;
@border-color-light-negative: #f4cbcb; @border-color-light-negative: #f4cbcb;
@border-color-normal-success: #eddea2; @border-color-normal-success: #eddea2;

4
ui/css/font.css

@ -859,9 +859,9 @@
} }
.text-add-tip-font .b-font:before { .text-add-tip-font .b-font:before {
content: "\e6dd"; content: "\e6dd";
color: #5cb75d; color: #13cd66;
} }
.text-add-tip-font.disabled .b-font:before { .text-add-tip-font.disabled .b-font:before {
content: "\e6dd"; content: "\e6dd";
color: #5cb75d; color: #13cd66;
} }

Loading…
Cancel
Save