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

* commit 'c4428b52ce0ec47dfc1b229b2d15416334e7f031': BI-27490 更新 update BI-24404 && BI-25602 && BI-27449 BI-24404
6 years ago · 1972538c95
41 changed files with 291369 additions and 291189 deletions
--- a/demo/js/case/demo.click.effect.js
+++ b/demo/js/case/demo.click.effect.js
@ -8,27 +8,31 @@ Demo.Func = BI.inherit(BI.Widget, {
            type: "bi.vertical",
            items: BI.createItems([{
                text: "bi-list-item",
-                cls: "bi-list-item"
+                cls: "bi-list-item close-font"
            }, {
                text: "bi-list-item-simple",
-                cls: "bi-list-item-simple"
+                cls: "bi-list-item-simple close-font"
            }, {
                text: "bi-list-item-effect",
-                cls: "bi-list-item-effect"
+                cls: "bi-list-item-effect close-font"
            }, {
                text: "bi-list-item-active",
-                cls: "bi-list-item-active"
+                cls: "bi-list-item-active close-font"
            }, {
                text: "bi-list-item-active2",
-                cls: "bi-list-item-active2"
+                cls: "bi-list-item-active2 close-font"
            }, {
                text: "bi-list-item-active3",
-                cls: "bi-list-item-active3"
+                cls: "bi-list-item-active3 close-font"
            }, {
                text: "bi-list-item-select",
-                cls: "bi-list-item-select"
+                cls: "bi-list-item-select close-font"
            }], {
-                type: "bi.text_item"
+                type: "bi.icon_text_item",
+                disabled: true,
+                logic: {
+                    dynamic: true
+                }
            }),
            vgap: 10
        };
--- a/demo/js/widget/numbereditor/demo.number_editor.js
+++ b/demo/js/widget/numbereditor/demo.number_editor.js
@ -22,6 +22,7 @@ Demo.FileManager = BI.inherit(BI.Widget, {
            } else {
                editor.setDownEnable(true);
            }
+            BI.Msg.toast(editor.getValue());
        });
        return {
            type: "bi.vertical",
--- a/dist/_fineui.min.js
+++ b/dist/_fineui.min.js
--- a/dist/base.css
+++ b/dist/base.css
@ -1095,7 +1095,7 @@ li.CodeMirror-hint-active {
 }
 .bi-segment.disabled > .center-element,
 .bi-segment.disabled > .first-element {
-  border-color: #F0F3F7;
+  border-color: #d0d4da;
 }
 .bi-theme-dark .bi-segment > .center-element {
  overflow: hidden;
@ -1274,8 +1274,8 @@ body .bi-button.button-error.disabled.base-disabled,
 #body .bi-button.button-error.disabled.base-disabled,
 body .bi-button.button-warning.disabled.base-disabled,
 #body .bi-button.button-warning.disabled.base-disabled {
-  background: #F0F3F7 !important;
-  border-color: #F0F3F7 !important;
+  background: #d0d4da !important;
+  border-color: #d0d4da !important;
 }
 body .bi-button.button-common.disabled,
 #body .bi-button.button-common.disabled,
@ -1734,8 +1734,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
  border-radius: 5px;
 }
 .bi-theme-dark .scrollbar-layout-main {
-  background-color: rgba(240, 243, 247, 0.05);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
+  background-color: rgba(208, 212, 218, 0.05);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
 }
 .scrollbar-layout-main-vertical {
  bottom: 0;
@ -1757,8 +1757,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d878d9f,endColorstr=#0d878d9f);
 }
 .bi-theme-dark .scrollbar-layout-main-horizontal {
-  background-color: rgba(240, 243, 247, 0.05);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
+  background-color: rgba(208, 212, 218, 0.05);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
 }
 /* Touching the scroll-track directly makes the scroll-track bolder */
 .scrollbar-layout-main-horizontal.public-scrollbar-main-active,
@ -1815,8 +1815,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d878d9f,endColorstr=#4d878d9f);
 }
 .bi-theme-dark .public-scrollbar-face:after {
-  background-color: rgba(240, 243, 247, 0.3);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
+  background-color: rgba(208, 212, 218, 0.3);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dd0d4da,endColorstr=#4dd0d4da);
 }
 .public-scrollbar-main:hover .public-scrollbar-face:after,
 .public-scrollbar-main-active .public-scrollbar-face:after,
@ -1827,8 +1827,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
 .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-face-active:after {
-  background-color: rgba(240, 243, 247, 0.7);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
+  background-color: rgba(208, 212, 218, 0.7);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3d0d4da,endColorstr=#b3d0d4da);
 }
 .horizontal-scrollbar {
  bottom: 0;
--- a/dist/base.js
+++ b/dist/base.js
--- a/dist/bundle.css
+++ b/dist/bundle.css
@ -295,7 +295,7 @@ textarea {
  color: #9ea6b2 !important;
 }
 .base-disabled .b-font:before {
-  color: #9ea6b2 !important;
+  color: #d0d4da !important;
 }
 .bi-theme-dark .base-disabled {
  color: #878d9f !important;
@ -307,7 +307,7 @@ textarea {
  color: #878d9f !important;
 }
 .bi-theme-dark .base-disabled .b-font:before {
-  color: #878d9f !important;
+  color: #606479 !important;
 }
 .base-invalid {
  cursor: default !important;
@ -1144,7 +1144,7 @@ textarea {
  color: #9ea6b2 !important;
 }
 .bi-list-item-select.disabled.bi-high-light-border {
-  border-color: #F0F3F7;
+  border-color: #d0d4da;
 }
 .bi-list-item-select.disabled.hover,
 .bi-list-item-select.disabled.active {
@ -1165,7 +1165,7 @@ textarea {
 }
 .bi-list-item-select.disabled.hover.bi-high-light-border,
 .bi-list-item-select.disabled.active.bi-high-light-border {
-  border-color: #F0F3F7;
+  border-color: #d0d4da;
 }
 .bi-list-item-select2:hover,
 .bi-list-item-select2.hover {
@ -1188,6 +1188,12 @@ textarea {
 .bi-list-item-select2.active .bi-high-light {
  color: #ffffff;
 }
+.bi-list-item-select2.disabled:hover,
+.bi-list-item-select2.disabled.hover,
+.bi-list-item-select2.disabled:active,
+.bi-list-item-select2.disabled.active {
+  background-color: #ffffff !important;
+}
 .bi-theme-dark .bi-list-item-select:hover,
 .bi-theme-dark .bi-list-item-select.hover {
  color: #ffffff;
@ -2935,7 +2941,7 @@ li.CodeMirror-hint-active {
 }
 .bi-segment.disabled > .center-element,
 .bi-segment.disabled > .first-element {
-  border-color: #F0F3F7;
+  border-color: #d0d4da;
 }
 .bi-theme-dark .bi-segment > .center-element {
  overflow: hidden;
@ -3114,8 +3120,8 @@ body .bi-button.button-error.disabled.base-disabled,
 #body .bi-button.button-error.disabled.base-disabled,
 body .bi-button.button-warning.disabled.base-disabled,
 #body .bi-button.button-warning.disabled.base-disabled {
-  background: #F0F3F7 !important;
-  border-color: #F0F3F7 !important;
+  background: #d0d4da !important;
+  border-color: #d0d4da !important;
 }
 body .bi-button.button-common.disabled,
 #body .bi-button.button-common.disabled,
@ -3574,8 +3580,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
  border-radius: 5px;
 }
 .bi-theme-dark .scrollbar-layout-main {
-  background-color: rgba(240, 243, 247, 0.05);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
+  background-color: rgba(208, 212, 218, 0.05);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
 }
 .scrollbar-layout-main-vertical {
  bottom: 0;
@ -3597,8 +3603,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d878d9f,endColorstr=#0d878d9f);
 }
 .bi-theme-dark .scrollbar-layout-main-horizontal {
-  background-color: rgba(240, 243, 247, 0.05);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
+  background-color: rgba(208, 212, 218, 0.05);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
 }
 /* Touching the scroll-track directly makes the scroll-track bolder */
 .scrollbar-layout-main-horizontal.public-scrollbar-main-active,
@ -3655,8 +3661,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d878d9f,endColorstr=#4d878d9f);
 }
 .bi-theme-dark .public-scrollbar-face:after {
-  background-color: rgba(240, 243, 247, 0.3);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
+  background-color: rgba(208, 212, 218, 0.3);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dd0d4da,endColorstr=#4dd0d4da);
 }
 .public-scrollbar-main:hover .public-scrollbar-face:after,
 .public-scrollbar-main-active .public-scrollbar-face:after,
@ -3667,8 +3673,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
 .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-face-active:after {
-  background-color: rgba(240, 243, 247, 0.7);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
+  background-color: rgba(208, 212, 218, 0.7);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3d0d4da,endColorstr=#b3d0d4da);
 }
 .horizontal-scrollbar {
  bottom: 0;
@ -4489,6 +4495,17 @@ ul.ztree.zTreeDragUL {
  top: 4px;
  left: -10px;
 }
+.bi-single-slider-button .slider-button.disabled {
+  border-color: #d0d4da;
+}
+.bi-single-slider-button .slider-button.disabled:hover,
+.bi-single-slider-button .slider-button.disabled.hover {
+  background-color: #f7f8fa;
+  width: 16px;
+  height: 16px;
+  top: 6px;
+  left: -8px;
+}
 .bi-slider-track .gray-track {
  background-color: #F2F4F7;
  -webkit-border-radius: 3px;
@ -4602,8 +4619,8 @@ textarea::-webkit-scrollbar-thumb:hover {
 .bi-theme-dark div::-webkit-scrollbar,
 .bi-theme-dark textarea::-webkit-scrollbar {
  -webkit-appearance: none;
-  background-color: rgba(240, 243, 247, 0.05);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
+  background-color: rgba(208, 212, 218, 0.05);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
  width: 6px;
  height: 6px;
 }
@ -4612,13 +4629,13 @@ textarea::-webkit-scrollbar-thumb:hover {
  -webkit-border-radius: 0;
  -moz-border-radius: 0;
  border-radius: 0;
-  background-color: rgba(240, 243, 247, 0.3);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
+  background-color: rgba(208, 212, 218, 0.3);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dd0d4da,endColorstr=#4dd0d4da);
 }
 .bi-theme-dark div::-webkit-scrollbar-thumb:hover,
 .bi-theme-dark textarea::-webkit-scrollbar-thumb:hover {
-  background-color: rgba(240, 243, 247, 0.7);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
+  background-color: rgba(208, 212, 218, 0.7);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3d0d4da,endColorstr=#b3d0d4da);
 }
 .farbtastic .wheel {
  background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/wheel.png') no-repeat center center;
--- a/dist/bundle.js
+++ b/dist/bundle.js
--- a/dist/bundle.min.css
+++ b/dist/bundle.min.css
--- a/dist/bundle.min.js
+++ b/dist/bundle.min.js
--- a/dist/case.js
+++ b/dist/case.js
@ -5842,7 +5842,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
            cls: "icon-combo-trigger-icon",
            iconCls: iconCls,
            disableSelected: true,
-            width: o.isShowDown ? o.width - 2 : o.width,
+            width: o.isShowDown ? o.width - 12 : o.width,
            height: o.height,
            iconWidth: o.iconWidth,
            iconHeight: o.iconHeight,
@ -5851,7 +5851,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
        this.down = BI.createWidget({
            type: "bi.icon_button",
            disableSelected: true,
-            cls: "icon-combo-down-icon trigger-triangle-font",
+            cls: "icon-combo-down-icon trigger-triangle-font font-size-12",
            width: 12,
            height: 8,
            selected: BI.isNotEmptyString(iconCls)
@ -5868,7 +5868,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
                bottom: 0
            }, {
                el: this.down,
-                right: 0,
+                right: 3,
                bottom: 0
            }]
        });
@ -11848,7 +11848,7 @@ BI.SegmentButton = BI.inherit(BI.BasicButton, {
        this.text = BI.createWidget({
            type: "bi.label",
            element: this,
-            height: opts.height - 2,
+            textHeight: opts.height,
            whiteSpace: opts.whiteSpace,
            text: opts.text,
            value: opts.value,
--- a/dist/core.css
+++ b/dist/core.css
@ -295,7 +295,7 @@ textarea {
  color: #9ea6b2 !important;
 }
 .base-disabled .b-font:before {
-  color: #9ea6b2 !important;
+  color: #d0d4da !important;
 }
 .bi-theme-dark .base-disabled {
  color: #878d9f !important;
@ -307,7 +307,7 @@ textarea {
  color: #878d9f !important;
 }
 .bi-theme-dark .base-disabled .b-font:before {
-  color: #878d9f !important;
+  color: #606479 !important;
 }
 .base-invalid {
  cursor: default !important;
@ -1144,7 +1144,7 @@ textarea {
  color: #9ea6b2 !important;
 }
 .bi-list-item-select.disabled.bi-high-light-border {
-  border-color: #F0F3F7;
+  border-color: #d0d4da;
 }
 .bi-list-item-select.disabled.hover,
 .bi-list-item-select.disabled.active {
@ -1165,7 +1165,7 @@ textarea {
 }
 .bi-list-item-select.disabled.hover.bi-high-light-border,
 .bi-list-item-select.disabled.active.bi-high-light-border {
-  border-color: #F0F3F7;
+  border-color: #d0d4da;
 }
 .bi-list-item-select2:hover,
 .bi-list-item-select2.hover {
@ -1188,6 +1188,12 @@ textarea {
 .bi-list-item-select2.active .bi-high-light {
  color: #ffffff;
 }
+.bi-list-item-select2.disabled:hover,
+.bi-list-item-select2.disabled.hover,
+.bi-list-item-select2.disabled:active,
+.bi-list-item-select2.disabled.active {
+  background-color: #ffffff !important;
+}
 .bi-theme-dark .bi-list-item-select:hover,
 .bi-theme-dark .bi-list-item-select.hover {
  color: #ffffff;
--- a/dist/core_without_normalize.css
+++ b/dist/core_without_normalize.css
@ -17,7 +17,7 @@ textarea {
  color: #9ea6b2 !important;
 }
 .base-disabled .b-font:before {
-  color: #9ea6b2 !important;
+  color: #d0d4da !important;
 }
 .bi-theme-dark .base-disabled {
  color: #878d9f !important;
@ -29,7 +29,7 @@ textarea {
  color: #878d9f !important;
 }
 .bi-theme-dark .base-disabled .b-font:before {
-  color: #878d9f !important;
+  color: #606479 !important;
 }
 .base-invalid {
  cursor: default !important;
@ -866,7 +866,7 @@ textarea {
  color: #9ea6b2 !important;
 }
 .bi-list-item-select.disabled.bi-high-light-border {
-  border-color: #F0F3F7;
+  border-color: #d0d4da;
 }
 .bi-list-item-select.disabled.hover,
 .bi-list-item-select.disabled.active {
@ -887,7 +887,7 @@ textarea {
 }
 .bi-list-item-select.disabled.hover.bi-high-light-border,
 .bi-list-item-select.disabled.active.bi-high-light-border {
-  border-color: #F0F3F7;
+  border-color: #d0d4da;
 }
 .bi-list-item-select2:hover,
 .bi-list-item-select2.hover {
@ -910,6 +910,12 @@ textarea {
 .bi-list-item-select2.active .bi-high-light {
  color: #ffffff;
 }
+.bi-list-item-select2.disabled:hover,
+.bi-list-item-select2.disabled.hover,
+.bi-list-item-select2.disabled:active,
+.bi-list-item-select2.disabled.active {
+  background-color: #ffffff !important;
+}
 .bi-theme-dark .bi-list-item-select:hover,
 .bi-theme-dark .bi-list-item-select.hover {
  color: #ffffff;
--- a/dist/demo.js
+++ b/dist/demo.js
@ -2386,27 +2386,31 @@ BI.shortcut("demo.calendar", Demo.Func);Demo.Func = BI.inherit(BI.Widget, {
            type: "bi.vertical",
            items: BI.createItems([{
                text: "bi-list-item",
-                cls: "bi-list-item"
+                cls: "bi-list-item close-font"
            }, {
                text: "bi-list-item-simple",
-                cls: "bi-list-item-simple"
+                cls: "bi-list-item-simple close-font"
            }, {
                text: "bi-list-item-effect",
-                cls: "bi-list-item-effect"
+                cls: "bi-list-item-effect close-font"
            }, {
                text: "bi-list-item-active",
-                cls: "bi-list-item-active"
+                cls: "bi-list-item-active close-font"
            }, {
                text: "bi-list-item-active2",
-                cls: "bi-list-item-active2"
+                cls: "bi-list-item-active2 close-font"
            }, {
                text: "bi-list-item-active3",
-                cls: "bi-list-item-active3"
+                cls: "bi-list-item-active3 close-font"
            }, {
                text: "bi-list-item-select",
-                cls: "bi-list-item-select"
+                cls: "bi-list-item-select close-font"
            }], {
-                type: "bi.text_item"
+                type: "bi.icon_text_item",
+                disabled: true,
+                logic: {
+                    dynamic: true
+                }
            }),
            vgap: 10
        };
@ -13050,6 +13054,7 @@ Demo.FileManager = BI.inherit(BI.Widget, {
            } else {
                editor.setDownEnable(true);
            }
+            BI.Msg.toast(editor.getValue());
        });
        return {
            type: "bi.vertical",
--- a/dist/fineui.css
+++ b/dist/fineui.css
@ -295,7 +295,7 @@ textarea {
  color: #9ea6b2 !important;
 }
 .base-disabled .b-font:before {
-  color: #9ea6b2 !important;
+  color: #d0d4da !important;
 }
 .bi-theme-dark .base-disabled {
  color: #878d9f !important;
@ -307,7 +307,7 @@ textarea {
  color: #878d9f !important;
 }
 .bi-theme-dark .base-disabled .b-font:before {
-  color: #878d9f !important;
+  color: #606479 !important;
 }
 .base-invalid {
  cursor: default !important;
@ -1144,7 +1144,7 @@ textarea {
  color: #9ea6b2 !important;
 }
 .bi-list-item-select.disabled.bi-high-light-border {
-  border-color: #F0F3F7;
+  border-color: #d0d4da;
 }
 .bi-list-item-select.disabled.hover,
 .bi-list-item-select.disabled.active {
@ -1165,7 +1165,7 @@ textarea {
 }
 .bi-list-item-select.disabled.hover.bi-high-light-border,
 .bi-list-item-select.disabled.active.bi-high-light-border {
-  border-color: #F0F3F7;
+  border-color: #d0d4da;
 }
 .bi-list-item-select2:hover,
 .bi-list-item-select2.hover {
@ -1188,6 +1188,12 @@ textarea {
 .bi-list-item-select2.active .bi-high-light {
  color: #ffffff;
 }
+.bi-list-item-select2.disabled:hover,
+.bi-list-item-select2.disabled.hover,
+.bi-list-item-select2.disabled:active,
+.bi-list-item-select2.disabled.active {
+  background-color: #ffffff !important;
+}
 .bi-theme-dark .bi-list-item-select:hover,
 .bi-theme-dark .bi-list-item-select.hover {
  color: #ffffff;
@ -2935,7 +2941,7 @@ li.CodeMirror-hint-active {
 }
 .bi-segment.disabled > .center-element,
 .bi-segment.disabled > .first-element {
-  border-color: #F0F3F7;
+  border-color: #d0d4da;
 }
 .bi-theme-dark .bi-segment > .center-element {
  overflow: hidden;
@ -3114,8 +3120,8 @@ body .bi-button.button-error.disabled.base-disabled,
 #body .bi-button.button-error.disabled.base-disabled,
 body .bi-button.button-warning.disabled.base-disabled,
 #body .bi-button.button-warning.disabled.base-disabled {
-  background: #F0F3F7 !important;
-  border-color: #F0F3F7 !important;
+  background: #d0d4da !important;
+  border-color: #d0d4da !important;
 }
 body .bi-button.button-common.disabled,
 #body .bi-button.button-common.disabled,
@ -3574,8 +3580,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
  border-radius: 5px;
 }
 .bi-theme-dark .scrollbar-layout-main {
-  background-color: rgba(240, 243, 247, 0.05);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
+  background-color: rgba(208, 212, 218, 0.05);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
 }
 .scrollbar-layout-main-vertical {
  bottom: 0;
@ -3597,8 +3603,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d878d9f,endColorstr=#0d878d9f);
 }
 .bi-theme-dark .scrollbar-layout-main-horizontal {
-  background-color: rgba(240, 243, 247, 0.05);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
+  background-color: rgba(208, 212, 218, 0.05);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
 }
 /* Touching the scroll-track directly makes the scroll-track bolder */
 .scrollbar-layout-main-horizontal.public-scrollbar-main-active,
@ -3655,8 +3661,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d878d9f,endColorstr=#4d878d9f);
 }
 .bi-theme-dark .public-scrollbar-face:after {
-  background-color: rgba(240, 243, 247, 0.3);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
+  background-color: rgba(208, 212, 218, 0.3);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dd0d4da,endColorstr=#4dd0d4da);
 }
 .public-scrollbar-main:hover .public-scrollbar-face:after,
 .public-scrollbar-main-active .public-scrollbar-face:after,
@ -3667,8 +3673,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
 .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-face-active:after {
-  background-color: rgba(240, 243, 247, 0.7);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
+  background-color: rgba(208, 212, 218, 0.7);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3d0d4da,endColorstr=#b3d0d4da);
 }
 .horizontal-scrollbar {
  bottom: 0;
@ -4489,6 +4495,17 @@ ul.ztree.zTreeDragUL {
  top: 4px;
  left: -10px;
 }
+.bi-single-slider-button .slider-button.disabled {
+  border-color: #d0d4da;
+}
+.bi-single-slider-button .slider-button.disabled:hover,
+.bi-single-slider-button .slider-button.disabled.hover {
+  background-color: #f7f8fa;
+  width: 16px;
+  height: 16px;
+  top: 6px;
+  left: -8px;
+}
 .bi-slider-track .gray-track {
  background-color: #F2F4F7;
  -webkit-border-radius: 3px;
@ -4602,8 +4619,8 @@ textarea::-webkit-scrollbar-thumb:hover {
 .bi-theme-dark div::-webkit-scrollbar,
 .bi-theme-dark textarea::-webkit-scrollbar {
  -webkit-appearance: none;
-  background-color: rgba(240, 243, 247, 0.05);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
+  background-color: rgba(208, 212, 218, 0.05);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
  width: 6px;
  height: 6px;
 }
@ -4612,13 +4629,13 @@ textarea::-webkit-scrollbar-thumb:hover {
  -webkit-border-radius: 0;
  -moz-border-radius: 0;
  border-radius: 0;
-  background-color: rgba(240, 243, 247, 0.3);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
+  background-color: rgba(208, 212, 218, 0.3);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dd0d4da,endColorstr=#4dd0d4da);
 }
 .bi-theme-dark div::-webkit-scrollbar-thumb:hover,
 .bi-theme-dark textarea::-webkit-scrollbar-thumb:hover {
-  background-color: rgba(240, 243, 247, 0.7);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
+  background-color: rgba(208, 212, 218, 0.7);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3d0d4da,endColorstr=#b3d0d4da);
 }
 .farbtastic .wheel {
  background: url('resources?path=/com/fr/web/ui/images/1x/background/wheel.png') no-repeat center center;
--- a/dist/fineui.js
+++ b/dist/fineui.js
--- a/dist/fineui.min.css
+++ b/dist/fineui.min.css
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/dist/resource.css
+++ b/dist/resource.css
@ -51,8 +51,8 @@ textarea::-webkit-scrollbar-thumb:hover {
 .bi-theme-dark div::-webkit-scrollbar,
 .bi-theme-dark textarea::-webkit-scrollbar {
  -webkit-appearance: none;
-  background-color: rgba(240, 243, 247, 0.05);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
+  background-color: rgba(208, 212, 218, 0.05);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
  width: 6px;
  height: 6px;
 }
@ -61,13 +61,13 @@ textarea::-webkit-scrollbar-thumb:hover {
  -webkit-border-radius: 0;
  -moz-border-radius: 0;
  border-radius: 0;
-  background-color: rgba(240, 243, 247, 0.3);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
+  background-color: rgba(208, 212, 218, 0.3);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dd0d4da,endColorstr=#4dd0d4da);
 }
 .bi-theme-dark div::-webkit-scrollbar-thumb:hover,
 .bi-theme-dark textarea::-webkit-scrollbar-thumb:hover {
-  background-color: rgba(240, 243, 247, 0.7);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
+  background-color: rgba(208, 212, 218, 0.7);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3d0d4da,endColorstr=#b3d0d4da);
 }
 .farbtastic .wheel {
  background: url('images/1x/background/wheel.png') no-repeat center center;
--- a/dist/widget.css
+++ b/dist/widget.css
@ -403,6 +403,17 @@
  top: 4px;
  left: -10px;
 }
+.bi-single-slider-button .slider-button.disabled {
+  border-color: #d0d4da;
+}
+.bi-single-slider-button .slider-button.disabled:hover,
+.bi-single-slider-button .slider-button.disabled.hover {
+  background-color: #f7f8fa;
+  width: 16px;
+  height: 16px;
+  top: 6px;
+  left: -8px;
+}
 .bi-slider-track .gray-track {
  background-color: #F2F4F7;
  -webkit-border-radius: 3px;
--- a/dist/widget.js
+++ b/dist/widget.js
--- a/public/css/app.css
+++ b/public/css/app.css
@ -51,8 +51,8 @@ textarea::-webkit-scrollbar-thumb:hover {
 .bi-theme-dark div::-webkit-scrollbar,
 .bi-theme-dark textarea::-webkit-scrollbar {
  -webkit-appearance: none;
-  background-color: rgba(240, 243, 247, 0.05);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
+  background-color: rgba(208, 212, 218, 0.05);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
  width: 6px;
  height: 6px;
 }
@ -61,11 +61,11 @@ textarea::-webkit-scrollbar-thumb:hover {
  -webkit-border-radius: 0;
  -moz-border-radius: 0;
  border-radius: 0;
-  background-color: rgba(240, 243, 247, 0.3);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
+  background-color: rgba(208, 212, 218, 0.3);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dd0d4da,endColorstr=#4dd0d4da);
 }
 .bi-theme-dark div::-webkit-scrollbar-thumb:hover,
 .bi-theme-dark textarea::-webkit-scrollbar-thumb:hover {
-  background-color: rgba(240, 243, 247, 0.7);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
+  background-color: rgba(208, 212, 218, 0.7);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3d0d4da,endColorstr=#b3d0d4da);
 }
--- a/src/base/single/tip/tip.toast.js
+++ b/src/base/single/tip/tip.toast.js
@ -49,17 +49,16 @@ BI.Toast = BI.inherit(BI.Tip, {
        }

        var items = [{
-            type: "bi.center_adapt",
+            type: "bi.icon_button",
+            disableSelected: true,
            cls: cls + " toast-icon",
-            items: [{
-                type: "bi.icon"
-            }],
            width: 36
        }, {
            el: {
                type: "bi.label",
                whiteSpace: "normal",
                text: o.text,
+                textHeight: 16,
                textAlign: "left"
            },
            rgap: o.autoClose ? this._const.hgap : 0
@ -83,7 +82,7 @@ BI.Toast = BI.inherit(BI.Tip, {
            type: "bi.horizontal_adapt",
            element: this,
            items: items,
-            vgap: 5,
+            vgap: 7,
            columnSize: columnSize
        });
    },
--- a/src/case/combo/iconcombo/trigger.iconcombo.js
+++ b/src/case/combo/iconcombo/trigger.iconcombo.js
@ -30,7 +30,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
            cls: "icon-combo-trigger-icon",
            iconCls: iconCls,
            disableSelected: true,
-            width: o.isShowDown ? o.width - 2 : o.width,
+            width: o.isShowDown ? o.width - 12 : o.width,
            height: o.height,
            iconWidth: o.iconWidth,
            iconHeight: o.iconHeight,
@ -39,7 +39,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
        this.down = BI.createWidget({
            type: "bi.icon_button",
            disableSelected: true,
-            cls: "icon-combo-down-icon trigger-triangle-font",
+            cls: "icon-combo-down-icon trigger-triangle-font font-size-12",
            width: 12,
            height: 8,
            selected: BI.isNotEmptyString(iconCls)
@ -56,7 +56,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
                bottom: 0
            }, {
                el: this.down,
-                right: 0,
+                right: 3,
                bottom: 0
            }]
        });
--- a/src/case/segment/button.segment.js
+++ b/src/case/segment/button.segment.js
@ -26,7 +26,7 @@ BI.SegmentButton = BI.inherit(BI.BasicButton, {
        this.text = BI.createWidget({
            type: "bi.label",
            element: this,
-            height: opts.height - 2,
+            textHeight: opts.height,
            whiteSpace: opts.whiteSpace,
            text: opts.text,
            value: opts.value,
--- a/src/css/base/segment/segment.css
+++ b/src/css/base/segment/segment.css
@ -20,7 +20,7 @@
 }
 .bi-segment.disabled > .center-element,
 .bi-segment.disabled > .first-element {
-  border-color: #F0F3F7;
+  border-color: #d0d4da;
 }
 .bi-theme-dark .bi-segment > .center-element {
  overflow: hidden;
--- a/src/css/base/single/button/button.css
+++ b/src/css/base/single/button/button.css
@ -163,8 +163,8 @@ body .bi-button.button-error.disabled.base-disabled,
 #body .bi-button.button-error.disabled.base-disabled,
 body .bi-button.button-warning.disabled.base-disabled,
 #body .bi-button.button-warning.disabled.base-disabled {
-  background: #F0F3F7 !important;
-  border-color: #F0F3F7 !important;
+  background: #d0d4da !important;
+  border-color: #d0d4da !important;
 }
 body .bi-button.button-common.disabled,
 #body .bi-button.button-common.disabled,
--- a/src/css/base/table/table.css
+++ b/src/css/base/table/table.css
@ -63,8 +63,8 @@
  border-radius: 5px;
 }
 .bi-theme-dark .scrollbar-layout-main {
-  background-color: rgba(240, 243, 247, 0.05);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
+  background-color: rgba(208, 212, 218, 0.05);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
 }
 .scrollbar-layout-main-vertical {
  bottom: 0;
@ -86,8 +86,8 @@
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d878d9f,endColorstr=#0d878d9f);
 }
 .bi-theme-dark .scrollbar-layout-main-horizontal {
-  background-color: rgba(240, 243, 247, 0.05);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
+  background-color: rgba(208, 212, 218, 0.05);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
 }
 /* Touching the scroll-track directly makes the scroll-track bolder */
 .scrollbar-layout-main-horizontal.public-scrollbar-main-active,
@ -144,8 +144,8 @@
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d878d9f,endColorstr=#4d878d9f);
 }
 .bi-theme-dark .public-scrollbar-face:after {
-  background-color: rgba(240, 243, 247, 0.3);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
+  background-color: rgba(208, 212, 218, 0.3);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dd0d4da,endColorstr=#4dd0d4da);
 }
 .public-scrollbar-main:hover .public-scrollbar-face:after,
 .public-scrollbar-main-active .public-scrollbar-face:after,
@ -156,8 +156,8 @@
 .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-face-active:after {
-  background-color: rgba(240, 243, 247, 0.7);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
+  background-color: rgba(208, 212, 218, 0.7);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3d0d4da,endColorstr=#b3d0d4da);
 }
 .horizontal-scrollbar {
  bottom: 0;
--- a/src/css/core/utils/common.css
+++ b/src/css/core/utils/common.css
@ -17,7 +17,7 @@ textarea {
  color: #9ea6b2 !important;
 }
 .base-disabled .b-font:before {
-  color: #9ea6b2 !important;
+  color: #d0d4da !important;
 }
 .bi-theme-dark .base-disabled {
  color: #878d9f !important;
@ -29,7 +29,7 @@ textarea {
  color: #878d9f !important;
 }
 .bi-theme-dark .base-disabled .b-font:before {
-  color: #878d9f !important;
+  color: #606479 !important;
 }
 .base-invalid {
  cursor: default !important;
@ -866,7 +866,7 @@ textarea {
  color: #9ea6b2 !important;
 }
 .bi-list-item-select.disabled.bi-high-light-border {
-  border-color: #F0F3F7;
+  border-color: #d0d4da;
 }
 .bi-list-item-select.disabled.hover,
 .bi-list-item-select.disabled.active {
@ -887,7 +887,7 @@ textarea {
 }
 .bi-list-item-select.disabled.hover.bi-high-light-border,
 .bi-list-item-select.disabled.active.bi-high-light-border {
-  border-color: #F0F3F7;
+  border-color: #d0d4da;
 }
 .bi-list-item-select2:hover,
 .bi-list-item-select2.hover {
@ -910,6 +910,12 @@ textarea {
 .bi-list-item-select2.active .bi-high-light {
  color: #ffffff;
 }
+.bi-list-item-select2.disabled:hover,
+.bi-list-item-select2.disabled.hover,
+.bi-list-item-select2.disabled:active,
+.bi-list-item-select2.disabled.active {
+  background-color: #ffffff !important;
+}
 .bi-theme-dark .bi-list-item-select:hover,
 .bi-theme-dark .bi-list-item-select.hover {
  color: #ffffff;
--- a/src/css/resource/app.css
+++ b/src/css/resource/app.css
@ -51,8 +51,8 @@ textarea::-webkit-scrollbar-thumb:hover {
 .bi-theme-dark div::-webkit-scrollbar,
 .bi-theme-dark textarea::-webkit-scrollbar {
  -webkit-appearance: none;
-  background-color: rgba(240, 243, 247, 0.05);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
+  background-color: rgba(208, 212, 218, 0.05);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
  width: 6px;
  height: 6px;
 }
@ -61,11 +61,11 @@ textarea::-webkit-scrollbar-thumb:hover {
  -webkit-border-radius: 0;
  -moz-border-radius: 0;
  border-radius: 0;
-  background-color: rgba(240, 243, 247, 0.3);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
+  background-color: rgba(208, 212, 218, 0.3);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dd0d4da,endColorstr=#4dd0d4da);
 }
 .bi-theme-dark div::-webkit-scrollbar-thumb:hover,
 .bi-theme-dark textarea::-webkit-scrollbar-thumb:hover {
-  background-color: rgba(240, 243, 247, 0.7);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
+  background-color: rgba(208, 212, 218, 0.7);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3d0d4da,endColorstr=#b3d0d4da);
 }
--- a/src/css/widget/singleslider/slider/widget.css
+++ b/src/css/widget/singleslider/slider/widget.css
@ -21,3 +21,14 @@
  top: 4px;
  left: -10px;
 }
+.bi-single-slider-button .slider-button.disabled {
+  border-color: #d0d4da;
+}
+.bi-single-slider-button .slider-button.disabled:hover,
+.bi-single-slider-button .slider-button.disabled.hover {
+  background-color: #f7f8fa;
+  width: 16px;
+  height: 16px;
+  top: 6px;
+  left: -8px;
+}
--- a/src/less/core/utils/common.less
+++ b/src/less/core/utils/common.less
@ -22,7 +22,7 @@ textarea {
    color: @color-bi-text-disabled !important;
  }
  & .b-font:before {
-    color: @color-bi-text-disabled !important;
+    color: @color-bi-icon-disabled !important;
  }
 }

@ -36,7 +36,7 @@ textarea {
      color: @color-bi-text-disabled-theme-dark !important;
    }
    & .b-font:before {
-      color: @color-bi-text-disabled-theme-dark !important;
+      color: @color-bi-icon-disabled-theme-dark !important;
    }
  }
 }
@ -884,6 +884,11 @@ textarea {
      color: @color-bi-text;
    }
  }
+  &.disabled {
+    &:hover, &.hover, &:active, &.active {
+      background-color: @color-bi-background-default !important;
+    }
+  }
 }

 .bi-theme-dark {
--- a/src/less/lib/colors.less
+++ b/src/less/lib/colors.less
@ -18,6 +18,10 @@
@color-bi-text-disabled: @font-color-disabled;
 //深色主题灰化字体颜色
@color-bi-text-disabled-theme-dark: @font-color-disabled-theme-dark;
+//灰化图标色
+@color-bi-icon-disabled: @font-color-light-disabled;
+//深色主题灰化图标颜色
+@color-bi-icon-disabled-theme-dark: @font-color-light-disabled-theme-dark;
 //提示字体颜色
@color-bi-text-tips: @font-color-tips;
 //成功字体颜色
--- a/src/less/lib/constant.less
+++ b/src/less/lib/constant.less
@ -59,7 +59,7 @@
@background-color-dark: #d4dadd;
@background-color-light-gray: #F2F4F7;
@background-color-dark-gray: #d0d4da;
-@background-color-disabled: #F0F3F7;
+@background-color-disabled: #d0d4da;
@background-color-yellow: #ffc101;//

@background-color-negative: #ff4949;
@ -87,10 +87,10 @@
@border-color-normal-success: #eddea2;

 //split color
-@border-color-disabled: #F0F3F7;
+@border-color-disabled: #d0d4da;

 //scroll color
@scroll-color: #878d9f;
-@scroll-color-theme-dark: #F0F3F7;
+@scroll-color-theme-dark: #d0d4da;

@water-mark-color-theme-dark: #878d9f;
--- a/src/less/widget/singleslider/slider/widget.slider.less
+++ b/src/less/widget/singleslider/slider/widget.slider.less
@ -18,5 +18,15 @@
      top: 4px;
      left: -10px;
    }
+    &.disabled {
+      border-color: @color-bi-border-disabled;
+      &:hover, &.hover {
+        background-color: @color-bi-background-normal;
+        width: 16px;
+        height: 16px;
+        top: 6px;
+        left: -8px;
+      }
+    }
  }
 }
--- a/src/widget/dynamicdate/dynamicdate.popup.js
+++ b/src/widget/dynamicdate/dynamicdate.popup.js
@ -1,6 +1,7 @@
 BI.DynamicDatePopup = BI.inherit(BI.Widget, {
    constants: {
-        tabHeight: 30
+        tabHeight: 30,
+        buttonHeight: 24
    },
    
    props: {
@ -11,7 +12,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
    
    _init: function () {
        BI.DynamicDatePopup.superclass._init.apply(this, arguments);
-        var self = this, opts = this.options;
+        var self = this, opts = this.options, c = this.constants;
        this.storeValue = {type: BI.DynamicDateCombo.Static};
        BI.createWidget({
            element: this,
@ -27,6 +28,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
                        cls: "bi-high-light bi-border-top",
                        shadow: true,
                        text: BI.i18nText("BI-Basic_Clear"),
+                        textHeight: c.buttonHeight - 1,
                        listeners: [{
                            eventName: BI.TextButton.EVENT_CHANGE,
                            action: function () {
@ -38,6 +40,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
                        forceCenter: true,
                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
                        shadow: true,
+                        textHeight: c.buttonHeight - 1,
                        text: BI.i18nText("BI-Multi_Date_Today"),
                        ref: function () {
                            self.textButton = this;
@ -52,6 +55,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
                        type: "bi.text_button",
                        forceCenter: true,
                        cls: "bi-high-light bi-border-top",
+                        textHeight: c.buttonHeight - 1,
                        shadow: true,
                        text: BI.i18nText("BI-Basic_OK"),
                        listeners: [{
--- a/src/widget/dynamicdatetime/dynamicdatetime.popup.js
+++ b/src/widget/dynamicdatetime/dynamicdatetime.popup.js
@ -1,6 +1,7 @@
 BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
    constants: {
-        tabHeight: 30
+        tabHeight: 30,
+        buttonHeight: 24
    },

    props: {
@ -11,7 +12,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {

    _init: function () {
        BI.DynamicDateTimePopup.superclass._init.apply(this, arguments);
-        var self = this, opts = this.options;
+        var self = this, opts = this.options, c = this.constants;
        this.storeValue = {type: BI.DynamicDateCombo.Static};
        BI.createWidget({
            element: this,
@ -25,6 +26,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
                        type: "bi.text_button",
                        forceCenter: true,
                        cls: "bi-high-light bi-border-top",
+                        textHeight: c.buttonHeight - 1,
                        shadow: true,
                        text: BI.i18nText("BI-Basic_Clear"),
                        listeners: [{
@ -37,6 +39,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
                        type: "bi.text_button",
                        forceCenter: true,
                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
+                        textHeight: c.buttonHeight - 1,
                        shadow: true,
                        text: BI.i18nText("BI-Multi_Date_Today"),
                        ref: function () {
@ -52,6 +55,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
                        type: "bi.text_button",
                        forceCenter: true,
                        cls: "bi-high-light bi-border-top",
+                        textHeight: c.buttonHeight - 1,
                        shadow: true,
                        text: BI.i18nText("BI-Basic_OK"),
                        listeners: [{
--- a/src/widget/numbereditor/number.editor.js
+++ b/src/widget/numbereditor/number.editor.js
@ -31,7 +31,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
            errorText: o.errorText
        });
        this.editor.on(BI.TextEditor.EVENT_CHANGE, function () {
-            o.value = this.getValue();
+            o.value = BI.parseFloat(this.getValue());
            self.fireEvent(BI.NumberEditor.EVENT_CHANGE);
        });
        this.editor.on(BI.TextEditor.EVENT_CONFIRM, function () {
--- a/src/widget/year/popup.year.js
+++ b/src/widget/year/popup.year.js
@ -7,7 +7,8 @@
 */
 BI.DynamicYearPopup = BI.inherit(BI.Widget, {
    constants: {
-        tabHeight: 30
+        tabHeight: 30,
+        buttonHeight: 24
    },

    props: {
@ -20,7 +21,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
    },

    render: function () {
-        var self = this, opts = this.options;
+        var self = this, opts = this.options, c = this.constants;
        this.storeValue = {type: BI.DynamicYearCombo.Static};
        return {
            type: "bi.vtape",
@ -33,6 +34,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
                        type: "bi.text_button",
                        forceCenter: true,
                        cls: "bi-border-top bi-high-light",
+                        textHeight: c.buttonHeight - 1,
                        shadow: true,
                        text: BI.i18nText("BI-Basic_Clear"),
                        listeners: [{
@ -44,6 +46,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
                    }, {
                        type: "bi.text_button",
                        forceCenter: true,
+                        textHeight: c.buttonHeight - 1,
                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
                        shadow: true,
                        text: BI.i18nText("BI-Basic_Current_Year"),
@ -60,6 +63,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
                        type: "bi.text_button",
                        forceCenter: true,
                        cls: "bi-border-top bi-high-light",
+                        textHeight: c.buttonHeight - 1,
                        shadow: true,
                        text: BI.i18nText("BI-Basic_OK"),
                        listeners: [{
--- a/src/widget/yearmonth/popup.yearmonth.js
+++ b/src/widget/yearmonth/popup.yearmonth.js
@ -7,7 +7,8 @@
 */
 BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
    constants: {
-        tabHeight: 30
+        tabHeight: 30,
+        buttonHeight: 24
    },

    props: {
@ -20,7 +21,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
    },

    render: function () {
-        var self = this, opts = this.options;
+        var self = this, opts = this.options, c = this.constants;
        this.storeValue = {type: BI.DynamicYearMonthCombo.Static};
        return {
            type: "bi.vtape",
@ -33,6 +34,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                        type: "bi.text_button",
                        forceCenter: true,
                        cls: "bi-border-top bi-high-light",
+                        textHeight: c.buttonHeight - 1,
                        shadow: true,
                        text: BI.i18nText("BI-Basic_Clear"),
                        listeners: [{
@ -45,6 +47,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                        type: "bi.text_button",
                        forceCenter: true,
                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
+                        textHeight: c.buttonHeight - 1,
                        shadow: true,
                        text: BI.i18nText("BI-Basic_Current_Month"),
                        ref: function () {
@ -60,6 +63,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                        type: "bi.text_button",
                        forceCenter: true,
                        cls: "bi-border-top bi-high-light",
+                        textHeight: c.buttonHeight - 1,
                        shadow: true,
                        text: BI.i18nText("BI-Basic_OK"),
                        listeners: [{
--- a/src/widget/yearquarter/popup.yearquarter.js
+++ b/src/widget/yearquarter/popup.yearquarter.js
@ -1,6 +1,7 @@
 BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
    constants: {
-        tabHeight: 30
+        tabHeight: 30,
+        buttonHeight: 24
    },

    props: {
@ -13,7 +14,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
    },

    render: function () {
-        var self = this, opts = this.options;
+        var self = this, opts = this.options, c = this.constants;
        this.storeValue = {type: BI.DynamicYearQuarterCombo.Static};
        return {
            type: "bi.vtape",
@ -27,6 +28,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
                        forceCenter: true,
                        cls: "bi-border-top bi-high-light",
                        shadow: true,
+                        textHeight: c.buttonHeight - 1,
                        text: BI.i18nText("BI-Basic_Clear"),
                        listeners: [{
                            eventName: BI.TextButton.EVENT_CHANGE,
@ -38,6 +40,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
                        type: "bi.text_button",
                        forceCenter: true,
                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
+                        textHeight: c.buttonHeight - 1,
                        shadow: true,
                        text: BI.i18nText("BI-Basic_Current_Quarter"),
                        ref: function () {
@ -54,6 +57,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
                        forceCenter: true,
                        cls: "bi-border-top bi-high-light",
                        shadow: true,
+                        textHeight: c.buttonHeight - 1,
                        text: BI.i18nText("BI-Basic_OK"),
                        listeners: [{
                            eventName: BI.TextButton.EVENT_CHANGE,
--- a/ui/css/app.css
+++ b/ui/css/app.css
@ -51,8 +51,8 @@ textarea::-webkit-scrollbar-thumb:hover {
 .bi-theme-dark div::-webkit-scrollbar,
 .bi-theme-dark textarea::-webkit-scrollbar {
  -webkit-appearance: none;
-  background-color: rgba(240, 243, 247, 0.05);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
+  background-color: rgba(208, 212, 218, 0.05);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dd0d4da,endColorstr=#0dd0d4da);
  width: 6px;
  height: 6px;
 }
@ -61,11 +61,11 @@ textarea::-webkit-scrollbar-thumb:hover {
  -webkit-border-radius: 0;
  -moz-border-radius: 0;
  border-radius: 0;
-  background-color: rgba(240, 243, 247, 0.3);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
+  background-color: rgba(208, 212, 218, 0.3);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dd0d4da,endColorstr=#4dd0d4da);
 }
 .bi-theme-dark div::-webkit-scrollbar-thumb:hover,
 .bi-theme-dark textarea::-webkit-scrollbar-thumb:hover {
-  background-color: rgba(240, 243, 247, 0.7);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
+  background-color: rgba(208, 212, 218, 0.7);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3d0d4da,endColorstr=#b3d0d4da);
 }