Black window style for Reindeer theme.

Multiple other fixes to Reindeer theme. Some fixes to base and Runo themes involving window styles.

svn changeset:7988/svn branch:6.0

22 files changed, 287 insertions, 34 deletions

diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css
index f034ea5801..5c17113141 100644
--- a/WebContent/VAADIN/themes/base/styles.css
+++ b/WebContent/VAADIN/themes/base/styles.css
@@ -1444,6 +1444,7 @@ div.v-window-header {
 }
 .v-window-footer {
 	overflow: hidden;
+	zoom: 1;
 }
 .v-window-resizebox {
 	display: inline; /* fix IE6 double float margin bug */
@@ -1454,6 +1455,19 @@ div.v-window-header {
 	background: #ddd;
 	overflow: hidden;
 }
+/* IE7 fails with the float:right */
+.v-ie7 .v-window-footer {
+	position: relative;
+	height: 10px;
+}
+.v-ie7 .v-window-resizebox {
+	position: absolute;
+	float: none;
+	right: 0;
+}
+.v-ie7 .v-window-footer-noresize {
+	height: 0;
+}
 .v-window-resizebox-disabled {
 	cursor: default;
 	display: none;
diff --git a/WebContent/VAADIN/themes/base/window/window.css b/WebContent/VAADIN/themes/base/window/window.css
index bf14c0a453..5920fe8e86 100644
--- a/WebContent/VAADIN/themes/base/window/window.css
+++ b/WebContent/VAADIN/themes/base/window/window.css
@@ -34,6 +34,7 @@ div.v-window-header {
 }
 .v-window-footer {
 	overflow: hidden;
+	zoom: 1;
 }
 .v-window-resizebox {
 	display: inline; /* fix IE6 double float margin bug */
@@ -44,6 +45,19 @@ div.v-window-header {
 	background: #ddd;
 	overflow: hidden;
 }
+/* IE7 fails with the float:right */
+.v-ie7 .v-window-footer {
+	position: relative;
+	height: 10px;
+}
+.v-ie7 .v-window-resizebox {
+	position: absolute;
+	float: none;
+	right: 0;
+}
+.v-ie7 .v-window-footer-noresize {
+	height: 0;
+}
 .v-window-resizebox-disabled {
 	cursor: default;
 	display: none;
diff --git a/WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.css b/WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.css
index 2b3eeb2a7a..50993b8ad3 100644
--- a/WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.css
+++ b/WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.css
@@ -4,8 +4,8 @@
 /** sprite: verticals; sprite-image: url(../common/img/vertical-sprites.png); sprite-layout: vertical */
 /** sprite: horizontals; sprite-image: url(../common/img/horizontal-sprites.png); sprite-layout: horizontal */
 
-/** sprite: black-verticals; sprite-image: url(../common/img/black-vertical-sprites.png); sprite-layout: vertical */
-/** sprite: black-horizontals; sprite-image: url(../common/img/black-horizontal-sprites.png); sprite-layout: horizontal */
+/** sprite: black-verticals; sprite-image: url(../common/img/black-vertical-sprites.png); sprite-layout: vertical; sprite-matte-color: #0b0e0f */
+/** sprite: black-horizontals; sprite-image: url(../common/img/black-horizontal-sprites.png); sprite-layout: horizontal; sprite-matte-color: #0b0e0f */
 
 /*------------
  * Buttons 
diff --git a/WebContent/VAADIN/themes/reindeer/common/common.css b/WebContent/VAADIN/themes/reindeer/common/common.css
index f7e63cd7a0..5ea77f98dc 100644
--- a/WebContent/VAADIN/themes/reindeer/common/common.css
+++ b/WebContent/VAADIN/themes/reindeer/common/common.css
@@ -51,6 +51,13 @@
 .v-Notification {
 	font-family: Helvetica, Arial, "Lucida Grande", Geneva, Tahoma, Verdana, sans-serif;
 }
+/* Fonts on black background */
+.v-app .black,
+.v-window-black,
+.v-popupview-popup .black {
+	color: #c9ccce;
+	text-shadow: #000 0 0 1px;
+}
 .v-errorindicator {
 	width: 13px;
 	height: 16px;
diff --git a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png
index 1f0bc9fdae..ee9ec13b8e 100644
--- a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png
+++ b/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png
diff --git a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites.png b/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites.png
index 06b80e758d..ec598329b3 100644
--- a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites.png
+++ b/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css
index b6c507c17f..497f12bec6 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css
+++ b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css
@@ -35,6 +35,11 @@ span.v-datefield-calendarpanel-month {
 .v-datefield-full .v-datefield-calendarpanel-month {
 	width: 124px;
 }
+.v-datefield-month,
+.v-datefield-day,
+.v-datefield-full {
+	min-width: 240px;
+}
 .v-datefield-year .v-datefield-calendarpanel {
 	width: 100px;
 }
@@ -271,7 +276,10 @@ td.v-datefield-calendarpanel-nextyear {
 .black span.v-datefield-calendarpanel-month {
 	border-left: 1px solid #333638;
 	border-right: 1px solid #232527;
+	color: #c9ccce;
 	text-shadow: #000 0 -1px 0;
+	padding: 4px 10px 1px 10px;
+	margin-top: 0;
 }
 .black .v-datefield-calendarpanel-prevyear button,
 .black .v-datefield-calendarpanel-nextyear button,
@@ -330,14 +338,4 @@ td.v-datefield-calendarpanel-nextyear {
 }
 .black .v-datefield-calendarpanel .v-last {
 	background-image: url(img/weekday-last-black.png); /** sprite-ref: black-verticals; sprite-alignment: right */
-}
-/* IE fails to position backgrounds inside table element */
-.v-ie .black .v-datefield-calendarpanel-weekdays td {
-	background: url(img/weekday-bg-black.png) repeat-x;
-}
-.v-ie .black .v-datefield-calendarpanel .v-first {
-	background: url(img/weekday-first-black.png) no-repeat;
-}
-.v-ie .black .v-datefield-calendarpanel .v-last {
-	background: url(img/weekday-last-black.png) no-repeat right top;
 }
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/label/label.css b/WebContent/VAADIN/themes/reindeer/label/label.css
index 8a7b18ff81..8a0b7decd0 100644
--- a/WebContent/VAADIN/themes/reindeer/label/label.css
+++ b/WebContent/VAADIN/themes/reindeer/label/label.css
@@ -36,4 +36,7 @@
 .black .v-caption-h2 {
 	color: #fff;
 	text-shadow: rgba(0,0,0,.8) 0 2px 2px;
+}
+.black .v-label-light {
+	color: #72787c;
 }
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/layouts/layouts.css b/WebContent/VAADIN/themes/reindeer/layouts/layouts.css
index 1d2c485580..9db0feaea1 100644
--- a/WebContent/VAADIN/themes/reindeer/layouts/layouts.css
+++ b/WebContent/VAADIN/themes/reindeer/layouts/layouts.css
@@ -35,6 +35,4 @@
 .v-horizontallayout-black,
 .v-orderedlayout-black {
 	background: #16181a url(img/black-bg.png) repeat-x;
-	color: #c9ccce;
-	text-shadow: #000 0 0 1px;
 }
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/select/select.css b/WebContent/VAADIN/themes/reindeer/select/select.css
index 0b8565ae71..8678cd8cc3 100644
--- a/WebContent/VAADIN/themes/reindeer/select/select.css
+++ b/WebContent/VAADIN/themes/reindeer/select/select.css
@@ -194,6 +194,7 @@
 }
 .v-app .black .v-filterselect-input,
 .v-window .black .v-filterselect-input,
+.v-window-black .v-filterselect-input,
 .v-popupview-popup .black .v-filterselect-input {
 	color: #c9ccce;
 	background-image: url(img/center-black.png); /** sprite-ref: black-verticals; sprite-alignment: repeat; sprite-margin-bottom: 1px */
diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index 59a1937742..fbbaee713e 100644
--- a/WebContent/VAADIN/themes/reindeer/styles.css
+++ b/WebContent/VAADIN/themes/reindeer/styles.css
@@ -1444,6 +1444,7 @@ div.v-window-header {
 }
 .v-window-footer {
 	overflow: hidden;
+	zoom: 1;
 }
 .v-window-resizebox {
 	display: inline; /* fix IE6 double float margin bug */
@@ -1454,6 +1455,19 @@ div.v-window-header {
 	background: #ddd;
 	overflow: hidden;
 }
+/* IE7 fails with the float:right */
+.v-ie7 .v-window-footer {
+	position: relative;
+	height: 10px;
+}
+.v-ie7 .v-window-resizebox {
+	position: absolute;
+	float: none;
+	right: 0;
+}
+.v-ie7 .v-window-footer-noresize {
+	height: 0;
+}
 .v-window-resizebox-disabled {
 	cursor: default;
 	display: none;
@@ -2141,6 +2155,13 @@ div > .v-button.v-button-link:active .v-button-caption,
 .v-Notification {
 	font-family: Helvetica, Arial, "Lucida Grande", Geneva, Tahoma, Verdana, sans-serif;
 }
+/* Fonts on black background */
+.v-app .black,
+.v-window-black,
+.v-popupview-popup .black {
+	color: #c9ccce;
+	text-shadow: #000 0 0 1px;
+}
 .v-errorindicator {
 	width: 13px;
 	height: 16px;
@@ -2254,6 +2275,11 @@ span.v-datefield-calendarpanel-month {
 .v-datefield-full .v-datefield-calendarpanel-month {
 	width: 124px;
 }
+.v-datefield-month,
+.v-datefield-day,
+.v-datefield-full {
+	min-width: 240px;
+}
 .v-datefield-year .v-datefield-calendarpanel {
 	width: 100px;
 }
@@ -2524,7 +2550,10 @@ td.v-datefield-calendarpanel-nextyear {
 .black span.v-datefield-calendarpanel-month {
 	border-left: 1px solid #333638;
 	border-right: 1px solid #232527;
+	color: #c9ccce;
 	text-shadow: #000 0 -1px 0;
+	padding: 4px 10px 1px 10px;
+	margin-top: 0;
 }
 .black .v-datefield-calendarpanel-prevyear button,
 .black .v-datefield-calendarpanel-nextyear button,
@@ -2608,16 +2637,6 @@ td.v-datefield-calendarpanel-nextyear {
   -background-image: url(common/img/black-vertical-sprites-ie6.png);
   background-position: right -294px;
 }
-/* IE fails to position backgrounds inside table element */
-.v-ie .black .v-datefield-calendarpanel-weekdays td {
-	background: url(datefield/img/weekday-bg-black.png) repeat-x;
-}
-.v-ie .black .v-datefield-calendarpanel .v-first {
-	background: url(datefield/img/weekday-first-black.png) no-repeat;
-}
-.v-ie .black .v-datefield-calendarpanel .v-last {
-	background: url(datefield/img/weekday-last-black.png) no-repeat right top;
-}
 
 /* ./WebContent/VAADIN/themes/reindeer/formlayout/formlayout.css */
 .v-formlayout-cell .v-errorindicator {
@@ -2714,6 +2733,9 @@ td.v-datefield-calendarpanel-nextyear {
 	color: #fff;
 	text-shadow: rgba(0,0,0,.8) 0 2px 2px;
 }
+.black .v-label-light {
+	color: #72787c;
+}
 
 /* ./WebContent/VAADIN/themes/reindeer/layouts/layouts.css */
 .v-orderedlayout-margin-top,
@@ -2753,8 +2775,6 @@ td.v-datefield-calendarpanel-nextyear {
 .v-horizontallayout-black,
 .v-orderedlayout-black {
 	background: #16181a url(layouts/img/black-bg.png) repeat-x;
-	color: #c9ccce;
-	text-shadow: #000 0 0 1px;
 }
 
 /* ./WebContent/VAADIN/themes/reindeer/notification/notification.css */
@@ -3057,6 +3077,7 @@ td.v-datefield-calendarpanel-nextyear {
 }
 .v-app .black .v-filterselect-input,
 .v-window .black .v-filterselect-input,
+.v-window-black .v-filterselect-input,
 .v-popupview-popup .black .v-filterselect-input {
 	color: #c9ccce;
   background-image: url(common/img/black-vertical-sprites.png);
@@ -3612,6 +3633,7 @@ input.v-textfield-prompt {
 	text-shadow: #000 0 0 1px;
 }
 .v-app .black .v-textfield-focus,
+.v-window-black .v-textfield-focus,
 .v-window .black .v-textfield-focus,
 .v-popupview-popup .black .v-textfield-focus {
 	border-color: #4e6a80;
@@ -3708,6 +3730,13 @@ input.v-textfield-readonly,
 .v-window-wrap {
 	border: 1px solid #808386;
 }
+/* IE6 needs border on the outer element */
+.v-ie6 .v-window {
+	border: 1px solid #808386;
+}
+.v-ie6 .v-window-wrap {
+	border: none;
+}
 .v-sa .v-window-wrap,
 .v-ff3 .v-window-wrap,
 .v-op .v-window-wrap {
@@ -3746,8 +3775,11 @@ input.v-textfield-readonly,
   -background-image: url(common/img/vertical-sprites-ie6.png);
   background-position: left -1257px;
 }
-.v-ie6 .v-window-footer {
-	zoom: 1;
+.v-ie7 .v-window-footer {
+	height: 15px;
+}
+.v-ie7 .v-window-footer-noresize {
+	height: 0;
 }
 .v-window-closebox {
 	top: 12px;
@@ -3775,3 +3807,83 @@ input.v-textfield-readonly,
 .v-window-modalitycurtain {
 	background: #56595b;
 }
+
+
+
+
+
+/**
+ Black window -----------------------------
+**/
+
+.v-window-black .v-window-wrap {
+	border-color: #2e3030;
+	border-radius: 8px;
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	overflow: hidden;
+}
+.v-sa .v-window-black .v-window-wrap,
+.v-ff3 .v-window-black .v-window-wrap,
+.v-op .v-window-black .v-window-wrap {
+	border-color: rgba(0,0,0,.9);
+}
+.v-window-black .v-window-wrap2 {
+	background-color: #0b0e0f;
+	-moz-border-radius: 8px;
+}
+.v-sa .v-window-black .v-window-wrap2,
+.v-ff3 .v-window-black .v-window-wrap2,
+.v-op .v-window-black .v-window-wrap2 {
+	background-color: rgba(11,14,15,.9);
+}
+.v-window-black .v-window-outerheader {
+	height: auto;
+	padding: 0;
+	background: transparent;
+}
+.v-window-black .v-window-header {
+	height: auto;
+	padding: 7px 0 7px 0;
+	height: 15px;
+	font-size: 12px;
+	font-weight: normal;
+	color: #dddfe1;
+	background: transparent repeat-x;
+  background-image: url(common/img/black-vertical-sprites.png);
+  -background-image: url(common/img/black-vertical-sprites-ie6.png);
+  background-position: left -549px;
+	text-align: center;
+	-moz-border-radius-topright: 8px;
+	-moz-border-radius-topleft: 8px;
+}
+.v-window-black .v-window-closebox {
+	top: 8px;
+}
+.v-window-black .v-window-footer {
+	background: transparent;
+}
+.v-window-black .v-window-resizebox {
+	background: transparent no-repeat;
+  background-image: url(common/img/black-vertical-sprites.png);
+  -background-image: url(common/img/black-vertical-sprites-ie6.png);
+  background-position: left -578px;
+	width: 14px;
+	height: 14px;
+}
+.v-ie6 .v-window-black .v-window-resizebox {
+  background-image: url(common/img/black-vertical-sprites.png);
+  -background-image: url(common/img/black-vertical-sprites-ie6.png);
+  background-position: left -592px;
+}
+.v-ie6 .v-window-black .v-window-contents {
+	background: transparent url(window/img/black/content-bg-ie6.png) repeat-x;
+}
+
+/* Must be last to make this image last in the sprites */
+.v-window-black .v-window-contents {
+	background: transparent repeat-x;
+  background-image: url(common/img/black-vertical-sprites.png);
+  -background-image: url(common/img/black-vertical-sprites-ie6.png);
+  background-position: left -606px;
+}
diff --git a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css
index d9233ebd11..06e1055053 100644
--- a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css
+++ b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css
@@ -82,6 +82,7 @@ input.v-textfield-prompt {
 	text-shadow: #000 0 0 1px;
 }
 .v-app .black .v-textfield-focus,
+.v-window-black .v-textfield-focus,
 .v-window .black .v-textfield-focus,
 .v-popupview-popup .black .v-textfield-focus {
 	border-color: #4e6a80;
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/content-bg-ie6.png b/WebContent/VAADIN/themes/reindeer/window/img/black/content-bg-ie6.png
new file mode 100644
index 0000000000..39e712127e
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/window/img/black/content-bg-ie6.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/content-bg.png b/WebContent/VAADIN/themes/reindeer/window/img/black/content-bg.png
new file mode 100644
index 0000000000..caaee49b32
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/window/img/black/content-bg.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/header-bg-ie6.png b/WebContent/VAADIN/themes/reindeer/window/img/black/header-bg-ie6.png
new file mode 100644
index 0000000000..c86b4b7bcd
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/window/img/black/header-bg-ie6.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/header-bg.png b/WebContent/VAADIN/themes/reindeer/window/img/black/header-bg.png
new file mode 100644
index 0000000000..a956a6b27d
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/window/img/black/header-bg.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/resize-ie6.png b/WebContent/VAADIN/themes/reindeer/window/img/black/resize-ie6.png
new file mode 100644
index 0000000000..ca9f912af5
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/window/img/black/resize-ie6.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/resize.png b/WebContent/VAADIN/themes/reindeer/window/img/black/resize.png
new file mode 100644
index 0000000000..91e0b742d9
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/window/img/black/resize.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/window.css b/WebContent/VAADIN/themes/reindeer/window/window.css
index baa0972a99..52aa9a7044 100644
--- a/WebContent/VAADIN/themes/reindeer/window/window.css
+++ b/WebContent/VAADIN/themes/reindeer/window/window.css
@@ -4,6 +4,13 @@
 .v-window-wrap {
 	border: 1px solid #808386;
 }
+/* IE6 needs border on the outer element */
+.v-ie6 .v-window {
+	border: 1px solid #808386;
+}
+.v-ie6 .v-window-wrap {
+	border: none;
+}
 .v-sa .v-window-wrap,
 .v-ff3 .v-window-wrap,
 .v-op .v-window-wrap {
@@ -36,8 +43,11 @@
 	background-repeat: repeat-x;
 	background-image: url(img/footer-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */
 }
-.v-ie6 .v-window-footer {
-	zoom: 1;
+.v-ie7 .v-window-footer {
+	height: 15px;
+}
+.v-ie7 .v-window-footer-noresize {
+	height: 0;
 }
 .v-window-closebox {
 	top: 12px;
@@ -58,4 +68,76 @@
 }
 .v-window-modalitycurtain {
 	background: #56595b;
+}
+
+
+
+
+
+/**
+ Black window -----------------------------
+**/
+
+.v-window-black .v-window-wrap {
+	border-color: #2e3030;
+	border-radius: 8px;
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	overflow: hidden;
+}
+.v-sa .v-window-black .v-window-wrap,
+.v-ff3 .v-window-black .v-window-wrap,
+.v-op .v-window-black .v-window-wrap {
+	border-color: rgba(0,0,0,.9);
+}
+.v-window-black .v-window-wrap2 {
+	background-color: #0b0e0f;
+	-moz-border-radius: 8px;
+}
+.v-sa .v-window-black .v-window-wrap2,
+.v-ff3 .v-window-black .v-window-wrap2,
+.v-op .v-window-black .v-window-wrap2 {
+	background-color: rgba(11,14,15,.9);
+}
+.v-window-black .v-window-outerheader {
+	height: auto;
+	padding: 0;
+	background: transparent;
+}
+.v-window-black .v-window-header {
+	height: auto;
+	padding: 7px 0 7px 0;
+	height: 15px;
+	font-size: 12px;
+	font-weight: normal;
+	color: #dddfe1;
+	background: transparent repeat-x;
+	background-image: url(img/black/header-bg.png); /** sprite-ref: black-verticals; sprite-alignment: repeat */
+	text-align: center;
+	-moz-border-radius-topright: 8px;
+	-moz-border-radius-topleft: 8px;
+}
+.v-window-black .v-window-closebox {
+	top: 8px;
+}
+.v-window-black .v-window-footer {
+	background: transparent;
+}
+.v-window-black .v-window-resizebox {
+	background: transparent no-repeat;
+	background-image: url(img/black/resize.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 4px */
+	width: 14px;
+	height: 14px;
+}
+.v-ie6 .v-window-black .v-window-resizebox {
+	background-image: url(img/black/resize-ie6.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 4px */
+}
+.v-ie6 .v-window-black .v-window-contents {
+	background: transparent url(img/black/content-bg-ie6.png) repeat-x;
+}
+
+/* Must be last to make this image last in the sprites */
+.v-window-black .v-window-contents {
+	background: transparent repeat-x;
+	background-image: url(img/black/content-bg.png); /** sprite-ref: black-verticals; sprite-alignment: repeat */
 }
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css
index 5d6f3dce9a..d694f6d1a1 100644
--- a/WebContent/VAADIN/themes/runo/styles.css
+++ b/WebContent/VAADIN/themes/runo/styles.css
@@ -1444,6 +1444,7 @@ div.v-window-header {
 }
 .v-window-footer {
 	overflow: hidden;
+	zoom: 1;
 }
 .v-window-resizebox {
 	display: inline; /* fix IE6 double float margin bug */
@@ -1454,6 +1455,19 @@ div.v-window-header {
 	background: #ddd;
 	overflow: hidden;
 }
+/* IE7 fails with the float:right */
+.v-ie7 .v-window-footer {
+	position: relative;
+	height: 10px;
+}
+.v-ie7 .v-window-resizebox {
+	position: absolute;
+	float: none;
+	right: 0;
+}
+.v-ie7 .v-window-footer-noresize {
+	height: 0;
+}
 .v-window-resizebox-disabled {
 	cursor: default;
 	display: none;
@@ -3114,12 +3128,15 @@ textarea.v-textarea-prompt {
 .v-window-footer {
 	height: 8px;
 	margin-left: 9px;
-	background: transparent url(window/img/bottom-right.png) no-repeat right top;  
+	background: transparent url(window/img/bottom-right.png) no-repeat right top;
+	overflow: visible;
 }
 .v-ie7 .v-window-footer {
 	position: relative;
+	overflow: visible;
 }
-.v-window-resizebox {
+.v-window-resizebox,
+.v-ie7 .v-window-resizebox {
 	position: absolute; /* Needed to position the element over ScrollPanel, which is relatively positioned */
 	right: 5px;
 	width: 10px;
diff --git a/WebContent/VAADIN/themes/runo/window/window.css b/WebContent/VAADIN/themes/runo/window/window.css
index 5cee309ae0..082a956ff2 100644
--- a/WebContent/VAADIN/themes/runo/window/window.css
+++ b/WebContent/VAADIN/themes/runo/window/window.css
@@ -32,12 +32,15 @@
 .v-window-footer {
 	height: 8px;
 	margin-left: 9px;
-	background: transparent url(img/bottom-right.png) no-repeat right top;  
+	background: transparent url(img/bottom-right.png) no-repeat right top;
+	overflow: visible;
 }
 .v-ie7 .v-window-footer {
 	position: relative;
+	overflow: visible;
 }
-.v-window-resizebox {
+.v-window-resizebox,
+.v-ie7 .v-window-resizebox {
 	position: absolute; /* Needed to position the element over ScrollPanel, which is relatively positioned */
 	right: 5px;
 	width: 10px;
diff --git a/WebContent/VAADIN/themes/sampler/sampler/styles.css b/WebContent/VAADIN/themes/sampler/sampler/styles.css
index 16df154554..b43781f22d 100644
--- a/WebContent/VAADIN/themes/sampler/sampler/styles.css
+++ b/WebContent/VAADIN/themes/sampler/sampler/styles.css
@@ -179,6 +179,9 @@
 	width: 1px;
 	background: #aeb0b5;
 }
+.v-app-SamplerApplication .v-splitpanel-hsplitter-main-split-locked {
+	width: 0px;
+}
 .v-app-SamplerApplication .v-splitpanel-hsplitter-main-split div {
 	width: 3px;
 	background: transparent;