summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN
diff options
context:
space:
mode:
authorJouni Koivuviita <jouni@vaadin.com>2012-08-07 15:35:55 +0300
committerJouni Koivuviita <jouni@vaadin.com>2012-08-07 15:35:55 +0300
commitd422eba61ba6e8ef82c72fa661ff4991f8918ec0 (patch)
tree1e4f1c8f7f2d8b3543eed1991709a43889466446 /WebContent/VAADIN
parentef744edf4a0e849932d30bd9d6870ec15f391225 (diff)
parent23fcb95f1a8b2fda7f6b7d648634ec21463da875 (diff)
downloadvaadin-framework-d422eba61ba6e8ef82c72fa661ff4991f8918ec0.tar.gz
vaadin-framework-d422eba61ba6e8ef82c72fa661ff4991f8918ec0.zip
Boxlayout
Diffstat (limited to 'WebContent/VAADIN')
-rw-r--r--WebContent/VAADIN/themes/base/accordion/accordion.css1
-rw-r--r--WebContent/VAADIN/themes/base/common/common.css16
-rw-r--r--WebContent/VAADIN/themes/base/panel/panel.css1
-rw-r--r--WebContent/VAADIN/themes/liferay/window/window.css2
4 files changed, 11 insertions, 9 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;
diff --git a/WebContent/VAADIN/themes/liferay/window/window.css b/WebContent/VAADIN/themes/liferay/window/window.css
index 5ac7c02175..f034d7503f 100644
--- a/WebContent/VAADIN/themes/liferay/window/window.css
+++ b/WebContent/VAADIN/themes/liferay/window/window.css
@@ -11,7 +11,7 @@
}
.v-window-outerheader {
- height: 16px;
+ height: 38px;
margin-left: 9px;
padding: 10px 40px 12px 2px;
background: transparent url(top-right.png) no-repeat right top;