diff options
| author | Jouni Koivuviita <jouni@vaadin.com> | 2014-04-16 11:42:37 +0300 |
|---|---|---|
| committer | Jouni Koivuviita <jouni@vaadin.com> | 2014-04-16 13:44:35 +0300 |
| commit | 9c521a6d3e2022bbdbc6bb94aca7ffe4cd01bf93 (patch) | |
| tree | 97b9f020b3ff2723159da651159f71ab9a8ba1fd /WebContent/VAADIN/themes/valo/components | |
| parent | f50ad371bce71ecd235d0b26d19dbf6c3a4d157f (diff) | |
| download | vaadin-framework-9c521a6d3e2022bbdbc6bb94aca7ffe4cd01bf93.tar.gz vaadin-framework-9c521a6d3e2022bbdbc6bb94aca7ffe4cd01bf93.zip | |
Prefixed all Valo-specific 'property values' with 'v-'
Bevel and shadow substitute values 'hilite' and 'shade' are now
'v-hilite' and 'v-shade'.
'focus-color' is also now 'v-focus-color'.
Gradient style are now 'v-linear' and 'v-linear-reverse'
Change-Id: I003997d3fea076d7fec45cb95e70c27a81de625e
Diffstat (limited to 'WebContent/VAADIN/themes/valo/components')
4 files changed, 3 insertions, 4 deletions
diff --git a/WebContent/VAADIN/themes/valo/components/_button.scss b/WebContent/VAADIN/themes/valo/components/_button.scss index 878203b878..660a988bb5 100644 --- a/WebContent/VAADIN/themes/valo/components/_button.scss +++ b/WebContent/VAADIN/themes/valo/components/_button.scss @@ -117,7 +117,7 @@ $v-button-disabled-opacity: $v-disabled-opacity !default; $border-color: if(color-luminance($background-color) < color-luminance($v-app-background-color), $background-color, $v-app-background-color); $border-color: blend-darken($border-color, scale-color($border-color, $lightness: max(-50%, -$bevel-depth/2))); $border-color: scale-color($border-color, $saturation: -$bevel-depth/2); - @if contains($bevel-style, shade, true) { + @if contains($bevel-style, v-shade, true) { $border-color: $border-color $border-color blend-multiply(transparentize(#000, max(0.8, 1-$bevel-depth/200%)), $border-color); } diff --git a/WebContent/VAADIN/themes/valo/components/_panel.scss b/WebContent/VAADIN/themes/valo/components/_panel.scss index 54c9df18ba..54fe31975a 100644 --- a/WebContent/VAADIN/themes/valo/components/_panel.scss +++ b/WebContent/VAADIN/themes/valo/components/_panel.scss @@ -76,7 +76,7 @@ $v-panel-caption-bevel-depth: $v-bevel-depth !default; @mixin v-valo-panel-well-style { $_bg: scale-color(adjust-color($v-app-background-color, $lightness: -2%), $saturation: -1.5%); background: $_bg; - box-shadow: v-valo-shadow($shadow-style: (0 1px 0 0 hilite, join(inset, $v-panel-shadow-style))); + box-shadow: v-valo-shadow($shadow-style: (0 1px 0 0 v-hilite, join(inset, $v-panel-shadow-style))); border-radius: $v-border-radius; border: $v-border-width solid v-valo-panel-border-color(v-valo-panel-background-color()); diff --git a/WebContent/VAADIN/themes/valo/components/_table.scss b/WebContent/VAADIN/themes/valo/components/_table.scss index 58d96c688a..59ad6069af 100644 --- a/WebContent/VAADIN/themes/valo/components/_table.scss +++ b/WebContent/VAADIN/themes/valo/components/_table.scss @@ -312,7 +312,6 @@ $v-table-background-color: null !default; @include transition-delay(100ms); } - /* row in column selector */ .v-on, .v-off { &:before { diff --git a/WebContent/VAADIN/themes/valo/components/_textfield.scss b/WebContent/VAADIN/themes/valo/components/_textfield.scss index 14f9535d41..14735a4f9d 100644 --- a/WebContent/VAADIN/themes/valo/components/_textfield.scss +++ b/WebContent/VAADIN/themes/valo/components/_textfield.scss @@ -1,4 +1,4 @@ -$v-textfield-bevel-style: inset 0 1px 0 shade, 0 1px 0 hilite !default; +$v-textfield-bevel-style: inset 0 1px 0 v-shade, 0 1px 0 v-hilite !default; $v-textfield-bevel-depth: $v-bevel-depth !default; $v-textfield-shadow-style: none !default; $v-textfield-shadow-depth: $v-shadow-depth !default; |