diff options
author | Leif Åstrand <leif@vaadin.com> | 2012-03-08 14:00:39 +0200 |
---|---|---|
committer | Leif Åstrand <leif@vaadin.com> | 2012-03-08 14:00:39 +0200 |
commit | 2d7975fd8f41407bcd51bf798df70f88f7fbe67e (patch) | |
tree | 0a72bcb97b1f6db08960077a7e75e9481b0a6122 /WebContent/VAADIN/themes/base/window | |
parent | 8e0b20234ffcbc1dcb78723bf91f20f6159ef2b3 (diff) | |
download | vaadin-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/base/window')
-rw-r--r-- | WebContent/VAADIN/themes/base/window/window.css | 34 |
1 files changed, 26 insertions, 8 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 */ |