caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/~windy/fineui

es6
windy 7 years ago
parent
bb2fdf5f1a 257d56f7a4
commit
985359447e
10 changed files with 59 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      src/css/base/segment/segment.css
  2. 4
      src/css/base/single/button/button.css
  3. 8
      src/css/base/table/table.collection.cell.css
  4. 48
      src/css/base/table/table.css
  5. 8
      src/css/base/table/table.grid.cell.css
  6. 4
      src/css/base/view/popupview.css
  7. 4
      src/css/core/normalize2.css
  8. 20
      src/css/core/utils/common.css
  9. 4
      src/css/widget/exceltable/exceltable.css
  10. 4
      src/css/widget/year/popup.year.css

14
src/css/base/segment/segment.css
Unescape View File

@ -3,12 +3,12 @@
overflow-x: hidden; overflow-x: hidden;
overflow-y: hidden; overflow-y: hidden;
background: #ffffff; background: #ffffff;
border-right: 1px solid #d4dadd; border-right: 1px solid #e8eaed;
border-top: 1px solid #d4dadd; border-top: 1px solid #e8eaed;
border-bottom: 1px solid #d4dadd; border-bottom: 1px solid #e8eaed;
} }
.bi-segment > .first-element { .bi-segment > .first-element {
border-left: 1px solid #d4dadd; border-left: 1px solid #e8eaed;
-webkit-border-radius: 6px 0px 0px 6px; -webkit-border-radius: 6px 0px 0px 6px;
-moz-border-radius: 6px 0px 0px 6px; -moz-border-radius: 6px 0px 0px 6px;
border-radius: 6px 0px 0px 6px; border-radius: 6px 0px 0px 6px;
@ -23,9 +23,9 @@
overflow-x: hidden; overflow-x: hidden;
overflow-y: hidden; overflow-y: hidden;
background: #242640; background: #242640;
border-right: 1px solid #525466; border-right: 1px solid #f2f4f7;
border-top: 1px solid #525466; border-top: 1px solid #f2f4f7;
border-bottom: 1px solid #525466; border-bottom: 1px solid #f2f4f7;
} }
.bi-theme-dark .bi-segment > .first-element { .bi-theme-dark .bi-segment > .first-element {
border-left: 1px solid #242640; border-left: 1px solid #242640;

4
src/css/base/single/button/button.css
Unescape View File

@ -46,7 +46,7 @@ body .bi-button.button-common.clear .b-font:before,
body .bi-button.button-ignore, body .bi-button.button-ignore,
#body .bi-button.button-ignore { #body .bi-button.button-ignore {
background-color: #ffffff; background-color: #ffffff;
border-color: #d4dadd; border-color: #e8eaed;
} }
body .bi-button.button-ignore, body .bi-button.button-ignore,
#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,
#body .bi-button.button-ignore.disabled { #body .bi-button.button-ignore.disabled {
background: #ffffff !important; background: #ffffff !important;
border-color: #d4dadd !important; border-color: #e8eaed !important;
} }
body .bi-button.button-ignore.disabled, body .bi-button.button-ignore.disabled,
#body .bi-button.button-ignore.disabled, #body .bi-button.button-ignore.disabled,

8
src/css/base/table/table.collection.cell.css
Unescape View File

@ -9,14 +9,14 @@
/*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
} }
.bi-collection-table-cell.first-row { .bi-collection-table-cell.first-row {
border-top: 1px solid #d4dadd; border-top: 1px solid #e8eaed;
} }
.bi-collection-table-cell.first-col { .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 { .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 { .bi-theme-dark .bi-collection-table-cell.first-col {
border-left: 1px solid #525466; border-left: 1px solid #f2f4f7;
} }

48
src/css/base/table/table.css
Unescape View File

@ -5,24 +5,24 @@
border-top: none; border-top: none;
} }
.bi-table > div > div > table { .bi-table > div > div > table {
border-bottom: 1px solid #d4dadd; border-bottom: 1px solid #e8eaed;
border-right: 1px solid #d4dadd; border-right: 1px solid #e8eaed;
} }
.bi-table > div.top-left > div > div > table { .bi-table > div.top-left > div > div > table {
border-bottom: 1px solid #d4dadd; border-bottom: 1px solid #e8eaed;
border-right: 1px solid #d4dadd; border-right: 1px solid #e8eaed;
} }
.bi-table > div.top-right > div > div > table { .bi-table > div.top-right > div > div > table {
border-bottom: 1px solid #d4dadd; border-bottom: 1px solid #e8eaed;
border-right: 1px solid #d4dadd; border-right: 1px solid #e8eaed;
} }
.bi-table > div.bottom-left > div > div > table { .bi-table > div.bottom-left > div > div > table {
border-bottom: 1px solid #d4dadd; border-bottom: 1px solid #e8eaed;
border-right: 1px solid #d4dadd; border-right: 1px solid #e8eaed;
} }
.bi-table > div.bottom-right > div > div > table { .bi-table > div.bottom-right > div > div > table {
border-right: 1px solid #d4dadd; border-right: 1px solid #e8eaed;
border-bottom: 1px solid #d4dadd; border-bottom: 1px solid #e8eaed;
} }
.bi-table > div > div > table, .bi-table > div > div > table,
.bi-table > div > 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 > div > table > tbody > tr > td,
.bi-table > div > div > table > thead > tr > td, .bi-table > div > div > table > thead > tr > td,
.bi-table > div > div > div > table > thead > tr > td { .bi-table > div > div > div > table > thead > tr > td {
border-top: 1px solid #d4dadd; border-top: 1px solid #e8eaed;
border-left: 1px solid #d4dadd; border-left: 1px solid #e8eaed;
} }
.bi-theme-dark .bi-table > div > div > table { .bi-theme-dark .bi-table > div > div > table {
border-bottom: 1px solid #525466; border-bottom: 1px solid #f2f4f7;
border-right: 1px solid #525466; border-right: 1px solid #f2f4f7;
} }
.bi-theme-dark .bi-table > div.top-left > div > div > table { .bi-theme-dark .bi-table > div.top-left > div > div > table {
border-bottom: 1px solid #525466; border-bottom: 1px solid #f2f4f7;
border-right: 1px solid #525466; border-right: 1px solid #f2f4f7;
} }
.bi-theme-dark .bi-table > div.top-right > div > div > table { .bi-theme-dark .bi-table > div.top-right > div > div > table {
border-bottom: 1px solid #525466; border-bottom: 1px solid #f2f4f7;
border-right: 1px solid #525466; border-right: 1px solid #f2f4f7;
} }
.bi-theme-dark .bi-table > div.bottom-left > div > div > table { .bi-theme-dark .bi-table > div.bottom-left > div > div > table {
border-bottom: 1px solid #525466; border-bottom: 1px solid #f2f4f7;
border-right: 1px solid #525466; border-right: 1px solid #f2f4f7;
} }
.bi-theme-dark .bi-table > div.bottom-right > div > div > table { .bi-theme-dark .bi-table > div.bottom-right > div > div > table {
border-right: 1px solid #525466; border-right: 1px solid #f2f4f7;
border-bottom: 1px solid #525466; border-bottom: 1px solid #f2f4f7;
} }
.bi-theme-dark .bi-table > div > div > table > tbody > tr > td, .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 > div > table > tbody > tr > td,
.bi-theme-dark .bi-table > div > div > table > thead > 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 { .bi-theme-dark .bi-table > div > div > div > table > thead > tr > td {
border-top: 1px solid #525466; border-top: 1px solid #f2f4f7;
border-left: 1px solid #525466; border-left: 1px solid #f2f4f7;
} }

8
src/css/base/table/table.grid.cell.css
Unescape View File

@ -9,14 +9,14 @@
/*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
} }
.bi-grid-table-cell.first-row { .bi-grid-table-cell.first-row {
border-top: 1px solid #d4dadd; border-top: 1px solid #e8eaed;
} }
.bi-grid-table-cell.first-col { .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 { .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 { .bi-theme-dark .bi-grid-table-cell.first-col {
border-left: 1px solid #525466; border-left: 1px solid #f2f4f7;
} }

4
src/css/base/view/popupview.css
Unescape View File

@ -15,13 +15,13 @@
line-height: 30px; line-height: 30px;
} }
.bi-popup-view .list-view-toolbar > .center-element { .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 { .bi-popup-view .list-view-toolbar > .first-element {
border-left: none; border-left: none;
} }
.bi-theme-dark .bi-popup-view .list-view-toolbar > .center-element { .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 { .bi-theme-dark .bi-popup-view .list-view-toolbar > .first-element {
border-left: none; border-left: none;

4
src/css/core/normalize2.css
Unescape View File

@ -34,11 +34,11 @@ textarea {
margin: 0; margin: 0;
padding: 0; padding: 0;
outline: none; outline: none;
border: 1px solid #d4dadd; border: 1px solid #e8eaed;
} }
.bi-theme-dark input, .bi-theme-dark input,
.bi-theme-dark textarea { .bi-theme-dark textarea {
border: 1px solid #525466; border: 1px solid #f2f4f7;
} }
ul { ul {
list-style: disc; list-style: disc;

20
src/css/core/utils/common.css
Unescape View File

@ -106,34 +106,34 @@
color: #c4c9d1; color: #c4c9d1;
} }
.bi-border { .bi-border {
border: 1px solid #d4dadd; border: 1px solid #e8eaed;
} }
.bi-theme-dark .bi-border { .bi-theme-dark .bi-border {
border: 1px solid #525466; border: 1px solid #f2f4f7;
} }
.bi-border-left { .bi-border-left {
border-left: 1px solid #d4dadd; border-left: 1px solid #e8eaed;
} }
.bi-theme-dark .bi-border-left { .bi-theme-dark .bi-border-left {
border-left: 1px solid #525466; border-left: 1px solid #f2f4f7;
} }
.bi-border-right { .bi-border-right {
border-right: 1px solid #d4dadd; border-right: 1px solid #e8eaed;
} }
.bi-theme-dark .bi-border-right { .bi-theme-dark .bi-border-right {
border-right: 1px solid #525466; border-right: 1px solid #f2f4f7;
} }
.bi-border-top { .bi-border-top {
border-top: 1px solid #d4dadd; border-top: 1px solid #e8eaed;
} }
.bi-theme-dark .bi-border-top { .bi-theme-dark .bi-border-top {
border-top: 1px solid #525466; border-top: 1px solid #f2f4f7;
} }
.bi-border-bottom { .bi-border-bottom {
border-bottom: 1px solid #d4dadd; border-bottom: 1px solid #e8eaed;
} }
.bi-theme-dark .bi-border-bottom { .bi-theme-dark .bi-border-bottom {
border-bottom: 1px solid #525466; border-bottom: 1px solid #f2f4f7;
} }
.bi-keyword-red-mark { .bi-keyword-red-mark {
color: #ff4949; color: #ff4949;

4
src/css/widget/exceltable/exceltable.css
Unescape View File

@ -1,6 +1,6 @@
.bi-excel-table > div.bottom-right > div > div > table { .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 { .bi-theme-dark .bi-excel-table > div.bottom-right > div > div > table {
border-right: 1px solid #525466; border-right: 1px solid #f2f4f7;
} }

4
src/css/widget/year/popup.year.css
Unescape View File

@ -2,13 +2,13 @@
line-height: 30px; line-height: 30px;
} }
.bi-year-popup .year-popup-navigation > .center-element { .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 { .bi-year-popup .year-popup-navigation > .first-element {
border-left: none; border-left: none;
} }
.bi-theme-dark .bi-year-popup .year-popup-navigation > .center-element { .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 { .bi-theme-dark .bi-year-popup .year-popup-navigation > .first-element {
border-left: none; border-left: none;

Write Preview
Loading…
Cancel
Save