summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-03-08 14:00:39 +0200
committerLeif Åstrand <leif@vaadin.com>2012-03-08 14:00:39 +0200
commit2d7975fd8f41407bcd51bf798df70f88f7fbe67e (patch)
tree0a72bcb97b1f6db08960077a7e75e9481b0a6122 /WebContent/VAADIN/themes
parent8e0b20234ffcbc1dcb78723bf91f20f6159ef2b3 (diff)
downloadvaadin-framework-2d7975fd8f41407bcd51bf798df70f88f7fbe67e.tar.gz
vaadin-framework-2d7975fd8f41407bcd51bf798df70f88f7fbe67e.zip
Update VWindow.setWidth/Height to set outer sizes (#8313)
Also fix some small issues related to when the min size is used
Diffstat (limited to 'WebContent/VAADIN/themes')
-rw-r--r--WebContent/VAADIN/themes/base/window/window.css34
-rw-r--r--WebContent/VAADIN/themes/chameleon/components/window/window.css7
-rw-r--r--WebContent/VAADIN/themes/reindeer/window/window.css13
-rw-r--r--WebContent/VAADIN/themes/runo/window/window.css8
4 files changed, 47 insertions, 15 deletions
diff --git a/WebContent/VAADIN/themes/base/window/window.css b/WebContent/VAADIN/themes/base/window/window.css
index 701140333a..bd36c12715 100644
--- a/WebContent/VAADIN/themes/base/window/window.css
+++ b/WebContent/VAADIN/themes/base/window/window.css
@@ -1,21 +1,39 @@
.v-window {
background: #fff;
}
+.v-window-contents {
+ padding: 1.6em 0 10px;
+ margin: -1.6em 0 -10px;
+ box-sizing: border-box;
+ -moz-box-sizing: border-box;
+}
+
+.v-window.v-has-width > div.popupContent,
+.v-window.v-has-width .v-window-wrap,
+.v-window.v-has-width .v-window-contents,
+.v-window.v-has-width .v-window-contents > div {
+ width: 100%;
+}
+
+.v-window.v-has-height > div.popupContent,
+.v-window.v-has-height .v-window-wrap,
+.v-window.v-has-height .v-window-contents,
+.v-window.v-has-height .v-window-contents > div {
+ height: 100%;
+}
+
.v-window-outerheader {
- padding: 0.3em 0;
- height: 1em;
+ padding: 0.3em 1em;
+ height: 1.6em;
position: relative;
+ box-sizing: border-box;
+ -moz-box-sizing: border-box;
}
.v-window-outerheader,
.v-window-draggingCurtain {
cursor: move;
}
-.v-window-header.v-not-spanning {
- position: absolute;
- left: 0;
- right: 0;
-}
.v-window-header {
font-weight: bold;
}
@@ -25,7 +43,7 @@ div.v-window-header {
text-overflow: ellipsis;
-ms-text-overflow: ellipsis;
overflow: hidden;
- padding: 0 1em;
+ padding: 0;
}
.v-window-header .v-icon {
vertical-align: middle; /* This has to be 'middle', not 'bottom', to allow larger icons than 16px */
diff --git a/WebContent/VAADIN/themes/chameleon/components/window/window.css b/WebContent/VAADIN/themes/chameleon/components/window/window.css
index b5cc0170ac..00e6760d4b 100644
--- a/WebContent/VAADIN/themes/chameleon/components/window/window.css
+++ b/WebContent/VAADIN/themes/chameleon/components/window/window.css
@@ -30,10 +30,13 @@
background-image: url(../../img/grad-light-top.png);
background-repeat: repeat-x;
}
-
+.v-window-contents {
+ padding: 2.1em 0 0;
+ margin: -2.1em 0 0;
+}
.v-window-outerheader {
padding: .2em 1.7em .5em 1.2em;
- height: auto;
+ height: 2.1em;
text-align: center;
}
diff --git a/WebContent/VAADIN/themes/reindeer/window/window.css b/WebContent/VAADIN/themes/reindeer/window/window.css
index e24b00e4ea..348d1cb2c5 100644
--- a/WebContent/VAADIN/themes/reindeer/window/window.css
+++ b/WebContent/VAADIN/themes/reindeer/window/window.css
@@ -3,18 +3,24 @@
}
.v-window-wrap {
border: 1px solid #808386;
+ box-sizing: border-box;
+ -moz-box-sizing: border-box;
}
.v-sa .v-window-wrap,
.v-op .v-window-wrap {
border-color: rgba(0,0,0,.2);
}
.v-window-outerheader {
- padding: 12px 0 0;
- height: 25px;
+ padding: 12px 32px 0 14px;
+ height: 37px;
background: black repeat-x;
background-image: url(img/header-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */
}
-div.v-window-header {
+.v-window-contents {
+ padding: 37px 0 15px;
+ margin: -37px 0 -15px;
+}
+.v-window-header {
font-weight: bold;
font-size: 12px;
line-height: normal;
@@ -24,7 +30,6 @@ div.v-window-header {
overflow: hidden;
text-overflow: ellipsis;
-ms-text-overflow: ellipsis;
- padding: 0 32px 0 14px
}
.v-window-error .v-window-header {
padding-left: 13px;
diff --git a/WebContent/VAADIN/themes/runo/window/window.css b/WebContent/VAADIN/themes/runo/window/window.css
index 210bccb9b9..3205659341 100644
--- a/WebContent/VAADIN/themes/runo/window/window.css
+++ b/WebContent/VAADIN/themes/runo/window/window.css
@@ -9,7 +9,7 @@
background: transparent url(img/top-left.png) no-repeat;
}
.v-window-outerheader {
- height: 23px;
+ height: 49px;
margin-left: 9px;
padding: 15px 40px 11px 12px;
background: transparent url(img/top-right.png) no-repeat right top;
@@ -23,10 +23,16 @@
text-shadow: 0 1px 0 #fff;
}
.v-window-contents {
+ padding: 49px 0 8px;
+ margin: -49px 0 -8px;
+}
+.v-window-contents > div {
background: #fff;
border: 2px solid #babfc0;
border-top: none;
border-bottom: none;
+ box-sizing: border-box;
+ -moz-box-sizing: border-box;
}
.v-window div.v-window-footer {
height: 8px;