diff options
| author | Sauli Tähkäpää <sauli@vaadin.com> | 2015-08-25 22:58:09 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-08-31 05:30:15 +0000 |
| commit | abe070212f7a4216524123613319355406394fb8 (patch) | |
| tree | 2b51b2f8c322a09f5779487b6e2cb5e1e33ca494 /WebContent/VAADIN | |
| parent | 4290ee20b506de430e40d2f985cac92369bb5c89 (diff) | |
| download | vaadin-framework-abe070212f7a4216524123613319355406394fb8.tar.gz vaadin-framework-abe070212f7a4216524123613319355406394fb8.zip | |
Enable overriding Grid style variables in Runo and Reindeer. (#18581)
Change-Id: I4a45716f6f0945050e7b5ec71616616ea3f7e8ee
Diffstat (limited to 'WebContent/VAADIN')
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/reindeer.scss | 20 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/runo/runo.scss | 22 |
2 files changed, 21 insertions, 21 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/reindeer.scss b/WebContent/VAADIN/themes/reindeer/reindeer.scss index cda571fda0..fece9f1043 100644 --- a/WebContent/VAADIN/themes/reindeer/reindeer.scss +++ b/WebContent/VAADIN/themes/reindeer/reindeer.scss @@ -3,16 +3,16 @@ $line-height: normal !default; // Override Base Grid variables -$v-grid-border: 1px solid #c2c3c4; -$v-grid-cell-vertical-border: 1px solid #d4d4d4; -$v-grid-cell-horizontal-border: none; -$v-grid-cell-focused-border: 1px solid #0f68ba; -$v-grid-row-height: 20px; -$v-grid-row-stripe-background-color: #eff0f1; -$v-grid-row-selected-background-color: #4d749f; -$v-grid-header-font-size: 10px; -$v-grid-header-background-color: rgb(217,219,221); -$v-grid-cell-padding-horizontal: 6px; +$v-grid-border: 1px solid #c2c3c4 !default; +$v-grid-cell-vertical-border: 1px solid #d4d4d4 !default; +$v-grid-cell-horizontal-border: none !default; +$v-grid-cell-focused-border: 1px solid #0f68ba !default; +$v-grid-row-height: 20px !default; +$v-grid-row-stripe-background-color: #eff0f1 !default; +$v-grid-row-selected-background-color: #4d749f !default; +$v-grid-header-font-size: 10px !default; +$v-grid-header-background-color: rgb(217,219,221) !default; +$v-grid-cell-padding-horizontal: 6px !default; @import "../base/base.scss"; diff --git a/WebContent/VAADIN/themes/runo/runo.scss b/WebContent/VAADIN/themes/runo/runo.scss index 73566be8c3..d481476d4c 100644 --- a/WebContent/VAADIN/themes/runo/runo.scss +++ b/WebContent/VAADIN/themes/runo/runo.scss @@ -3,18 +3,18 @@ $line-height: 18px !default; // Override Base Grid variables -$v-grid-border: 1px solid #b6bbbc; -$v-grid-cell-vertical-border: 1px solid #d4d4d4; -$v-grid-cell-vertical-border: none; -$v-grid-cell-horizontal-border: none; -$v-grid-cell-focused-border: 1px solid #57a7ed; -$v-grid-row-height: 26px; -$v-grid-header-row-height: 36px; +$v-grid-border: 1px solid #b6bbbc !default; +$v-grid-cell-vertical-border: 1px solid #d4d4d4 !default; +$v-grid-cell-vertical-border: none !default; +$v-grid-cell-horizontal-border: none !default; +$v-grid-cell-focused-border: 1px solid #57a7ed !default; +$v-grid-row-height: 26px !default; +$v-grid-header-row-height: 36px !default; $v-grid-row-background-color: #fff !default; -$v-grid-row-stripe-background-color:#eff0f1; -$v-grid-row-selected-background-color: #57a7ed; -$v-grid-header-font-size: 15px; -$v-grid-header-background-color: #e7e9ea; +$v-grid-row-stripe-background-color:#eff0f1 !default; +$v-grid-row-selected-background-color: #57a7ed !default; +$v-grid-header-font-size: 15px !default; +$v-grid-header-background-color: #e7e9ea !default; @import "../base/base.scss"; |