From c08936ae430e1606011a3344e5dbfbcbd3c366a6 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Thu, 21 May 2009 13:39:13 +0000 Subject: [PATCH] minor fixes to reindeer theme. svn changeset:7936/svn branch:6.0 --- .../VAADIN/themes/reindeer/button/button.css | 64 +++++++++------ WebContent/VAADIN/themes/reindeer/styles.css | 79 +++++++++++++------ .../themes/reindeer/textfield/textfield.css | 15 ++++ 3 files changed, 106 insertions(+), 52 deletions(-) diff --git a/WebContent/VAADIN/themes/reindeer/button/button.css b/WebContent/VAADIN/themes/reindeer/button/button.css index 16cb529904..6dd0681ff9 100644 --- a/WebContent/VAADIN/themes/reindeer/button/button.css +++ b/WebContent/VAADIN/themes/reindeer/button/button.css @@ -145,32 +145,7 @@ div > .v-button .v-errorindicator, display: block; margin-left: 0; } -/* Link style buttons */ -.v-button.v-button-link, -.v-ie7 .v-button-link.v-pressed { - background: transparent; - height: auto; - padding: 0; - cursor: pointer; -} -.v-button.v-button-link .v-button-caption, -.v-ie7 .v-button-link.v-pressed .v-button-caption { - background: transparent; - height: auto; - padding: 0; - display: inline; - font-weight: normal; - color: #1b699f; - font-size: 12px; - text-shadow: none; -} -.v-button.v-button-link .v-icon + .v-button-caption { - margin: 0; - padding: 0; -} -.v-button-link:focus { - outline: 1px dotted #1b699f; -} + /** * Default action button style -------------------------- */ @@ -321,6 +296,43 @@ div > .v-button-small .v-button-caption, +/** + * Link style buttons ----------------------- + */ +div > .v-button.v-button-link, +div > .v-button.v-button-link:focus, +div > .v-button.v-button-link:active, +.v-ie7 .v-button-link, +.v-ie7 .v-button-link.v-pressed { + background: transparent; + height: auto; + padding: 0; + cursor: pointer; +} +div > .v-button.v-button-link .v-button-caption, +div > .v-button.v-button-link:focus .v-button-caption, +div > .v-button.v-button-link:active .v-button-caption, +.v-ie7 .v-button-link .v-button-caption, +.v-ie7 .v-button-link.v-pressed .v-button-caption { + background: transparent; + height: auto; + padding: 0; + display: inline; + font-weight: normal; + color: #1b699f; + font-size: 12px; + text-shadow: none; +} +.v-button.v-button-link .v-icon + .v-button-caption { + margin: 0; + padding: 0; +} +.v-button.v-button-link:focus { + outline: 1px dotted #1b699f; +} + + + /** * IE6 buttons -------------------------- */ diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css index 5980634744..238037e9cd 100644 --- a/WebContent/VAADIN/themes/reindeer/styles.css +++ b/WebContent/VAADIN/themes/reindeer/styles.css @@ -1782,32 +1782,7 @@ div > .v-button .v-errorindicator, display: block; margin-left: 0; } -/* Link style buttons */ -.v-button.v-button-link, -.v-ie7 .v-button-link.v-pressed { - background: transparent; - height: auto; - padding: 0; - cursor: pointer; -} -.v-button.v-button-link .v-button-caption, -.v-ie7 .v-button-link.v-pressed .v-button-caption { - background: transparent; - height: auto; - padding: 0; - display: inline; - font-weight: normal; - color: #1b699f; - font-size: 12px; - text-shadow: none; -} -.v-button.v-button-link .v-icon + .v-button-caption { - margin: 0; - padding: 0; -} -.v-button-link:focus { - outline: 1px dotted #1b699f; -} + /** * Default action button style -------------------------- */ @@ -2018,6 +1993,43 @@ div > .v-button-small .v-button-caption, +/** + * Link style buttons ----------------------- + */ +div > .v-button.v-button-link, +div > .v-button.v-button-link:focus, +div > .v-button.v-button-link:active, +.v-ie7 .v-button-link, +.v-ie7 .v-button-link.v-pressed { + background: transparent; + height: auto; + padding: 0; + cursor: pointer; +} +div > .v-button.v-button-link .v-button-caption, +div > .v-button.v-button-link:focus .v-button-caption, +div > .v-button.v-button-link:active .v-button-caption, +.v-ie7 .v-button-link .v-button-caption, +.v-ie7 .v-button-link.v-pressed .v-button-caption { + background: transparent; + height: auto; + padding: 0; + display: inline; + font-weight: normal; + color: #1b699f; + font-size: 12px; + text-shadow: none; +} +.v-button.v-button-link .v-icon + .v-button-caption { + margin: 0; + padding: 0; +} +.v-button.v-button-link:focus { + outline: 1px dotted #1b699f; +} + + + /** * IE6 buttons -------------------------- */ @@ -3351,6 +3363,21 @@ input.v-textfield-prompt { -o-border-image: url(textfield/img/bg-border-image-black-focus.png) 0 3 0 3 stretch stretch; } +/* Readonly */ +input.v-textfield-readonly, +.v-sa input.v-textfield-readonly, +.v-ff35 input.v-textfield-readonly, +.black input.v-textfield-readonly, +.v-sa .black input.v-textfield-readonly, +.v-ff35 .black input.v-textfield-readonly { + border: none; + background: transparent; + -webkit-border-image: none; + -moz-border-image: none; + -o-border-image: none; + border-width: 0; +} + /* ./WebContent/VAADIN/themes/reindeer/tree/tree.css */ .v-tree-node { background: transparent url(tree/img/arrows.png) no-repeat 6px -10px; diff --git a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css index e4a0425e87..624c7a4dcc 100644 --- a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css +++ b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css @@ -100,4 +100,19 @@ input.v-textfield-prompt { -webkit-border-image: url(img/bg-border-image-black-focus.png) 0 3 0 3 stretch stretch; -moz-border-image: url(img/bg-border-image-black-focus.png) 0 3 0 3 stretch stretch; -o-border-image: url(img/bg-border-image-black-focus.png) 0 3 0 3 stretch stretch; +} + +/* Readonly */ +input.v-textfield-readonly, +.v-sa input.v-textfield-readonly, +.v-ff35 input.v-textfield-readonly, +.black input.v-textfield-readonly, +.v-sa .black input.v-textfield-readonly, +.v-ff35 .black input.v-textfield-readonly { + border: none; + background: transparent; + -webkit-border-image: none; + -moz-border-image: none; + -o-border-image: none; + border-width: 0; } \ No newline at end of file -- 2.39.5