diff options
author | Jouni Koivuviita <jouni@vaadin.com> | 2014-06-02 14:35:38 +0300 |
---|---|---|
committer | Jouni Koivuviita <jouni@vaadin.com> | 2014-06-04 06:58:45 +0000 |
commit | faaa02e1937f88c184ce4e88a548c9348de8f375 (patch) | |
tree | eeceb60b3ca58b43a2b42f932f22566521c19b53 /WebContent/VAADIN/themes/valo/components/_tree.scss | |
parent | 3a234228a3df575ce49b90368f966e6458fee757 (diff) | |
download | vaadin-framework-faaa02e1937f88c184ce4e88a548c9348de8f375.tar.gz vaadin-framework-faaa02e1937f88c184ce4e88a548c9348de8f375.zip |
Valo Sass API refactoring (#13668)
Also fixes #13672 (added ‘notification’ v-included-components list)
Fixes #13746 as well (DragAndDropWrapper won’t hide the drag source any
more)
Loads of smaller tweaks and fixes, went through almost all components
again and fixed any issues I could find in testing.
Testing done with the following:
Desktop (OS X Mavericks)
-Safari 7
-Chrome 35
-Firefox 24.5
-Opera 21, 12
-Internet Explorer 8,10
Mobile:
-iOS 7
-Android 4
-Android 2.3
-Windows Phone 8
Change-Id: Ide32cacd1958b5b8db85afe23f455ad3140a7d21
Diffstat (limited to 'WebContent/VAADIN/themes/valo/components/_tree.scss')
-rw-r--r-- | WebContent/VAADIN/themes/valo/components/_tree.scss | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/WebContent/VAADIN/themes/valo/components/_tree.scss b/WebContent/VAADIN/themes/valo/components/_tree.scss index cb0093c8c3..4b9fe33c4a 100644 --- a/WebContent/VAADIN/themes/valo/components/_tree.scss +++ b/WebContent/VAADIN/themes/valo/components/_tree.scss @@ -25,17 +25,17 @@ $v-tree-expand-animation-enabled: false !default; @mixin valo-tree ($primary-stylename: v-tree) { - + .#{$primary-stylename} { position: relative; white-space: nowrap; - @include user-select(none);; - + @include user-select(none); + &:focus { outline: none; } } - + .#{$primary-stylename}-node { &:before { content: ""; @@ -50,7 +50,6 @@ $v-tree-expand-animation-enabled: false !default; content: "+"; position: static; margin-left: -1.9em; - //background: red; vertical-align: top; @include valo-tree-collapsed-icon-style; text-align: center; @@ -61,13 +60,13 @@ $v-tree-expand-animation-enabled: false !default; padding-left: 1.9em; } } - + .#{$primary-stylename}-node-caption { height: $v-tree-row-height; line-height: $v-tree-row-height - 1px; overflow: hidden; white-space: nowrap; - + & > div { display: inline-block; width: 100%; @@ -90,7 +89,7 @@ $v-tree-expand-animation-enabled: false !default; } } } - + span { padding-right: $v-tree-row-height; cursor: pointer; @@ -135,7 +134,7 @@ $v-tree-expand-animation-enabled: false !default; display: inline-block; } } - + .#{$primary-stylename}-node-expanded > .#{$primary-stylename}-node-caption > div:before { @include valo-tree-expanded-icon-style; @@ -149,7 +148,10 @@ $v-tree-expand-animation-enabled: false !default; @include valo-tree-expanded-icon-style(true); } - + .#{$primary-stylename}-node-leaf > .#{$primary-stylename}-node-caption > div:before, + .v-ie8 & .#{$primary-stylename}-node-leaf:before { + visibility: hidden; + } .#{$primary-stylename}-node-focused { // This a v-tree-node-caption element @@ -157,17 +159,21 @@ $v-tree-expand-animation-enabled: false !default; opacity: 1; border: 1px solid valo-focus-color(); } + + .v-ie8 & { + outline: 1px dotted $v-focus-color; + } } - - - + + + .#{$primary-stylename}-node-selected { - color: valo-font-color(valo-selection-color(), 0.9); - text-shadow: valo-button-text-shadow(valo-selection-color(), $v-bevel-depth); + color: valo-font-color($v-selection-color, 0.9); + text-shadow: valo-button-text-shadow($v-selection-color, $v-bevel-depth); &:after { opacity: 1; - @include valo-gradient(valo-selection-color()); + @include valo-gradient($v-selection-color); border: none; .v-ie8 & { @@ -176,10 +182,10 @@ $v-tree-expand-animation-enabled: false !default; } .v-ie8 & { - @include valo-gradient(valo-selection-color()); + @include valo-gradient($v-selection-color); } } - + .#{$primary-stylename}-node-children { padding-left: round($v-unit-size/2); |