Loads of small fixes to Base and Reindeer themes: contains bugfixes for issues found during developing the new Reindeer theme demo, plus a couple of new styles for Reindeer.

svn changeset:12389/svn branch:6.3

7 files changed, 126 insertions, 78 deletions

diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-borderless-style.css b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-borderless-style.css
new file mode 100644
index 0000000000..e9325404da
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-borderless-style.css
@@ -0,0 +1,20 @@
+.v-tabsheet-borderless .v-tabsheet-tabitemcell-first {
+	padding-left: 7px;
+	background: url(img/framed/tab-first-left.png) no-repeat -3px 0;
+}
+.v-tabsheet-borderless .v-tabsheet-tabitemcell-selected-first {
+	background: url(img/framed/tab-first-left-sel.png) no-repeat -3px 0;
+}
+.v-tabsheet-borderless .v-tabsheet-spacertd div {
+	margin-right: 0;
+}
+.v-tabsheet-borderless .v-tabsheet-spacertd {
+	background: transparent;
+}
+.v-tabsheet-borderless .v-tabsheet-content {
+	border: none;
+}
+.v-tabsheet-borderless .v-tabsheet-deco {
+	height: 0;
+	border-top: none;
+}
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-hover-closable-style.css b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-hover-closable-style.css
new file mode 100644
index 0000000000..40b75c59b3
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-hover-closable-style.css
@@ -0,0 +1,6 @@
+.v-tabsheet-tabs-hover-closable .v-tabsheet-caption-close {
+	visibility: hidden;
+}
+.v-tabsheet-tabs-hover-closable .v-tabsheet-tabitem:hover .v-tabsheet-caption-close {
+	visibility: visible;
+}
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.css b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.css
index d80f292055..42c23b40bb 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.css
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.css
@@ -1,18 +1,39 @@
 /**
  * Tabsheet "minimal" style --------------
  */
-.v-tabsheet-minimal .v-tabsheet-spacertd div {
+
+/* Minimal tabsheet on blue background */
+.blue .v-tabsheet-tabs-minimal .v-tabsheet-spacertd div,
+.blue .v-tabsheet-tabs-minimal .v-tabsheet-tabitem,
+.blue .v-tabsheet-tabs-minimal .v-tabsheet-tabitem-selected  {
+	border-color: #7c8a91;
+}
+.blue .v-tabsheet-tabs-minimal .v-tabsheet-caption-close {
+	color: #7c8a91;
+}
+.blue .v-tabsheet-tabs-minimal .v-tabsheet-caption-close:hover {
+	color: #BCD3DE;
+	background: #778d98;
+}
+.blue .v-tabsheet-tabs-minimal .v-tabsheet-caption-close:active {
+	background: #4f6874;
+}
+
+/* Default & white styles */
+.v-tabsheet-tabs-minimal .v-tabsheet-spacertd div,
+.white .v-tabsheet-tabs-minimal .v-tabsheet-spacertd div {
 	border-bottom: 1px solid #bfbfbf;
 	height: auto;
 	background: transparent;
 }
-.v-tabsheet-minimal .v-tabsheet-tabitemcell,
-.v-tabsheet-minimal .v-tabsheet-spacertd {
+.v-tabsheet-tabs-minimal .v-tabsheet-tabitemcell,
+.v-tabsheet-tabs-minimal .v-tabsheet-spacertd {
 	height: auto;
 	background: transparent;
 	padding-left: 0;
 }
-.v-tabsheet-minimal .v-tabsheet-tabitem {
+.v-tabsheet-tabs-minimal .v-tabsheet-tabitem,
+.white .v-tabsheet-tabs-minimal .v-tabsheet-tabitem {
 	border: none;
 	border-bottom: 1px solid #bfbfbf;
 	color: #4d748f;
@@ -21,26 +42,27 @@
 	background: transparent;
 	text-shadow: none;
 }
-.v-tabsheet-minimal .v-tabsheet-tabitem .v-caption {
+.v-tabsheet-tabs-minimal .v-tabsheet-tabitem .v-caption {
 	padding: 5px 16px;
 	height: auto;
 	background: transparent;
 }
-.v-tabsheet-minimal .v-tabsheet-tabitemcell-selected {
+.v-tabsheet-tabs-minimal .v-tabsheet-tabitemcell-selected {
 	background: transparent;
 }
-.v-tabsheet-minimal .v-tabsheet-tabitem-selected {
+.v-tabsheet-tabs-minimal .v-tabsheet-tabitem-selected,
+.white .v-tabsheet-tabs-minimal .v-tabsheet-tabitem-selected {
 	background: transparent;
 	border: 1px solid #bfbfbf;
 	border-bottom: none;
 	color: #222;
 }
-.v-tabsheet-minimal .v-tabsheet-tabitem-selected .v-caption {
+.v-tabsheet-tabs-minimal .v-tabsheet-tabitem-selected .v-caption {
 	background: transparent;
 	padding: 4px 15px 6px 15px;
 }
-.v-tabsheet-minimal .v-tabsheet-tabitem .v-caption-closable,
-.v-tabsheet-minimal .v-tabsheet-tabitem-selected .v-caption-closable {
+.v-tabsheet-tabs-minimal .v-tabsheet-tabitem .v-caption-closable,
+.v-tabsheet-tabs-minimal .v-tabsheet-tabitem-selected .v-caption-closable {
 	padding-right: 6px;
 }
 .v-tabsheet-content-minimal {
@@ -53,69 +75,56 @@
 	height: 0;
 	border: none;
 }
-.v-tabsheet-minimal .v-tabsheet-scroller {
+.v-tabsheet-tabcontainer-minimal .v-tabsheet-scroller {
 	margin-top: -20px;
 	height: 17px;
 	padding: 0;
 	border: none;
 	background: transparent;
 }
-.v-tabsheet-minimal .v-tabsheet-scroller button {
+.v-tabsheet-tabcontainer-minimal .v-tabsheet-scroller button {
 	margin-top: 0;
 }
-.v-tabsheet-minimal .v-tabsheet-caption-close,
-.v-tabsheet-minimal .v-tabsheet-caption-close:hover,
-.v-tabsheet-minimal .v-tabsheet-caption-close:active {
+.v-tabsheet-tabs-minimal .v-tabsheet-caption-close,
+.v-tabsheet-tabs-minimal .v-tabsheet-caption-close:hover,
+.v-tabsheet-tabs-minimal .v-tabsheet-caption-close:active {
 	text-indent: 0;
 	background: transparent;
 	margin-left: 3px;
 	margin-right: -3px;
 	padding: 0;
 	color: #999;
-	width: 15px;
-	height: 15px;
+	width: 14px;
+	height: 14px;
 	line-height: 14px;
 	-webkit-border-radius: 7px;
 	-moz-border-radius: 7px;
 }
-.v-tabsheet-minimal .v-tabsheet-caption-close {
+.v-tabsheet-tabs-minimal .v-tabsheet-caption-close {
 	margin-top: 1px;
 }
-.v-ff .v-tabsheet-minimal .v-tabsheet-caption-close,
-.v-ie7 .v-tabsheet-minimal .v-tabsheet-caption-close {
+.v-ff .v-tabsheet-tabs-minimal .v-tabsheet-caption-close,
+.v-ie7 .v-tabsheet-tabs-minimal .v-tabsheet-caption-close {
 	margin-top: -15px;
 }
-.v-tabsheet-minimal .v-tabsheet-caption-close:hover {
+.v-tabsheet-tabs-minimal .v-tabsheet-caption-close:hover,
+.white .v-tabsheet-tabs-minimal .v-tabsheet-caption-close:hover {
 	color: #fff;
 	background: #aaa;
 }
-.v-tabsheet-minimal .v-tabsheet-caption-close:active {
+.v-tabsheet-tabs-minimal .v-tabsheet-caption-close:active,
+.white .v-tabsheet-tabs-minimal .v-tabsheet-caption-close:active {
 	background: #777;
 }
-/* Minimal tabsheet on blue background */
-.blue .v-tabsheet-minimal .v-tabsheet-spacertd div,
-.blue .v-tabsheet-minimal .v-tabsheet-tabitem,
-.blue .v-tabsheet-minimal .v-tabsheet-tabitem-selected  {
-	border-color: #7c8a91;
-}
-.blue .v-tabsheet-minimal .v-tabsheet-caption-close {
-	color: #7c8a91;
-}
-.blue .v-tabsheet-minimal .v-tabsheet-caption-close:hover {
-	color: #BCD3DE;
-	background: #778d98;
-}
-.blue .v-tabsheet-minimal .v-tabsheet-caption-close:active {
-	background: #4f6874;
-}
+
 /* Minimal tabsheet on black background */
-.black .v-tabsheet-minimal .v-tabsheet-spacertd div,
-.black .v-tabsheet-minimal .v-tabsheet-tabitem,
-.black .v-tabsheet-minimal .v-tabsheet-tabitem-selected  {
+.black .v-tabsheet-tabs-minimal .v-tabsheet-spacertd div,
+.black .v-tabsheet-tabs-minimal .v-tabsheet-tabitem,
+.black .v-tabsheet-tabs-minimal .v-tabsheet-tabitem-selected  {
 	border-color: #3e4044;
 	color: #6a7f89;
 }
-.black .v-tabsheet-minimal .v-tabsheet-tabitem-selected {
+.black .v-tabsheet-tabs-minimal .v-tabsheet-tabitem-selected {
 	color: #c9ccce;
 }
 .black .v-tabsheet-content-minimal,
@@ -123,13 +132,13 @@
 	color: #c9ccce;
 	text-shadow: #000 0 0 1px;
 }
-.black .v-tabsheet-minimal .v-tabsheet-caption-close {
+.black .v-tabsheet-tabs-minimal .v-tabsheet-caption-close {
 	color: #72787c;
 }
-.black .v-tabsheet-minimal .v-tabsheet-caption-close:hover {
+.black .v-tabsheet-tabs-minimal .v-tabsheet-caption-close:hover {
 	color: #1d2021;
 	background: #4d5154;
 }
-.black .v-tabsheet-minimal .v-tabsheet-caption-close:active {
+.black .v-tabsheet-tabs-minimal .v-tabsheet-caption-close:active {
 	background: #626669;
 }
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.css b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.css
index 83f5ce9a0d..3c48577d41 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.css
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.css
@@ -49,6 +49,8 @@
 	cursor: default;
 	text-indent: -999px;
 	overflow: hidden;
+	font-size: 14px;
+	font-weight: normal;
 }
 .v-ff .v-tabsheet-caption-close,
 .v-ie7 .v-tabsheet-caption-close {
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-selected-closable-style.css b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-selected-closable-style.css
new file mode 100644
index 0000000000..e4b8e0cd5f
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-selected-closable-style.css
@@ -0,0 +1,8 @@
+.v-tabsheet-tabs-selected-closable .v-tabsheet-tabitem .v-tabsheet-caption-close,
+.v-tabsheet-tabs-selected-closable .v-tabsheet-tabitem:hover .v-tabsheet-caption-close {
+	visibility: hidden;
+}
+.v-tabsheet-tabs-selected-closable .v-tabsheet-tabitem-selected .v-tabsheet-caption-close,
+.v-tabsheet-tabs-selected-closable .v-tabsheet-tabitem-selected:hover .v-tabsheet-caption-close {
+	visibility: visible;
+}
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-bar-style.css b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.css
index ec985ad993..d2b6b616f0 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-bar-style.css
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.css
@@ -1,98 +1,98 @@
 /**
  * Tabsheet bar style ---------------
  */
-.v-tabsheet-bar .v-tabsheet-tabitemcell,
-.v-tabsheet-bar .v-tabsheet-spacertd {
+.v-tabsheet-tabs-bar .v-tabsheet-tabitemcell,
+.v-tabsheet-tabs-bar .v-tabsheet-spacertd {
 	height: 20px;
 }
-.v-tabsheet-bar .v-tabsheet-spacertd {
+.v-tabsheet-tabs-bar .v-tabsheet-spacertd {
 	background: transparent;
 }
-.v-tabsheet-bar .v-tabsheet-tabitemcell {
+.v-tabsheet-tabs-bar .v-tabsheet-tabitemcell {
 	background-image: url(img/bar/tab-left.png); /** sprite-ref: verticals */
 }
-.v-tabsheet-bar .v-tabsheet-tabitemcell-first {
+.v-tabsheet-tabs-bar .v-tabsheet-tabitemcell-first {
 	padding-left: 6px;
 	background-image: url(img/bar/tab-first-left.png); /** sprite-ref: verticals */
 }
-.v-tabsheet-bar .v-tabsheet-tabitem,
-.v-tabsheet-bar .v-tabsheet-spacertd div {
+.v-tabsheet-tabs-bar .v-tabsheet-tabitem,
+.v-tabsheet-tabs-bar .v-tabsheet-spacertd div {
 	height: 20px;
 	background-image: url(img/bar/tab-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */
 	font-size: 11px;
 	margin: 0;
 }
-.v-tabsheet-bar .v-tabsheet-tabitem .v-caption {
+.v-tabsheet-tabs-bar .v-tabsheet-tabitem .v-caption {
 	height: 18px;
 	background-image: url(img/bar/tab-right.png); /** sprite-ref: verticals; sprite-alignment: right */
 	padding: 2px 12px 0 10px;
 }
-.v-tabsheet-bar .v-tabsheet-tabitem .v-caption-closable,
-.v-tabsheet-bar .v-tabsheet-tabitem-selected .v-caption-closable {
+.v-tabsheet-tabs-bar .v-tabsheet-tabitem .v-caption-closable,
+.v-tabsheet-tabs-bar .v-tabsheet-tabitem-selected .v-caption-closable {
 	padding-right: 8px;
 	padding-left: 14px;
 }
-.v-tabsheet-bar .v-tabsheet-caption-close,
-.v-tabsheet-bar .v-tabsheet-caption-close:hover,
-.v-tabsheet-bar .v-tabsheet-caption-close:active {
+.v-tabsheet-tabs-bar .v-tabsheet-caption-close,
+.v-tabsheet-tabs-bar .v-tabsheet-caption-close:hover,
+.v-tabsheet-tabs-bar .v-tabsheet-caption-close:active {
 	text-indent: 0;
 	background: transparent;
 	margin-left: 3px;
 	margin-right: -3px;
-	padding: 0;
+	padding: 1px 0 0 1px;
 	color: #3c3c3c;
-	width: 14px;
-	height: 14px;
+	width: 13px;
+	height: 13px;
 	line-height: 12px;
 	-webkit-border-radius: 7px;
 	-moz-border-radius: 7px;
 }
-.v-tabsheet-bar .v-tabsheet-caption-close {
-	margin-top: 0;
+.v-tabsheet-tabs-bar .v-tabsheet-caption-close {
+	margin-top: 1px;
 }
-.v-ff .v-tabsheet-bar .v-tabsheet-caption-close,
-.v-ie7 .v-tabsheet-bar .v-tabsheet-caption-close {
-	margin-top: -15px;
+.v-ff .v-tabsheet-tabs-bar .v-tabsheet-caption-close,
+.v-ie7 .v-tabsheet-tabs-bar .v-tabsheet-caption-close {
+	margin-top: -14px;
 }
-.v-tabsheet-bar .v-tabsheet-caption-close:hover {
+.v-tabsheet-tabs-bar .v-tabsheet-caption-close:hover {
 	background: #bfbfbf;
 	-webkit-box-shadow: 0 1px 0 #fff;
 }
-.v-tabsheet-bar .v-tabsheet-caption-close:active {
+.v-tabsheet-tabs-bar .v-tabsheet-caption-close:active {
 	background: #a9a9a9;
 }
-.v-tabsheet-bar .v-tabsheet-tabitem-selected .v-tabsheet-caption-close {
+.v-tabsheet-tabs-bar .v-tabsheet-tabitem-selected .v-tabsheet-caption-close {
 	color: #404142;
 }
-.v-tabsheet-bar .v-tabsheet-tabitem-selected .v-tabsheet-caption-close:hover {
+.v-tabsheet-tabs-bar .v-tabsheet-tabitem-selected .v-tabsheet-caption-close:hover {
 	background: #5e666e;
 	color: #fff;
 	text-shadow: 0 -1px 0 #222;
 }
-.v-tabsheet-bar .v-tabsheet-tabitem-selected .v-tabsheet-caption-close:active {
+.v-tabsheet-tabs-bar .v-tabsheet-tabitem-selected .v-tabsheet-caption-close:active {
 	background: #404142;
 }
 
-.v-tabsheet-bar .v-tabsheet-tabitemcell-selected {
+.v-tabsheet-tabs-bar .v-tabsheet-tabitemcell-selected {
 	background-image: url(img/bar/tab-left-sel.png); /** sprite-ref: verticals */
 }
-.v-tabsheet-bar .v-tabsheet-tabitemcell-selected-first {
+.v-tabsheet-tabs-bar .v-tabsheet-tabitemcell-selected-first {
 	background-image: url(img/bar/tab-first-left-sel.png); /** sprite-ref: verticals */
 }
-.v-tabsheet-bar .v-tabsheet-tabitem-selected {
+.v-tabsheet-tabs-bar .v-tabsheet-tabitem-selected {
 	background-image: url(img/bar/tab-bg-sel.png); /** sprite-ref: verticals; sprite-alignment: repeat */
 	color: #232930;
 }
-.v-tabsheet-bar .v-tabsheet-tabitem-selected .v-caption {
+.v-tabsheet-tabs-bar .v-tabsheet-tabitem-selected .v-caption {
 	background-image: url(img/bar/tab-right-sel.png); /** sprite-ref: verticals; sprite-alignment: right */
 }
-.v-tabsheet-bar .v-tabsheet-scroller {
+.v-tabsheet-tabcontainer-bar .v-tabsheet-scroller {
 	margin-top: -20px;
 	height: 19px;
 	border-right: none;
 	background-image: url(img/bar/tab-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */
 }
-.v-tabsheet-bar .v-tabsheet-scroller button {
+.v-tabsheet-tabcontainer-bar .v-tabsheet-scroller button {
 	margin-top: 1px;
 }
 .v-tabsheet-content-bar {
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.css
index fddef9a287..b636effb0f 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.css
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.css
@@ -1,5 +1,8 @@
 /* These styles get catenated together on build */
 @import "tabsheet-normal-style.css";
 @import "tabsheet-scroller.css";
+@import "tabsheet-borderless-style.css";
 @import "tabsheet-minimal-style.css";
-@import "tabsheet-bar-style.css";
\ No newline at end of file
+@import "tabsheet-small-style.css";
+@import "tabsheet-selected-closable-style.css";
+@import "tabsheet-hover-closable-style.css";
\ No newline at end of file