Tabsheet "framed" style added to Reindeer theme.

Minor fixes to combobox, textfield and panel.

svn changeset:8027/svn branch:6.0

10 files changed, 93 insertions, 1 deletions

diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-bg-sel.png b/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-bg-sel.png
new file mode 100644
index 0000000000..69cb79bb07
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-bg-sel.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-bg.png b/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-bg.png
new file mode 100644
index 0000000000..ba6ce2d1f6
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-bg.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-first-left-sel.png b/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-first-left-sel.png
new file mode 100644
index 0000000000..39e2eb907d
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-first-left-sel.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-first-left.png b/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-first-left.png
new file mode 100644
index 0000000000..5da4f354a7
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-first-left.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-left-sel.png b/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-left-sel.png
new file mode 100644
index 0000000000..36bda281a2
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-left-sel.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-left.png b/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-left.png
new file mode 100644
index 0000000000..8debec889c
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-left.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-right-sel.png b/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-right-sel.png
new file mode 100644
index 0000000000..8dd605495f
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-right-sel.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-right.png b/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-right.png
new file mode 100644
index 0000000000..f02e91260e
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-right.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-spacer-right.png b/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-spacer-right.png
new file mode 100644
index 0000000000..a4d36b63d6
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-spacer-right.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.css
index a42fc29ec2..dd18e3a445 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.css
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.css
@@ -91,7 +91,7 @@
 }
 .v-tabsheet-scrollerNext-disabled,
 .v-tabsheet-scrollerNext-disabled:active {
-	background-image: url(img/tab-next-disabled.png); /** sprite-ref: verticals */
+	background-image: url(img/tab-next-disabled.png); /** sprite-ref: verticals; sprite-margin-bottom: 1px */
 	opacity: 1;
 	filter: none;
 }
@@ -110,4 +110,96 @@
 }
 .black .v-tabsheet-tabitem-selected {
 	color: #c9ccce;
+}
+
+
+
+/* Framed style */
+.v-tabsheet-framed .v-tabsheet-tabitemcell,
+.v-tabsheet-framed .v-tabsheet-spacertd {
+	height: 32px;
+	padding: 0;
+}
+.v-tabsheet-framed .v-tabsheet-tabitemcell {
+	background: no-repeat;
+	background-image: url(img/framed/tab-left.png); /** sprite-ref: verticals */
+	padding: 0 0 0 3px;
+}
+.v-tabsheet-framed .v-tabsheet-tabitemcell-first {
+	padding-left: 10px;
+	background-image: url(img/framed/tab-first-left.png); /** sprite-ref: verticals */
+}
+.v-tabsheet-framed .v-tabsheet-tabitem,
+.v-tabsheet-framed .v-tabsheet-spacertd div {
+	border: none;
+	height: 32px;
+	background: transparent repeat-x;
+	background-image: url(img/framed/tab-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */
+	padding: 0;
+	color: #222;
+	text-shadow: #fff 0 1px 0;
+}
+.v-tabsheet-framed .v-tabsheet-tabitem .v-caption {
+	border: none;
+	height: 23px;
+	background: no-repeat right top;
+	background-image: url(img/framed/tab-right.png); /** sprite-ref: verticals; sprite-alignment: right */
+	padding: 9px 8px 0 6px;
+}
+.v-tabsheet-framed .v-tabsheet-tabitem .v-captiontext {
+	height: 16px;
+}
+.v-tabsheet-framed .v-tabsheet-tabitemcell-selected {
+	background-image: url(img/framed/tab-left-sel.png); /** sprite-ref: verticals */
+}
+.v-tabsheet-framed .v-tabsheet-tabitemcell-selected-first {
+	background-image: url(img/framed/tab-first-left-sel.png); /** sprite-ref: verticals */
+}
+.v-tabsheet-framed .v-tabsheet-tabitem-selected {
+	background-image: url(img/framed/tab-bg-sel.png); /** sprite-ref: verticals; sprite-alignment: repeat */
+	color: #232930;
+}
+.v-tabsheet-framed .v-tabsheet-tabitem-selected .v-caption {
+	background-image: url(img/framed/tab-right-sel.png); /** sprite-ref: verticals; sprite-alignment: right */
+}
+.v-tabsheet-framed .v-tabsheet-spacertd div {
+	margin-right: 4px;
+}
+.v-tabsheet-framed .v-tabsheet-spacertd {
+	background: transparent no-repeat right top;
+	background-image: url(img/framed/tab-spacer-right.png); /** sprite-ref: verticals; sprite-alignment: right */
+}
+.v-tabsheet-content-framed {
+	border: 1px solid #dcdcdc;
+	border-bottom: none;
+	border-top: none;
+}
+.v-tabsheet-content-framed .v-tabsheet-tabsheetpanel {
+	background: #fff;
+}
+.v-sa .v-tabsheet-content-framed,
+.v-ff3 .v-tabsheet-content-framed {
+	border-color: rgba(0,0,0,.1);
+}
+.v-tabsheet-deco-framed {
+	height: 1px;
+	border-top: 1px solid #bebebe;
+	background: #e2e2e2;
+	overflow: hidden;
+}
+.v-sa .v-tabsheet-deco-framed,
+.v-ff3 .v-tabsheet-deco-framed {
+	border-top-color: rgba(0,0,0,.1);
+	background: rgba(0,0,0,.08);
+}
+.v-tabsheet-framed .v-tabsheet-scroller {
+	height: 31px;
+	margin-top: -31px;
+	padding-right: 3px;
+	border-right: 1px solid #afafaf;
+	position: relative;
+	float: right;
+}
+.v-tabsheet-framed .v-tabsheet-scroller button {
+	margin-top: 7px;
 }
\ No newline at end of file