From 6a7e9f385adf557b6f78d813cf7aaa2f864f5f62 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Wed, 31 Jan 2018 22:20:32 +0800 Subject: [PATCH] =?UTF-8?q?combo=E5=92=8Cnode=E6=96=B0=E8=A7=86=E8=A7=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/bundle.css | 36 ++-- dist/bundle.js | 1 - dist/case.js | 1 - dist/fineui.js | 5 +- dist/resource.css | 36 ++-- public/bundle.css | 36 ++-- public/css/font.css | 36 ++-- src/case/trigger/trigger.text.js | 1 - src/css/base/pager/pager.css | 14 ++ src/css/base/single/tip/tip.css | 67 +++++++ src/css/base/table/table.css | 196 +++++++++++++++++++ src/css/base/trigger/trigger.css | 14 ++ src/css/core/utils/common.css | 2 +- src/css/resource/font.css | 37 ++-- src/css/theme/dark.css | 2 +- src/css/widget/exceltable/exceltable.css | 5 + src/css/widget/previewtable/previewtable.css | 13 +- src/less/lib/font.less | 2 +- 18 files changed, 403 insertions(+), 101 deletions(-) diff --git a/dist/bundle.css b/dist/bundle.css index e7837643fc..a00cae5300 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -5353,75 +5353,75 @@ textarea::-webkit-scrollbar-thumb:hover { color: #ffffff; } .pull-right-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-font .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-font.disabled .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-h-font .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-h-font:hover .b-font:before, .pull-right-h-font.hover .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-h-font.disabled .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-ha-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-ha-font .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-ha-font:hover .b-font:before, .pull-right-ha-font.hover .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-ha-font:active .b-font:before, .pull-right-ha-font.active .b-font:before { - content: "\e6da"; + content: "\e70c"; color: #3f8ce8; } .pull-right-ha-font.disabled .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-e-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-e-font .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-e-font:hover .b-font:before, .pull-right-e-font.hover .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-e-font.active .b-font:before { - content: "\e6da"; + content: "\e70c"; color: #3f8ce8; } .pull-right-e-font:active .b-font:before { - content: "\e6da"; + content: "\e70c"; color: #3f8ce8; } .pull-right-e-font.disabled .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .copy-font .b-font { diff --git a/dist/bundle.js b/dist/bundle.js index 4fa8992515..13e1da3215 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -76374,7 +76374,6 @@ BI.TextTrigger = BI.inherit(BI.Trigger, { }); this.trigerButton = BI.createWidget({ type: "bi.trigger_icon_button", - cls: "bi-border-left", width: o.triggerWidth || o.height }); diff --git a/dist/case.js b/dist/case.js index 741081a464..121c93d2ea 100644 --- a/dist/case.js +++ b/dist/case.js @@ -13808,7 +13808,6 @@ BI.TextTrigger = BI.inherit(BI.Trigger, { }); this.trigerButton = BI.createWidget({ type: "bi.trigger_icon_button", - cls: "bi-border-left", width: o.triggerWidth || o.height }); diff --git a/dist/fineui.js b/dist/fineui.js index 6d716bd82b..0b3014a0e6 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -27634,7 +27634,7 @@ Data.Source = BISource = { var targetStack = []; function pushTarget (_target) { - if (_target) targetStack.push(_target); + if (target) targetStack.push(target) Fix.Model.target = target = _target; } @@ -27646,7 +27646,7 @@ Data.Source = BISource = { var contextStack = []; function pushContext (_context) { - if (_context) contextStack.push(_context); + if (context) contextStack.push(context) Fix.Model.context = context = _context; } @@ -78138,7 +78138,6 @@ BI.TextTrigger = BI.inherit(BI.Trigger, { }); this.trigerButton = BI.createWidget({ type: "bi.trigger_icon_button", - cls: "bi-border-left", width: o.triggerWidth || o.height }); diff --git a/dist/resource.css b/dist/resource.css index 52c8c0e17a..0877b5d6b1 100644 --- a/dist/resource.css +++ b/dist/resource.css @@ -546,75 +546,75 @@ textarea::-webkit-scrollbar-thumb:hover { color: #ffffff; } .pull-right-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-font .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-font.disabled .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-h-font .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-h-font:hover .b-font:before, .pull-right-h-font.hover .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-h-font.disabled .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-ha-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-ha-font .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-ha-font:hover .b-font:before, .pull-right-ha-font.hover .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-ha-font:active .b-font:before, .pull-right-ha-font.active .b-font:before { - content: "\e6da"; + content: "\e70c"; color: #3f8ce8; } .pull-right-ha-font.disabled .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-e-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-e-font .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-e-font:hover .b-font:before, .pull-right-e-font.hover .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-e-font.active .b-font:before { - content: "\e6da"; + content: "\e70c"; color: #3f8ce8; } .pull-right-e-font:active .b-font:before { - content: "\e6da"; + content: "\e70c"; color: #3f8ce8; } .pull-right-e-font.disabled .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .copy-font .b-font { diff --git a/public/bundle.css b/public/bundle.css index 427495ece5..de64a56c77 100644 --- a/public/bundle.css +++ b/public/bundle.css @@ -546,75 +546,75 @@ textarea::-webkit-scrollbar-thumb:hover { color: #ffffff; } .pull-right-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-font .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-font.disabled .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-h-font .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-h-font:hover .b-font:before, .pull-right-h-font.hover .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-h-font.disabled .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-ha-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-ha-font .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-ha-font:hover .b-font:before, .pull-right-ha-font.hover .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-ha-font:active .b-font:before, .pull-right-ha-font.active .b-font:before { - content: "\e6da"; + content: "\e70c"; color: #3f8ce8; } .pull-right-ha-font.disabled .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-e-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-e-font .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-e-font:hover .b-font:before, .pull-right-e-font.hover .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-e-font.active .b-font:before { - content: "\e6da"; + content: "\e70c"; color: #3f8ce8; } .pull-right-e-font:active .b-font:before { - content: "\e6da"; + content: "\e70c"; color: #3f8ce8; } .pull-right-e-font.disabled .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .copy-font .b-font { diff --git a/public/css/font.css b/public/css/font.css index 893013bc9e..e9160b3a6c 100644 --- a/public/css/font.css +++ b/public/css/font.css @@ -217,75 +217,75 @@ color: #ffffff; } .pull-right-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-font .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-font.disabled .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-h-font .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-h-font:hover .b-font:before, .pull-right-h-font.hover .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-h-font.disabled .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-ha-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-ha-font .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-ha-font:hover .b-font:before, .pull-right-ha-font.hover .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-ha-font:active .b-font:before, .pull-right-ha-font.active .b-font:before { - content: "\e6da"; + content: "\e70c"; color: #3f8ce8; } .pull-right-ha-font.disabled .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-e-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-e-font .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-e-font:hover .b-font:before, .pull-right-e-font.hover .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-e-font.active .b-font:before { - content: "\e6da"; + content: "\e70c"; color: #3f8ce8; } .pull-right-e-font:active .b-font:before { - content: "\e6da"; + content: "\e70c"; color: #3f8ce8; } .pull-right-e-font.disabled .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .copy-font .b-font { diff --git a/src/case/trigger/trigger.text.js b/src/case/trigger/trigger.text.js index 6ee3fc97c4..182ffa5f90 100644 --- a/src/case/trigger/trigger.text.js +++ b/src/case/trigger/trigger.text.js @@ -34,7 +34,6 @@ BI.TextTrigger = BI.inherit(BI.Trigger, { }); this.trigerButton = BI.createWidget({ type: "bi.trigger_icon_button", - cls: "bi-border-left", width: o.triggerWidth || o.height }); diff --git a/src/css/base/pager/pager.css b/src/css/base/pager/pager.css index 585c512896..b28d243600 100644 --- a/src/css/base/pager/pager.css +++ b/src/css/base/pager/pager.css @@ -1,3 +1,17 @@ +.bi-all-count-pager .all-pager-prev { + font-size: 16px; +} +.bi-all-count-pager .all-pager-next { + font-size: 16px; +} + +.bi-direction-pager .direction-pager-prev { + font-size: 16px; +} +.bi-direction-pager .direction-pager-next { + font-size: 16px; +} + .bi-pager .page-item { -webkit-border-radius: 2px; -moz-border-radius: 2px; diff --git a/src/css/base/single/tip/tip.css b/src/css/base/single/tip/tip.css index bc771b53d4..e5ddf33623 100644 --- a/src/css/base/single/tip/tip.css +++ b/src/css/base/single/tip/tip.css @@ -1,3 +1,70 @@ +.bi-bubble { + font-size: 14px; +} +.bi-bubble .bubble-text { + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; +} +.bi-bubble .bubble-error { + background: #ffecec; + color: #ff4949; +} +.bi-bubble .bubble-common { + background: #eaf2fd; + color: #3685f2; +} +.bi-bubble .bubble-success { + background: #e1f4e7; + color: #5cb75d; +} +.bi-bubble .bubble-warning { + background: #feeed7; + color: #faaa39; +} + .bi-tip { position: fixed !important; } + +.bi-toast { + font-size: 14px; + color: #ffffff; + max-width: 400px; + min-width: 150px; + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; +} +.bi-toast.toast-success { + background: #58cc7d; +} +.bi-toast.toast-warning { + background: #faaa39; +} +.bi-toast.toast-error { + background: #ff4949; +} +.bi-toast.toast-normal { + background: #3f8ce8; +} +.bi-toast .toast-icon { + font-size: 16px; +} + +.bi-tooltip { + max-width: 250px; + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; + font-size: 12px; + color: #ffffff; +} +.bi-tooltip.tooltip-success { + background: #647185; + border: 1px solid #647185; +} +.bi-tooltip.tooltip-warning { + background: #ff4949; + border: 1px solid #e85050; +} diff --git a/src/css/base/table/table.css b/src/css/base/table/table.css index abfd5a9428..331c660d16 100644 --- a/src/css/base/table/table.css +++ b/src/css/base/table/table.css @@ -1,3 +1,169 @@ +.bi-collection-table-cell { + -webkit-box-sizing: border-box; + /*Safari3.2+*/ + -moz-box-sizing: border-box; + /*Firefox3.5+*/ + -ms-box-sizing: border-box; + /*IE8*/ + box-sizing: border-box; + /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ +} +.bi-collection-table-cell.first-row { + border-top: 1px solid #d4dadd; +} +.bi-collection-table-cell.first-col { + border-left: 1px solid #d4dadd; +} +.bi-theme-dark .bi-collection-table-cell.first-row { + border-top: 1px solid #525466; +} +.bi-theme-dark .bi-collection-table-cell.first-col { + border-left: 1px solid #525466; +} + +.bi-quick-collection-table > div > .bi-collection { + overflow: hidden !important; + overflow-x: hidden !important; + overflow-y: hidden !important; +} + +.bi-grid-table-cell { + -webkit-box-sizing: border-box; + /*Safari3.2+*/ + -moz-box-sizing: border-box; + /*Firefox3.5+*/ + -ms-box-sizing: border-box; + /*IE8*/ + box-sizing: border-box; + /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ +} +.bi-grid-table-cell.first-row { + border-top: 1px solid #d4dadd; +} +.bi-grid-table-cell.first-col { + border-left: 1px solid #d4dadd; +} +.bi-theme-dark .bi-grid-table-cell.first-row { + border-top: 1px solid #525466; +} +.bi-theme-dark .bi-grid-table-cell.first-col { + border-left: 1px solid #525466; +} + +.scrollbar-layout-main { + box-sizing: border-box; + outline: none; + overflow: hidden; + position: absolute; + transition-duration: 250ms; + transition-timing-function: ease; + user-select: none; + background-color: rgba(102, 102, 102, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d666666,endColorstr=#0d666666); + border-radius: 5px; +} +.bi-theme-dark .scrollbar-layout-main { + background-color: rgba(204, 204, 204, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dcccccc,endColorstr=#0dcccccc); +} +.scrollbar-layout-main-vertical { + bottom: 0; + right: 0; + top: 0; + transition-property: background-color; + width: 10px; +} +.scrollbar-layout-main-vertical.public-scrollbar-main-active, +.scrollbar-layout-main-vertical:hover { + width: 10px; +} +.scrollbar-layout-main-horizontal { + bottom: 0; + height: 10px; + left: 0; + transition-property: background-color; + background-color: rgba(102, 102, 102, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d666666,endColorstr=#0d666666); +} +.bi-theme-dark .scrollbar-layout-main-horizontal { + background-color: rgba(204, 204, 204, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dcccccc,endColorstr=#0dcccccc); +} +/* Touching the scroll-track directly makes the scroll-track bolder */ +.scrollbar-layout-main-horizontal.public-scrollbar-main-active, +.scrollbar-layout-main-horizontal:hover { + height: 10px; +} +.scrollbar-layout-face { + left: 0; + overflow: hidden; + position: absolute; + z-index: 1; +} +/** + * This selector renders the "nub" of the scrollface. The nub must + * be rendered as pseudo-element so that it won't receive any UI events then + * we can get the correct `event.offsetX` and `event.offsetY` from the + * scrollface element while dragging it. + */ +.scrollbar-layout-face:after { + border-radius: 6px; + content: ''; + display: block; + position: absolute; + transition: background-color 250ms ease; +} +.scrollbar-layout-face-horizontal { + bottom: 0; + left: 0; + top: 0; +} +.scrollbar-layout-face-horizontal:after { + bottom: 2px; + left: 0; + top: 2px; + width: 100%; +} +.scrollbar-layout-face-vertical { + left: 0; + right: 0; + top: 0; +} +.scrollbar-layout-face-vertical:after { + height: 100%; + left: 2px; + right: 2px; + top: 0; +} +/** + * scrollbars. + */ +/* Touching the scroll-track directly makes the scroll-track bolder */ +.public-scrollbar-face:after { + background-color: rgba(102, 102, 102, 0.3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d666666,endColorstr=#4d666666); +} +.bi-theme-dark .public-scrollbar-face:after { + background-color: rgba(204, 204, 204, 0.3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dcccccc,endColorstr=#4dcccccc); +} +.public-scrollbar-main:hover .public-scrollbar-face:after, +.public-scrollbar-main-active .public-scrollbar-face:after, +.public-scrollbar-face-active:after { + background-color: rgba(102, 102, 102, 0.7); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3666666,endColorstr=#b3666666); +} +.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(204, 204, 204, 0.7); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3cccccc,endColorstr=#b3cccccc); +} +.horizontal-scrollbar { + bottom: 0; + position: absolute; +} + .bi-table > .first-col { border-left: none; } @@ -76,3 +242,33 @@ border-top: 1px solid #525466; border-left: 1px solid #525466; } + +.bi-resizable-table-cell .resizable-table-cell-resizer-container { + cursor: ew-resize; + z-index: 1; +} +.bi-resizable-table-cell .resizable-table-cell-resizer-container:hover .resizable-table-cell-resizer-knob, +.bi-resizable-table-cell .resizable-table-cell-resizer-container.dragging .resizable-table-cell-resizer-knob { + background-color: #3f8ce8; +} +.bi-resizable-table-cell .resizable-table-cell-resizer-container.suitable .resizable-table-cell-resizer-knob { + background-color: #58cc7d; +} + +.bi-resizable-table .resizable-table-resizer { + cursor: ew-resize; + z-index: 1; + background-color: #3f8ce8; +} +.bi-resizable-table .resizable-table-resizer.suitable { + background-color: #58cc7d; +} +.bi-resizable-table .resizable-table-region-resizer { + cursor: ew-resize; + z-index: 1; +} +.bi-resizable-table .resizable-table-region-resizer:hover .resizable-table-region-resizer-knob, +.bi-resizable-table .resizable-table-region-resizer.dragging .resizable-table-region-resizer-knob { + background-color: #3f8ce8; +} + diff --git a/src/css/base/trigger/trigger.css b/src/css/base/trigger/trigger.css index 51c60b4927..acc7552a78 100644 --- a/src/css/base/trigger/trigger.css +++ b/src/css/base/trigger/trigger.css @@ -1,3 +1,17 @@ + + .bi-trigger .bi-trigger-icon-button { font-size: 16px; } + +.bi-select-text-trigger { + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; +} + +.bi-small-select-text-trigger { + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; +} diff --git a/src/css/core/utils/common.css b/src/css/core/utils/common.css index 58e6b2cddf..7386469ffa 100644 --- a/src/css/core/utils/common.css +++ b/src/css/core/utils/common.css @@ -57,7 +57,7 @@ textarea { color: #3d4d66; } .bi-theme-dark .bi-background { - background-color: #191b2b; + background-color: #191B2B; color: #cccccc; } .bi-theme-dark .bi-background .bi-input { diff --git a/src/css/resource/font.css b/src/css/resource/font.css index 549cab38d6..3a2ffee80a 100644 --- a/src/css/resource/font.css +++ b/src/css/resource/font.css @@ -1,7 +1,6 @@ @font-face { font-family: 'bi'; src: url('font/iconfont.eot'), /* IE6-IE8 */ url('font/iconfont.woff') format('woff'), /* chrome、firefox */ url('font/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('font/iconfont.svg#svgFontName') format('svg'); - /* iOS 4.1- */ } .b-font { @@ -218,75 +217,75 @@ color: #ffffff; } .pull-right-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-font .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-font.disabled .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-h-font .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-h-font:hover .b-font:before, .pull-right-h-font.hover .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-h-font.disabled .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-ha-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-ha-font .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-ha-font:hover .b-font:before, .pull-right-ha-font.hover .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-ha-font:active .b-font:before, .pull-right-ha-font.active .b-font:before { - content: "\e6da"; + content: "\e70c"; color: #3f8ce8; } .pull-right-ha-font.disabled .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-e-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-e-font .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-e-font:hover .b-font:before, .pull-right-e-font.hover .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .pull-right-e-font.active .b-font:before { - content: "\e6da"; + content: "\e70c"; color: #3f8ce8; } .pull-right-e-font:active .b-font:before { - content: "\e6da"; + content: "\e70c"; color: #3f8ce8; } .pull-right-e-font.disabled .b-font:before { - content: "\e6da"; + content: "\e70c"; color: inherit; } .copy-font .b-font { diff --git a/src/css/theme/dark.css b/src/css/theme/dark.css index 7349cdeef4..d8f0e5f38b 100644 --- a/src/css/theme/dark.css +++ b/src/css/theme/dark.css @@ -1,5 +1,5 @@ .bi-theme-dark { - background-color: #191b2b; + background-color: #191B2B; color: #cccccc; } .bi-theme-dark .bi-input { diff --git a/src/css/widget/exceltable/exceltable.css b/src/css/widget/exceltable/exceltable.css index 4f6dc3b7ad..ef99484d46 100644 --- a/src/css/widget/exceltable/exceltable.css +++ b/src/css/widget/exceltable/exceltable.css @@ -1,3 +1,8 @@ + +.bi-excel-table-header-cell { + font-weight: bold; +} + .bi-excel-table > div.bottom-right > div > div > table { border-right: 1px solid #d4dadd; } diff --git a/src/css/widget/previewtable/previewtable.css b/src/css/widget/previewtable/previewtable.css index 679dff637f..043b8d6cfa 100644 --- a/src/css/widget/previewtable/previewtable.css +++ b/src/css/widget/previewtable/previewtable.css @@ -1,3 +1,14 @@ +.bi-preview-table-cell { + min-height: 25px; + min-width: 80px; +} + +.bi-preview-table-header-cell { + font-weight: bold; + min-height: 25px; + min-width: 80px; +} + .bi-preview-table { -webkit-user-select: text; -khtml-user-select: text; @@ -12,5 +23,5 @@ } .bi-theme-dark .bi-preview-table > div > table > thead > tr.odd, .bi-theme-dark .bi-preview-table > div > div > div > table > thead > tr.odd { - background-color: #191b2b; + background-color: #191B2B; } diff --git a/src/less/lib/font.less b/src/less/lib/font.less index 35bf7ea715..e3ae6bf281 100644 --- a/src/less/lib/font.less +++ b/src/less/lib/font.less @@ -4,7 +4,7 @@ @font-search: "e6dc"; @font-date: "e733"; -@font-right-triangle: "e6da"; +@font-right-triangle: "e70c"; @font-copy: "e6bd"; @font-check-mark: "e6cf"; @font-solid-left: "e6d9";