diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2012-06-11 13:53:06 +0300 |
|---|---|---|
| committer | Johannes Dahlström <johannesd@vaadin.com> | 2012-06-11 13:53:06 +0300 |
| commit | d68a52ec88cb7faf3c5f15173b6fa5ec453ce7a8 (patch) | |
| tree | 6ba645583fd3aef3adce0ebb7e86f1f20c714aa3 /WebContent/VAADIN/themes | |
| parent | 7084c70d713833d983e348ea8d31adce51821f91 (diff) | |
| parent | 239aad4885931b6e7913ca4c86409b7b6997642f (diff) | |
| download | vaadin-framework-d68a52ec88cb7faf3c5f15173b6fa5ec453ce7a8.tar.gz vaadin-framework-d68a52ec88cb7faf3c5f15173b6fa5ec453ce7a8.zip | |
Merge commit '239aad'
Conflicts:
WebContent/VAADIN/themes/base/panel/panel.css
Diffstat (limited to 'WebContent/VAADIN/themes')
| -rw-r--r-- | WebContent/VAADIN/themes/base/accordion/accordion.css | 1 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/common/common.css | 1 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/panel/panel.css | 1 |
3 files changed, 0 insertions, 3 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 222ec5912f..ccdd5190fc 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; 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; |