diff options
| author | Marc Englund <marc@vaadin.com> | 2012-10-01 11:28:38 +0300 |
|---|---|---|
| committer | Marc Englund <marc@vaadin.com> | 2012-10-01 11:28:38 +0300 |
| commit | d2db8f9054376b9b817f170426ef6a9f27990b0f (patch) | |
| tree | d963a73ef5dd2eab335b3a146d871511bf14af1d /WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss | |
| parent | d2d5bace48009de6e2ad46a9c73ce367eecd9bf1 (diff) | |
| parent | ea179b1a676a12d153878860a74055fac5dc6922 (diff) | |
| download | vaadin-framework-d2db8f9054376b9b817f170426ef6a9f27990b0f.tar.gz vaadin-framework-d2db8f9054376b9b817f170426ef6a9f27990b0f.zip | |
Merge branch 'master' into sass
Conflicts:
WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss
theme-compiler/src/com/vaadin/sass/tree/ListRemoveNode.java
theme-compiler/src/com/vaadin/sass/visitor/EachVisitor.java
Diffstat (limited to 'WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss')
| -rw-r--r-- | WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss index 37dae131e1..a001605f27 100644 --- a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss +++ b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss @@ -33,7 +33,7 @@ height: 1em; padding: 0.2em 0; } -.#{$name}-hidetabs .#{$name}-tabcontainer { +.#{$name}-hidetabs > .#{$name}-tabcontainer { display: none; } .#{$name}-scroller { |