From 257d56f7a49e14b68661691dac5c1737f4c4128c Mon Sep 17 00:00:00 2001 From: guy Date: Wed, 29 Nov 2017 15:50:06 +0800 Subject: [PATCH] update --- src/css/base/segment/segment.css | 14 +++--- src/css/base/single/button/button.css | 4 +- src/css/base/table/table.collection.cell.css | 8 ++-- src/css/base/table/table.css | 48 ++++++++++---------- src/css/base/table/table.grid.cell.css | 8 ++-- src/css/base/view/popupview.css | 4 +- src/css/core/normalize2.css | 4 +- src/css/core/utils/common.css | 20 ++++---- src/css/widget/exceltable/exceltable.css | 4 +- src/css/widget/year/popup.year.css | 4 +- 10 files changed, 59 insertions(+), 59 deletions(-) diff --git a/src/css/base/segment/segment.css b/src/css/base/segment/segment.css index be61364e4c..5602015d32 100644 --- a/src/css/base/segment/segment.css +++ b/src/css/base/segment/segment.css @@ -3,12 +3,12 @@ overflow-x: hidden; overflow-y: hidden; background: #ffffff; - border-right: 1px solid #d4dadd; - border-top: 1px solid #d4dadd; - border-bottom: 1px solid #d4dadd; + border-right: 1px solid #e8eaed; + border-top: 1px solid #e8eaed; + border-bottom: 1px solid #e8eaed; } .bi-segment > .first-element { - border-left: 1px solid #d4dadd; + border-left: 1px solid #e8eaed; -webkit-border-radius: 6px 0px 0px 6px; -moz-border-radius: 6px 0px 0px 6px; border-radius: 6px 0px 0px 6px; @@ -23,9 +23,9 @@ overflow-x: hidden; overflow-y: hidden; background: #242640; - border-right: 1px solid #525466; - border-top: 1px solid #525466; - border-bottom: 1px solid #525466; + border-right: 1px solid #f2f4f7; + border-top: 1px solid #f2f4f7; + border-bottom: 1px solid #f2f4f7; } .bi-theme-dark .bi-segment > .first-element { border-left: 1px solid #242640; diff --git a/src/css/base/single/button/button.css b/src/css/base/single/button/button.css index 152c5faed0..fcc106400f 100644 --- a/src/css/base/single/button/button.css +++ b/src/css/base/single/button/button.css @@ -46,7 +46,7 @@ body .bi-button.button-common.clear .b-font:before, body .bi-button.button-ignore, #body .bi-button.button-ignore { background-color: #ffffff; - border-color: #d4dadd; + border-color: #e8eaed; } body .bi-button.button-ignore, #body .bi-button.button-ignore, @@ -147,7 +147,7 @@ body .bi-button.button-warning.disabled.base-disabled .b-font:before, body .bi-button.button-ignore.disabled, #body .bi-button.button-ignore.disabled { background: #ffffff !important; - border-color: #d4dadd !important; + border-color: #e8eaed !important; } body .bi-button.button-ignore.disabled, #body .bi-button.button-ignore.disabled, diff --git a/src/css/base/table/table.collection.cell.css b/src/css/base/table/table.collection.cell.css index f630fb3edc..5b6d1ef04d 100644 --- a/src/css/base/table/table.collection.cell.css +++ b/src/css/base/table/table.collection.cell.css @@ -9,14 +9,14 @@ /*W3C标准(IE9+,Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ } .bi-collection-table-cell.first-row { - border-top: 1px solid #d4dadd; + border-top: 1px solid #e8eaed; } .bi-collection-table-cell.first-col { - border-left: 1px solid #d4dadd; + border-left: 1px solid #e8eaed; } .bi-theme-dark .bi-collection-table-cell.first-row { - border-top: 1px solid #525466; + border-top: 1px solid #f2f4f7; } .bi-theme-dark .bi-collection-table-cell.first-col { - border-left: 1px solid #525466; + border-left: 1px solid #f2f4f7; } diff --git a/src/css/base/table/table.css b/src/css/base/table/table.css index abfd5a9428..c05991736d 100644 --- a/src/css/base/table/table.css +++ b/src/css/base/table/table.css @@ -5,24 +5,24 @@ border-top: none; } .bi-table > div > div > table { - border-bottom: 1px solid #d4dadd; - border-right: 1px solid #d4dadd; + border-bottom: 1px solid #e8eaed; + border-right: 1px solid #e8eaed; } .bi-table > div.top-left > div > div > table { - border-bottom: 1px solid #d4dadd; - border-right: 1px solid #d4dadd; + border-bottom: 1px solid #e8eaed; + border-right: 1px solid #e8eaed; } .bi-table > div.top-right > div > div > table { - border-bottom: 1px solid #d4dadd; - border-right: 1px solid #d4dadd; + border-bottom: 1px solid #e8eaed; + border-right: 1px solid #e8eaed; } .bi-table > div.bottom-left > div > div > table { - border-bottom: 1px solid #d4dadd; - border-right: 1px solid #d4dadd; + border-bottom: 1px solid #e8eaed; + border-right: 1px solid #e8eaed; } .bi-table > div.bottom-right > div > div > table { - border-right: 1px solid #d4dadd; - border-bottom: 1px solid #d4dadd; + border-right: 1px solid #e8eaed; + border-bottom: 1px solid #e8eaed; } .bi-table > div > div > table, .bi-table > div > div > div > table { @@ -46,33 +46,33 @@ .bi-table > div > div > div > table > tbody > tr > td, .bi-table > div > div > table > thead > tr > td, .bi-table > div > div > div > table > thead > tr > td { - border-top: 1px solid #d4dadd; - border-left: 1px solid #d4dadd; + border-top: 1px solid #e8eaed; + border-left: 1px solid #e8eaed; } .bi-theme-dark .bi-table > div > div > table { - border-bottom: 1px solid #525466; - border-right: 1px solid #525466; + border-bottom: 1px solid #f2f4f7; + border-right: 1px solid #f2f4f7; } .bi-theme-dark .bi-table > div.top-left > div > div > table { - border-bottom: 1px solid #525466; - border-right: 1px solid #525466; + border-bottom: 1px solid #f2f4f7; + border-right: 1px solid #f2f4f7; } .bi-theme-dark .bi-table > div.top-right > div > div > table { - border-bottom: 1px solid #525466; - border-right: 1px solid #525466; + border-bottom: 1px solid #f2f4f7; + border-right: 1px solid #f2f4f7; } .bi-theme-dark .bi-table > div.bottom-left > div > div > table { - border-bottom: 1px solid #525466; - border-right: 1px solid #525466; + border-bottom: 1px solid #f2f4f7; + border-right: 1px solid #f2f4f7; } .bi-theme-dark .bi-table > div.bottom-right > div > div > table { - border-right: 1px solid #525466; - border-bottom: 1px solid #525466; + border-right: 1px solid #f2f4f7; + border-bottom: 1px solid #f2f4f7; } .bi-theme-dark .bi-table > div > div > table > tbody > tr > td, .bi-theme-dark .bi-table > div > div > div > table > tbody > tr > td, .bi-theme-dark .bi-table > div > div > table > thead > tr > td, .bi-theme-dark .bi-table > div > div > div > table > thead > tr > td { - border-top: 1px solid #525466; - border-left: 1px solid #525466; + border-top: 1px solid #f2f4f7; + border-left: 1px solid #f2f4f7; } diff --git a/src/css/base/table/table.grid.cell.css b/src/css/base/table/table.grid.cell.css index 10fab44a8a..4a8ae1eee6 100644 --- a/src/css/base/table/table.grid.cell.css +++ b/src/css/base/table/table.grid.cell.css @@ -9,14 +9,14 @@ /*W3C标准(IE9+,Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ } .bi-grid-table-cell.first-row { - border-top: 1px solid #d4dadd; + border-top: 1px solid #e8eaed; } .bi-grid-table-cell.first-col { - border-left: 1px solid #d4dadd; + border-left: 1px solid #e8eaed; } .bi-theme-dark .bi-grid-table-cell.first-row { - border-top: 1px solid #525466; + border-top: 1px solid #f2f4f7; } .bi-theme-dark .bi-grid-table-cell.first-col { - border-left: 1px solid #525466; + border-left: 1px solid #f2f4f7; } diff --git a/src/css/base/view/popupview.css b/src/css/base/view/popupview.css index 142b2c7a7c..731ab7ac32 100644 --- a/src/css/base/view/popupview.css +++ b/src/css/base/view/popupview.css @@ -15,13 +15,13 @@ line-height: 30px; } .bi-popup-view .list-view-toolbar > .center-element { - border-left: 1px solid #d4dadd; + border-left: 1px solid #e8eaed; } .bi-popup-view .list-view-toolbar > .first-element { border-left: none; } .bi-theme-dark .bi-popup-view .list-view-toolbar > .center-element { - border-left: 1px solid #525466; + border-left: 1px solid #f2f4f7; } .bi-theme-dark .bi-popup-view .list-view-toolbar > .first-element { border-left: none; diff --git a/src/css/core/normalize2.css b/src/css/core/normalize2.css index 4763f9a9e8..fa61dd7948 100644 --- a/src/css/core/normalize2.css +++ b/src/css/core/normalize2.css @@ -34,11 +34,11 @@ textarea { margin: 0; padding: 0; outline: none; - border: 1px solid #d4dadd; + border: 1px solid #e8eaed; } .bi-theme-dark input, .bi-theme-dark textarea { - border: 1px solid #525466; + border: 1px solid #f2f4f7; } ul { list-style: disc; diff --git a/src/css/core/utils/common.css b/src/css/core/utils/common.css index 8914a430b9..b9b2ce2898 100644 --- a/src/css/core/utils/common.css +++ b/src/css/core/utils/common.css @@ -106,34 +106,34 @@ color: #c4c9d1; } .bi-border { - border: 1px solid #d4dadd; + border: 1px solid #e8eaed; } .bi-theme-dark .bi-border { - border: 1px solid #525466; + border: 1px solid #f2f4f7; } .bi-border-left { - border-left: 1px solid #d4dadd; + border-left: 1px solid #e8eaed; } .bi-theme-dark .bi-border-left { - border-left: 1px solid #525466; + border-left: 1px solid #f2f4f7; } .bi-border-right { - border-right: 1px solid #d4dadd; + border-right: 1px solid #e8eaed; } .bi-theme-dark .bi-border-right { - border-right: 1px solid #525466; + border-right: 1px solid #f2f4f7; } .bi-border-top { - border-top: 1px solid #d4dadd; + border-top: 1px solid #e8eaed; } .bi-theme-dark .bi-border-top { - border-top: 1px solid #525466; + border-top: 1px solid #f2f4f7; } .bi-border-bottom { - border-bottom: 1px solid #d4dadd; + border-bottom: 1px solid #e8eaed; } .bi-theme-dark .bi-border-bottom { - border-bottom: 1px solid #525466; + border-bottom: 1px solid #f2f4f7; } .bi-keyword-red-mark { color: #ff4949; diff --git a/src/css/widget/exceltable/exceltable.css b/src/css/widget/exceltable/exceltable.css index 4f6dc3b7ad..5929ffed00 100644 --- a/src/css/widget/exceltable/exceltable.css +++ b/src/css/widget/exceltable/exceltable.css @@ -1,6 +1,6 @@ .bi-excel-table > div.bottom-right > div > div > table { - border-right: 1px solid #d4dadd; + border-right: 1px solid #e8eaed; } .bi-theme-dark .bi-excel-table > div.bottom-right > div > div > table { - border-right: 1px solid #525466; + border-right: 1px solid #f2f4f7; } diff --git a/src/css/widget/year/popup.year.css b/src/css/widget/year/popup.year.css index 95705e7094..dacbbf4c67 100644 --- a/src/css/widget/year/popup.year.css +++ b/src/css/widget/year/popup.year.css @@ -2,13 +2,13 @@ line-height: 30px; } .bi-year-popup .year-popup-navigation > .center-element { - border-left: 1px solid #d4dadd; + border-left: 1px solid #e8eaed; } .bi-year-popup .year-popup-navigation > .first-element { border-left: none; } .bi-theme-dark .bi-year-popup .year-popup-navigation > .center-element { - border-left: 1px solid #525466; + border-left: 1px solid #f2f4f7; } .bi-theme-dark .bi-year-popup .year-popup-navigation > .first-element { border-left: none;