diff options
| author | Jouni Koivuviita <jouni@vaadin.com> | 2014-08-07 10:51:27 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2014-08-11 18:31:50 +0000 |
| commit | 42e98ea05c54169dbb7e50df25fdb67d6a9a9b2d (patch) | |
| tree | 938e339a89d184bfe61bacf48d6d039b3cdfa06b | |
| parent | fe761dfa77db94dd559ca84873d12de16a556d5a (diff) | |
| download | vaadin-framework-42e98ea05c54169dbb7e50df25fdb67d6a9a9b2d.tar.gz vaadin-framework-42e98ea05c54169dbb7e50df25fdb67d6a9a9b2d.zip | |
Small adjustment to valo-menu-item selection color
Now lighter bg on light colors and darker bg on dark colors.
Change-Id: Id61b88d1cae65330c6f7b2cc3bb93880a7de9965
| -rw-r--r-- | WebContent/VAADIN/themes/tests-valo-flat/_variables.scss | 1 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/valo/components/_valo-menu.scss | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/WebContent/VAADIN/themes/tests-valo-flat/_variables.scss b/WebContent/VAADIN/themes/tests-valo-flat/_variables.scss index 5d2b8abbb7..298e26ac36 100644 --- a/WebContent/VAADIN/themes/tests-valo-flat/_variables.scss +++ b/WebContent/VAADIN/themes/tests-valo-flat/_variables.scss @@ -18,6 +18,7 @@ $v-selection-overlay-padding-horizontal: 0; $v-selection-overlay-padding-vertical: 6px; $v-selection-item-height: 30px; $v-selection-item-border-radius: 0; +$valo-menu-background-color: #eee; @import "../valo/valo"; diff --git a/WebContent/VAADIN/themes/valo/components/_valo-menu.scss b/WebContent/VAADIN/themes/valo/components/_valo-menu.scss index 8bd26e2b10..507065d339 100644 --- a/WebContent/VAADIN/themes/valo/components/_valo-menu.scss +++ b/WebContent/VAADIN/themes/valo/components/_valo-menu.scss @@ -287,7 +287,7 @@ $valo-menu-background-color: scale-color($v-app-background-color, $lightness: if } &.selected { - background: darken($bg, 3%); + background: if(is-dark-color($bg), darken($bg, 3%), lighten($bg, 5%)); .v-icon { color: $active-color; @@ -422,7 +422,7 @@ $valo-menu-background-color: scale-color($v-app-background-color, $lightness: if } &.selected { - background: darken($bg, 3%); + background: if(is-dark-color($bg), darken($bg, 3%), lighten($bg, 5%)); .v-icon { opacity: 1; |