"poro" theme updates:

* tree styles done
* required some modifications to textfield styles as well (because of a new sprite after the textfield background image)
* one more fix to link style button (remove text shadow)

svn changeset:7773/svn branch:6.0

diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css
index 00ddc05edb7b7260d10e964f9076949b569026f3..039352b85992cdf96d1fa1d14c0cbd2d55fbf86d 100644 (file)
--- a/WebContent/VAADIN/themes/base/styles.css
+++ b/WebContent/VAADIN/themes/base/styles.css
@@ -1359,7 +1359,7 @@ textarea.v-textarea-prompt {
        background-position: -5px -10px;
 }
 div.v-tree-node-leaf {
-       background: none;
+       background: transparent;
 }
 .v-tree-node-caption {
        margin-left: 1em;

diff --git a/WebContent/VAADIN/themes/base/tree/tree.css b/WebContent/VAADIN/themes/base/tree/tree.css
index d8234047046dfff42208e92d2220f4e06a11e7a2..a8b9c4495f30b75cebcdb2ad9409098c31a234e0 100644 (file)
--- a/WebContent/VAADIN/themes/base/tree/tree.css
+++ b/WebContent/VAADIN/themes/base/tree/tree.css
@@ -8,7 +8,7 @@
        background-position: -5px -10px;
 }
 div.v-tree-node-leaf {
-       background: none;
+       background: transparent;
 }
 .v-tree-node-caption {
        margin-left: 1em;

diff --git a/WebContent/VAADIN/themes/default/styles.css b/WebContent/VAADIN/themes/default/styles.css
index 1942d1bcbd60fed9d5043cb7d51bfc19410da450..9a335e8af8d53aa331cb425bcbe94c2cffa6ac5e 100644 (file)
--- a/WebContent/VAADIN/themes/default/styles.css
+++ b/WebContent/VAADIN/themes/default/styles.css
@@ -1359,7 +1359,7 @@ textarea.v-textarea-prompt {
        background-position: -5px -10px;
 }
 div.v-tree-node-leaf {
-       background: none;
+       background: transparent;
 }
 .v-tree-node-caption {
        margin-left: 1em;

diff --git a/WebContent/VAADIN/themes/reindeer/button/button.css b/WebContent/VAADIN/themes/reindeer/button/button.css
index 5a72133ca44772c5f54b3dad41b8470a333527eb..4a9dd1883237d4a347481327bdaac5f1a7b8d8eb 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/button/button.css
+++ b/WebContent/VAADIN/themes/reindeer/button/button.css
@@ -134,6 +134,7 @@ div > .v-button .v-errorindicator,
        font-weight: normal;
        color: #1b699f;
        font-size: 12px;
+       text-shadow: none;
 }
 .v-button.v-button-link .v-icon + span {
        margin: 0;

diff --git a/WebContent/VAADIN/themes/reindeer/common/img/sel-bg.png b/WebContent/VAADIN/themes/reindeer/common/img/sel-bg.png
new file mode 100644 (file)
index 0000000..0367146
Binary files /dev/null and b/WebContent/VAADIN/themes/reindeer/common/img/sel-bg.png differ

diff --git a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png
index 21a2d1fe220aaf8b2bf6cc4f9b424090b9262496..c2544151b6e27ddc102e793edf0df155657d21cb 100644 (file)
Binary files a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png and b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png differ

diff --git a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites.png b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites.png
index ffcc31765981c9bcb0a4dd5184f800332636584e..f53c14ffc7bd12c9ef26d91035d255f159a9c023 100644 (file)
Binary files a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites.png and b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites.png differ

diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index 3b0c6f28e103da6f5d235d3d688eecb9992872bd..cb12e540cee85a668efce15870df8ba1cc7ce129 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/styles.css
+++ b/WebContent/VAADIN/themes/reindeer/styles.css
@@ -1359,7 +1359,7 @@ textarea.v-textarea-prompt {
        background-position: -5px -10px;
 }
 div.v-tree-node-leaf {
-       background: none;
+       background: transparent;
 }
 .v-tree-node-caption {
        margin-left: 1em;
@@ -1708,6 +1708,7 @@ div > .v-button .v-errorindicator,
        font-weight: normal;
        color: #1b699f;
        font-size: 12px;
+       text-shadow: none;
 }
 .v-button.v-button-link .v-icon + span {
        margin: 0;
@@ -2703,3 +2704,45 @@ input.v-textfield-prompt {
 .v-op input.v-textfield-small {
        height: 16px;
 }
+
+/* ./WebContent/VAADIN/themes/reindeer/tree/tree.css */
+.v-tree-node {
+       background: transparent url(tree/img/arrows.png) no-repeat 6px -12px;
+       line-height: 16px;
+}
+.v-ie6 .v-tree-node {
+       background-image: url(tree/img/arrows-ie6.png);
+       background-repeat: no-repeat;
+}
+.v-ie6 div.v-tree-node-leaf {
+       background: transparent;
+}
+.v-tree-node-expanded {
+       background-position: -7px 3px;
+}
+.v-tree-node-caption {
+       margin-left: 16px;
+}
+.v-tree-node span {
+       padding: 0 2px;
+}
+.v-tree-node-selected span {
+       background: #4d749f repeat-x;
+  background-image: url(common/img/vertical-sprites.png);
+  -background-image: url(common/img/vertical-sprites-ie6.png);
+  background-position: left -748px;
+       color: #fff;
+       padding: 0 2px;
+       -webkit-border-radius: 2px;
+       -moz-border-radius: 2px;
+       text-shadow: #2b425a 0 1px 0;
+}
+.v-tree-node-children {
+       padding-left: 16px;
+}
+/* IMPORTANT keep the offsetWidth (width + padding) of this element the same as the margin-left of v-tree-node-caption */
+.v-ie6 .v-tree-node-ie6compatnode {
+       width: 14px;
+       height: 10px;
+       padding: 1px;
+}

diff --git a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css
index a15cc368dac44551cbe530f8942e5b2f05ed6fa9..346fc726c842c0a14b509f8a24538c8df7e7056e 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css
+++ b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css
@@ -6,7 +6,7 @@
        border-bottom-color: #d2d3d4;
        background: #fff;
        background-repeat: repeat-x;
-       background-image: url(img/bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */
+       background-image: url(img/bg.png); /** sprite-ref: verticals; sprite-alignment: repeat; sprite-margin-bottom: 22px */
        -moz-border-radius: 3px;
 }
 /* Need more specific selector because of #2384 fixes in base/common/common.css */

diff --git a/WebContent/VAADIN/themes/reindeer/tree/img/arrows-ie6.png b/WebContent/VAADIN/themes/reindeer/tree/img/arrows-ie6.png
new file mode 100644 (file)
index 0000000..e016e31
Binary files /dev/null and b/WebContent/VAADIN/themes/reindeer/tree/img/arrows-ie6.png differ

diff --git a/WebContent/VAADIN/themes/reindeer/tree/img/arrows.png b/WebContent/VAADIN/themes/reindeer/tree/img/arrows.png
new file mode 100644 (file)
index 0000000..3f657e3
Binary files /dev/null and b/WebContent/VAADIN/themes/reindeer/tree/img/arrows.png differ

diff --git a/WebContent/VAADIN/themes/reindeer/tree/tree.css b/WebContent/VAADIN/themes/reindeer/tree/tree.css
new file mode 100644 (file)
index 0000000..624b03b
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/tree/tree.css
@@ -0,0 +1,38 @@
+.v-tree-node {
+       background: transparent url(img/arrows.png) no-repeat 6px -12px;
+       line-height: 16px;
+}
+.v-ie6 .v-tree-node {
+       background-image: url(img/arrows-ie6.png);
+       background-repeat: no-repeat;
+}
+.v-ie6 div.v-tree-node-leaf {
+       background: transparent;
+}
+.v-tree-node-expanded {
+       background-position: -7px 3px;
+}
+.v-tree-node-caption {
+       margin-left: 16px;
+}
+.v-tree-node span {
+       padding: 0 2px;
+}
+.v-tree-node-selected span {
+       background: #4d749f repeat-x;
+       background-image: url(../common/img/sel-bg.png); /* sprite-ref: verticals; sprite-alignment: repeat */
+       color: #fff;
+       padding: 0 2px;
+       -webkit-border-radius: 2px;
+       -moz-border-radius: 2px;
+       text-shadow: #2b425a 0 1px 0;
+}
+.v-tree-node-children {
+       padding-left: 16px;
+}
+/* IMPORTANT keep the offsetWidth (width + padding) of this element the same as the margin-left of v-tree-node-caption */
+.v-ie6 .v-tree-node-ie6compatnode {
+       width: 14px;
+       height: 10px;
+       padding: 1px;
+}
\ No newline at end of file