diff options
| author | Jouni Koivuviita <jouni@vaadin.com> | 2014-08-19 13:58:38 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2014-08-19 14:48:39 +0000 |
| commit | 8cd05fe96a877eefaf17dbb58c54141fab1255fa (patch) | |
| tree | 34238e81bdd9038067e5b4310cd0102126e914ec /WebContent | |
| parent | 1ceef27de99043e4ba917a8f806d107d1eaf4495 (diff) | |
| download | vaadin-framework-8cd05fe96a877eefaf17dbb58c54141fab1255fa.tar.gz vaadin-framework-8cd05fe96a877eefaf17dbb58c54141fab1255fa.zip | |
Last minute small fixes to Valo
Change-Id: Ib4dfac4ee2bb858d02c34a920ad53e37e73b73e1
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/VAADIN/themes/valo/components/_panel.scss | 2 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/valo/components/_valo-menu.scss | 2 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/valo/components/_window.scss | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/WebContent/VAADIN/themes/valo/components/_panel.scss b/WebContent/VAADIN/themes/valo/components/_panel.scss index 6ccd5139da..07e21cccbf 100644 --- a/WebContent/VAADIN/themes/valo/components/_panel.scss +++ b/WebContent/VAADIN/themes/valo/components/_panel.scss @@ -162,6 +162,8 @@ $v-panel-border: $v-border !default; left: 0; height: 0; border-top: $border-width solid first-color(valo-border($color: $v-app-background-color, $strength: 0.5)); + $border-color: first-color(valo-border($color: $v-app-background-color, $strength: 1)); + border-color: rgba($border-color, .5); } } diff --git a/WebContent/VAADIN/themes/valo/components/_valo-menu.scss b/WebContent/VAADIN/themes/valo/components/_valo-menu.scss index 020eb1cae7..9a9e597888 100644 --- a/WebContent/VAADIN/themes/valo/components/_valo-menu.scss +++ b/WebContent/VAADIN/themes/valo/components/_valo-menu.scss @@ -87,7 +87,7 @@ $valo-menu-background-color: scale-color($v-app-background-color, $lightness: if img.v-icon { width: round($v-unit-size * 1.5); height: round($v-unit-size * 1.5); - border-radius: ceil($v-unit-size * 1.5 / 2); + border-radius: ceil($v-unit-size * 1.5 / 2 + first-number($v-border)); box-shadow: valo-bevel-and-shadow($bevel: null, $shadow: $v-shadow); display: block; margin: 0 auto .3em; diff --git a/WebContent/VAADIN/themes/valo/components/_window.scss b/WebContent/VAADIN/themes/valo/components/_window.scss index 97859a62b2..b958be79da 100644 --- a/WebContent/VAADIN/themes/valo/components/_window.scss +++ b/WebContent/VAADIN/themes/valo/components/_window.scss @@ -96,6 +96,8 @@ $v-window-modality-curtain-background-color: #222 !default; height: 0; $_bg: $v-window-background-color; border-top: $scroll-divider-width solid first-color(valo-border($strength: 0.5)); + $border-color: first-color(valo-border($strength: 1)); + border-color: rgba($border-color, .5); } } |