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/shared | |
| 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/shared')
| -rw-r--r-- | WebContent/VAADIN/themes/valo/shared/_overlay.scss | 2 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/valo/shared/_tooltip.scss | 5 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/valo/shared/_variables.scss | 10 |
3 files changed, 11 insertions, 6 deletions
diff --git a/WebContent/VAADIN/themes/valo/shared/_overlay.scss b/WebContent/VAADIN/themes/valo/shared/_overlay.scss index 87adb4dffd..96aa05ac49 100644 --- a/WebContent/VAADIN/themes/valo/shared/_overlay.scss +++ b/WebContent/VAADIN/themes/valo/shared/_overlay.scss @@ -6,7 +6,7 @@ $v-overlay-padding: round($v-unit-size/9) !default; $v-overlay-padding-vertical: $v-overlay-padding !default; $v-overlay-padding-horizontal: $v-overlay-padding !default; -$v-overlay-shadow-style: 0 2px 4px 0 shade, 0 3px 5px 0 shade !default; +$v-overlay-shadow-style: 0 2px 4px 0 v-shade, 0 3px 5px 0 v-shade !default; $v-selection-overlay-padding: $v-overlay-padding !default; $v-selection-overlay-padding-vertical: $v-selection-overlay-padding !default; diff --git a/WebContent/VAADIN/themes/valo/shared/_tooltip.scss b/WebContent/VAADIN/themes/valo/shared/_tooltip.scss index 9074fc69a7..dab8d5afeb 100644 --- a/WebContent/VAADIN/themes/valo/shared/_tooltip.scss +++ b/WebContent/VAADIN/themes/valo/shared/_tooltip.scss @@ -28,6 +28,11 @@ $v-tooltip-border-radius: $v-border-radius - 1px !default; max-height: 10em; overflow: auto; font-weight: $v-font-weight + 100; + + h2:only-child { + font: inherit; + line-height: inherit; + } } .v-tooltip-text { diff --git a/WebContent/VAADIN/themes/valo/shared/_variables.scss b/WebContent/VAADIN/themes/valo/shared/_variables.scss index a0aabd9590..19f5195acb 100644 --- a/WebContent/VAADIN/themes/valo/shared/_variables.scss +++ b/WebContent/VAADIN/themes/valo/shared/_variables.scss @@ -98,16 +98,16 @@ $v-layout-spacing-horizontal: round($v-unit-size/3) !default; $v-border-width: 1px !default; // Must be specified in pixels $v-border-radius: 4px !default; // Must be specified in pixels -$v-gradient-style: linear !default; +$v-gradient-style: v-linear !default; $v-gradient-depth: 8% !default; -$v-bevel-style: inset 0 1px 0 hilite, inset 0 -1px 0 shade !default; +$v-bevel-style: inset 0 1px 0 v-hilite, inset 0 -1px 0 v-shade !default; $v-bevel-depth: 25% !default; -$v-shadow-style: 0 2px 3px shade !default; +$v-shadow-style: 0 2px 3px v-shade !default; $v-shadow-depth: 5% !default; -$v-focus-style: 0 0 0 2px focus-color !default; +$v-focus-style: 0 0 0 2px v-focus-color !default; $v-focus-color: null !default; $v-animations-enabled: true !default; @@ -137,4 +137,4 @@ $v-valo-include-common-stylenames: true !default; // @private // @variable v-relative-paths // @default false -$v-relative-paths: false !default;
\ No newline at end of file +$v-relative-paths: false !default; |