diff options
| author | Henri Sara <hesara@vaadin.com> | 2012-06-20 17:38:17 +0300 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2012-06-20 17:38:17 +0300 |
| commit | d83a57c7facca417e4e92cacaa64ee9b6dbe4597 (patch) | |
| tree | 22d127d79edea56a6c20bdd43b6bc24bb008a1da /WebContent/VAADIN | |
| parent | 93e9eaf7abfad12d200e9f1805630b7b04daf7e2 (diff) | |
| parent | 0f8f9d32e0584743c858afeec12e57dedf0a5f71 (diff) | |
| download | vaadin-framework-d83a57c7facca417e4e92cacaa64ee9b6dbe4597.tar.gz vaadin-framework-d83a57c7facca417e4e92cacaa64ee9b6dbe4597.zip | |
Merge branch 'master' into gwt
Diffstat (limited to 'WebContent/VAADIN')
| -rw-r--r-- | WebContent/VAADIN/themes/base/accordion/accordion.css | 1 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/common/common.css | 16 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/panel/panel.css | 1 |
3 files changed, 10 insertions, 8 deletions
diff --git a/WebContent/VAADIN/themes/base/accordion/accordion.css b/WebContent/VAADIN/themes/base/accordion/accordion.css index 10c205ae24..ad762ee0ac 100644 --- a/WebContent/VAADIN/themes/base/accordion/accordion.css +++ b/WebContent/VAADIN/themes/base/accordion/accordion.css @@ -22,6 +22,5 @@ } .v-accordion-item-content { position: absolute; - overflow: auto; width: 100%; }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/common/common.css b/WebContent/VAADIN/themes/base/common/common.css index 3c08a9d584..d2695a8015 100644 --- a/WebContent/VAADIN/themes/base/common/common.css +++ b/WebContent/VAADIN/themes/base/common/common.css @@ -29,7 +29,6 @@ div.v-app-loading { .v-view { height: 100%; width: 100%; - overflow: auto; /* avoid scrollbars with margins in root layout */ outline: none; position: relative; @@ -236,12 +235,17 @@ div.v-app-loading { .v-drag-element { z-index: 60000; - position: absolute; - opacity: 0.5; - filter: alpha(opacity=50); - cursor: default; + /* override any other position: properties */ + position: absolute !important; + opacity: 0.5; + filter: alpha(opacity=50); + cursor: default; } .v-clip { overflow: hidden; -}
\ No newline at end of file +} + +.v-scrollable { + overflow: auto; +} diff --git a/WebContent/VAADIN/themes/base/panel/panel.css b/WebContent/VAADIN/themes/base/panel/panel.css index 489d6bc015..d5a9915490 100644 --- a/WebContent/VAADIN/themes/base/panel/panel.css +++ b/WebContent/VAADIN/themes/base/panel/panel.css @@ -29,7 +29,6 @@ overflow: hidden; } .v-panel-content { - overflow: auto; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; |