From: Jouni Koivuviita Date: Wed, 13 May 2009 08:21:22 +0000 (+0000) Subject: "poro" theme updates: X-Git-Tag: 6.7.0.beta1~2904 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7c51dc2724dbb8c4420042a2a460ced571adfded;p=vaadin-framework.git "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 00ddc05edb..039352b859 100644 --- 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 d823404704..a8b9c4495f 100644 --- 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 1942d1bcbd..9a335e8af8 100644 --- 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 5a72133ca4..4a9dd18832 100644 --- 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 index 0000000000..0367146d90 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 21a2d1fe22..c2544151b6 100644 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 ffcc317659..f53c14ffc7 100644 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 3b0c6f28e1..cb12e540ce 100644 --- 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 a15cc368da..346fc726c8 100644 --- 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 index 0000000000..e016e313a7 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 index 0000000000..3f657e34c9 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 index 0000000000..624b03be06 --- /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