diff options
| author | Marc Englund <marc@vaadin.com> | 2012-12-07 10:49:01 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-12-07 10:49:01 +0000 |
| commit | a18ea78f4456c92b33683137c338c33a52ddc9ce (patch) | |
| tree | 2d4eaa7b903ddd25888ada651490bd34ed3f29bd /WebContent/VAADIN | |
| parent | 64e0b7572fe73e22229950f729244df210a3028b (diff) | |
| parent | 0c67f19e4990f9f564b9848dd9d3416ff6458dae (diff) | |
| download | vaadin-framework-a18ea78f4456c92b33683137c338c33a52ddc9ce.tar.gz vaadin-framework-a18ea78f4456c92b33683137c338c33a52ddc9ce.zip | |
Merge "Fixed accordion to not cause scrollbars in IE (#9552)"
Diffstat (limited to 'WebContent/VAADIN')
| -rw-r--r-- | WebContent/VAADIN/themes/base/accordion/accordion.scss | 4 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/accordion/accordion.scss | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/WebContent/VAADIN/themes/base/accordion/accordion.scss b/WebContent/VAADIN/themes/base/accordion/accordion.scss index 6f4825f16b..833060ade8 100644 --- a/WebContent/VAADIN/themes/base/accordion/accordion.scss +++ b/WebContent/VAADIN/themes/base/accordion/accordion.scss @@ -3,7 +3,7 @@ .v-accordion { position: relative; outline: none; - overflow: hidden; + overflow: visible; text-align: left; /* Force default alignment */ } .v-accordion-item { @@ -11,7 +11,7 @@ zoom: 1; } .v-accordion-item-caption { - overflow: hidden; + overflow: visible; white-space: nowrap; background: #eee; border-bottom: 1px solid #ddd; diff --git a/WebContent/VAADIN/themes/reindeer/accordion/accordion.scss b/WebContent/VAADIN/themes/reindeer/accordion/accordion.scss index 2646bfaa8b..bc332dd13b 100644 --- a/WebContent/VAADIN/themes/reindeer/accordion/accordion.scss +++ b/WebContent/VAADIN/themes/reindeer/accordion/accordion.scss @@ -5,10 +5,12 @@ border-radius: 2px; -webkit-border-radius: 2px; -moz-border-radius: 2px; - overflow: hidden; + overflow: visible; } .#{$primaryStyleName}-item { background-color: #fff; + display: inline-block; + width: 100%; } .#{$primaryStyleName}-item-caption { height: 19px; @@ -28,10 +30,7 @@ border-top: none; } .#{$primaryStyleName}-item-caption .v-caption { - padding: 3px 0 5px 10px; -} -.v-ie & .#{$primaryStyleName}-item-caption .v-caption { - padding: 2px 0 6px 10px; + padding: 3px 0 0px 10px; } .#{$primaryStyleName}-item-open .#{$primaryStyleName}-item-caption { background-image: url(../tabsheet/img/tabbar-bg-sel.png); /** sprite-ref: verticals; sprite-alignment: repeat */ |