diff options
author | Artur Signell <artur@vaadin.com> | 2015-09-04 15:05:27 +0300 |
---|---|---|
committer | Artur Signell <artur@vaadin.com> | 2015-09-04 15:05:27 +0300 |
commit | f46be1b2792755cb7d9b111068dd6cf202398c4a (patch) | |
tree | 74f7098faee688cc1f1ca1b6ffe9e912338bbcaf /WebContent/VAADIN/themes/reindeer/reindeer.scss | |
parent | e603ea3cf91e5dd0893b766f27d400947527fba9 (diff) | |
parent | ebceef4d44bcd61605fa92fcf7be8d3678537599 (diff) | |
download | vaadin-framework-f46be1b2792755cb7d9b111068dd6cf202398c4a.tar.gz vaadin-framework-f46be1b2792755cb7d9b111068dd6cf202398c4a.zip |
Merge remote-tracking branch 'origin/master' into reconnect-dialog
Change-Id: Ie622160a83116c83b255a26bec297f73f3223ac7
Diffstat (limited to 'WebContent/VAADIN/themes/reindeer/reindeer.scss')
-rw-r--r-- | WebContent/VAADIN/themes/reindeer/reindeer.scss | 20 |
1 files changed, 10 insertions, 10 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"; |