diff options
Diffstat (limited to 'WebContent')
17 files changed, 248 insertions, 146 deletions
diff --git a/WebContent/VAADIN/themes/base/progressindicator/progressindicator.css b/WebContent/VAADIN/themes/base/progressindicator/progressindicator.css index d50954e7e8..a9a90c4b06 100644 --- a/WebContent/VAADIN/themes/base/progressindicator/progressindicator.css +++ b/WebContent/VAADIN/themes/base/progressindicator/progressindicator.css @@ -4,15 +4,11 @@ } .v-progressindicator-wrapper { overflow: hidden; /* for IE6 */ - height: 9px; + height: 7px; border: 1px solid #ddd; } -.v-progressindicator-disabled { - height: 9px; - overflow: hidden; /* for IE6 */ -} .v-progressindicator-indicator { - height: 9px; + height: 7px; overflow: hidden; /* for IE6 */ background: #ddd; } diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css index db38809535..68131c744e 100644 --- a/WebContent/VAADIN/themes/base/styles.css +++ b/WebContent/VAADIN/themes/base/styles.css @@ -723,15 +723,11 @@ div.v-app-loading { } .v-progressindicator-wrapper { overflow: hidden; /* for IE6 */ - height: 9px; + height: 7px; border: 1px solid #ddd; } -.v-progressindicator-disabled { - height: 9px; - overflow: hidden; /* for IE6 */ -} .v-progressindicator-indicator { - height: 9px; + height: 7px; overflow: hidden; /* for IE6 */ background: #ddd; } @@ -1441,7 +1437,7 @@ div.v-tree-node-leaf { font-weight: bold; } /* A more specific selector to make sure padding isn't so easily overridden */ -div.v-window-header { +.div.v-window-header { white-space: nowrap; text-overflow: ellipsis; -ms-text-overflow: ellipsis; @@ -1466,27 +1462,19 @@ div.v-window-header { .v-window-footer { overflow: hidden; zoom: 1; + height: 10px; + position: relative; } .v-window-resizebox { - display: inline; /* fix IE6 double float margin bug */ - float: right; width: 10px; height: 10px; cursor: se-resize; background: #ddd; overflow: hidden; -} -/* IE7 fails with the float:right */ -.v-ie7 .v-window-footer { - position: relative; - height: 10px; -} -.v-ie7 .v-window-resizebox { position: absolute; - float: none; right: 0; } -.v-ie7 .v-window-footer-noresize { +.v-window div.v-window-footer-noresize { height: 0; } .v-window-resizebox-disabled { diff --git a/WebContent/VAADIN/themes/base/window/window.css b/WebContent/VAADIN/themes/base/window/window.css index 5920fe8e86..56adb899e4 100644 --- a/WebContent/VAADIN/themes/base/window/window.css +++ b/WebContent/VAADIN/themes/base/window/window.css @@ -10,7 +10,7 @@ font-weight: bold; } /* A more specific selector to make sure padding isn't so easily overridden */ -div.v-window-header { +.div.v-window-header { white-space: nowrap; text-overflow: ellipsis; -ms-text-overflow: ellipsis; @@ -35,27 +35,19 @@ div.v-window-header { .v-window-footer { overflow: hidden; zoom: 1; + height: 10px; + position: relative; } .v-window-resizebox { - display: inline; /* fix IE6 double float margin bug */ - float: right; width: 10px; height: 10px; cursor: se-resize; background: #ddd; overflow: hidden; -} -/* IE7 fails with the float:right */ -.v-ie7 .v-window-footer { - position: relative; - height: 10px; -} -.v-ie7 .v-window-resizebox { position: absolute; - float: none; right: 0; } -.v-ie7 .v-window-footer-noresize { +.v-window div.v-window-footer-noresize { height: 0; } .v-window-resizebox-disabled { diff --git a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png Binary files differindex 91939e15b0..7ca7fd82de 100644 --- a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png +++ b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png diff --git a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites.png b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites.png Binary files differindex a89ddfc132..d186dd369c 100644 --- a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites.png +++ b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites.png diff --git a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css index f2adde5a05..a2bf290326 100644 --- a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css +++ b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css @@ -45,6 +45,10 @@ span.v-datefield-calendarpanel-month { .v-ff2 .v-datefield-full { min-width: 254px; } +.v-datefield-popupcalendar, +.v-ff2 .v-datefield-popupcalendar { + min-width: 0; +} .v-datefield-year .v-datefield-calendarpanel { width: 100px; } diff --git a/WebContent/VAADIN/themes/reindeer/progressindicator/progressindicator.css b/WebContent/VAADIN/themes/reindeer/progressindicator/progressindicator.css index d5cae585b3..70a42e483e 100644 --- a/WebContent/VAADIN/themes/reindeer/progressindicator/progressindicator.css +++ b/WebContent/VAADIN/themes/reindeer/progressindicator/progressindicator.css @@ -1,12 +1,9 @@ -.v-progressindicator { - background: #dfe2e4 url(img/base.gif) repeat-x 0 1px; -} .v-progressindicator-wrapper { + background: #dfe2e4 url(img/base.gif) repeat-x; border: 1px solid #bfbfbf; } -.v-progressindicator-disabled { - background: #dfe2e4 url(img/disabled.gif); - border: 1px solid #bfbfbf; +.v-disabled .v-progressindicator-wrapper { + background-image: url(img/disabled.gif); } .v-progressindicator-indicator { background: #f7f9f9 url(img/progress.png); diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css index d97798338d..c4975e44e1 100644 --- a/WebContent/VAADIN/themes/reindeer/styles.css +++ b/WebContent/VAADIN/themes/reindeer/styles.css @@ -723,15 +723,11 @@ div.v-app-loading { } .v-progressindicator-wrapper { overflow: hidden; /* for IE6 */ - height: 9px; + height: 7px; border: 1px solid #ddd; } -.v-progressindicator-disabled { - height: 9px; - overflow: hidden; /* for IE6 */ -} .v-progressindicator-indicator { - height: 9px; + height: 7px; overflow: hidden; /* for IE6 */ background: #ddd; } @@ -1441,7 +1437,7 @@ div.v-tree-node-leaf { font-weight: bold; } /* A more specific selector to make sure padding isn't so easily overridden */ -div.v-window-header { +.div.v-window-header { white-space: nowrap; text-overflow: ellipsis; -ms-text-overflow: ellipsis; @@ -1466,27 +1462,19 @@ div.v-window-header { .v-window-footer { overflow: hidden; zoom: 1; + height: 10px; + position: relative; } .v-window-resizebox { - display: inline; /* fix IE6 double float margin bug */ - float: right; width: 10px; height: 10px; cursor: se-resize; background: #ddd; overflow: hidden; -} -/* IE7 fails with the float:right */ -.v-ie7 .v-window-footer { - position: relative; - height: 10px; -} -.v-ie7 .v-window-resizebox { position: absolute; - float: none; right: 0; } -.v-ie7 .v-window-footer-noresize { +.v-window div.v-window-footer-noresize { height: 0; } .v-window-resizebox-disabled { @@ -2341,6 +2329,10 @@ span.v-datefield-calendarpanel-month { .v-ff2 .v-datefield-full { min-width: 254px; } +.v-datefield-popupcalendar, +.v-ff2 .v-datefield-popupcalendar { + min-width: 0; +} .v-datefield-year .v-datefield-calendarpanel { width: 100px; } @@ -2898,15 +2890,12 @@ td.v-datefield-calendarpanel-nextyear { } /* ./WebContent/VAADIN/themes/reindeer/progressindicator/progressindicator.css */ -.v-progressindicator { - background: #dfe2e4 url(progressindicator/img/base.gif) repeat-x 0 1px; -} .v-progressindicator-wrapper { + background: #dfe2e4 url(progressindicator/img/base.gif) repeat-x; border: 1px solid #bfbfbf; } -.v-progressindicator-disabled { - background: #dfe2e4 url(progressindicator/img/disabled.gif); - border: 1px solid #bfbfbf; +.v-disabled .v-progressindicator-wrapper { + background-image: url(progressindicator/img/disabled.gif); } .v-progressindicator-indicator { background: #f7f9f9 url(progressindicator/img/progress.png); @@ -3858,21 +3847,31 @@ input.v-textfield-readonly, .v-window-wrap { border: 1px solid #808386; } -/* IE6 needs border on the outer element */ -.v-ie6 .v-window { - border: 1px solid #808386; -} -.v-ie6 .v-window-wrap { - border: none; -} .v-sa .v-window-wrap, .v-ff3 .v-window-wrap, .v-op .v-window-wrap { border-color: rgba(0,0,0,.2); } -.v-ff2 .v-window-wrap { +.v-ff2 .v-window-wrap, +.v-ie6 .v-window-wrap { border: none; } +.v-ff2 .v-window-outerheader, +.v-ie6 .v-window-outerheader { + border: 1px solid #808386; + border-bottom: none; +} +.v-ff2 .v-window-contents, +.v-ie6 .v-window-contents { + border: 1px solid #808386; + border-top: none; + border-bottom: none; +} +.v-ff2 .v-window-footer, +.v-ie6 .v-window-footer { + border: 1px solid #808386; + border-top: none; +} .v-window-outerheader { padding: 12px 32px 0 14px; height: 25px; @@ -3888,6 +3887,13 @@ input.v-textfield-readonly, color: #fff; text-shadow: #000 0 -1px 0; } +.v-window-error .v-window-header { + padding-left: 13px; + background: transparent url(common/icons/error.png) no-repeat 0 50%; +} +.v-ie6 .v-window-error .v-window-header { + background-image: url(common/icons/error-ie6.png); +} .v-window-resizebox { width: 15px; height: 15px; @@ -3902,13 +3908,8 @@ input.v-textfield-readonly, background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); background-position: left -1359px; -} -.v-ie7 .v-window-footer { height: 15px; } -.v-ie7 .v-window-footer-noresize { - height: 0; -} .v-window-closebox { top: 12px; right: 10px; @@ -3940,8 +3941,71 @@ input.v-textfield-readonly, + /** - Black window ----------------------------- + Light style window ----------------------------- +**/ + +.v-window-light .v-window-outerheader { + background: transparent; + padding: 15px 32px 0 18px; + height: 23px; +} +.v-window-light .v-window-header { + font-size: 16px; + color: #292e34; + text-shadow: none; +} +.v-window-light .v-window-resizebox { + width: 12px; + height: 12px; + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -1422px; +} +.v-window-light .v-window-footer { + background: transparent; + height: 12px; +} +.v-window-light .v-window-closebox { + right: 1px; + top: 17px; + width: 19px; + height: 15px; + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -1434px; +} +.v-window-light .v-window-closebox:hover { + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -1449px; +} +.v-window-light .v-window-closebox:active { + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -1464px; +} +.v-window-light .v-window-contents { + background: transparent; +} +/* This must be the last sprite added to the verticals-sprite image */ +.v-window-light .v-window-wrap2 { + background: #f7f7f8 repeat-x; + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -1479px; +} +.v-ie6 .v-window-light .v-window-wrap2 { + background-image: none; +} + + + + + +/** + Black style window ----------------------------- **/ .v-window-black .v-window-wrap { @@ -3959,6 +4023,7 @@ input.v-textfield-readonly, .v-window-black .v-window-wrap2 { background-color: #0b0e0f; -moz-border-radius: 8px; + -webkit-border-radius: 8px; } .v-sa .v-window-black .v-window-wrap2, .v-ff3 .v-window-black .v-window-wrap2, @@ -3967,16 +4032,8 @@ input.v-textfield-readonly, } .v-window-black .v-window-outerheader { height: auto; - padding: 0; - background: transparent; -} -.v-window-black .v-window-header { - height: auto; - padding: 7px 0 7px 0; + padding: 7px 14px; height: 15px; - font-size: 12px; - font-weight: normal; - color: #dddfe1; background: transparent repeat-x; background-image: url(common/img/black-vertical-sprites.png); -background-image: url(common/img/black-vertical-sprites-ie6.png); @@ -3984,12 +4041,23 @@ input.v-textfield-readonly, text-align: center; -moz-border-radius-topright: 8px; -moz-border-radius-topleft: 8px; + -webkit-border-top-right-radius: 8px; + -webkit-border-top-left-radius: 8px; + overflow: hidden; + border: none; +} +.v-window-black .v-window-header { + font-size: 12px; + font-weight: normal; + color: #dddfe1; } .v-window-black .v-window-closebox { top: 8px; } .v-window-black .v-window-footer { background: transparent; + border: none; + height: 14px; } .v-window-black .v-window-resizebox { background: transparent no-repeat; @@ -4007,9 +4075,9 @@ input.v-textfield-readonly, .v-ie6 .v-window-black .v-window-contents { background: transparent url(window/img/black/content-bg-ie6.png) repeat-x; } - /* Must be last to make this image last in the sprites */ .v-window-black .v-window-contents { + border: none; background: transparent repeat-x; background-image: url(common/img/black-vertical-sprites.png); -background-image: url(common/img/black-vertical-sprites-ie6.png); diff --git a/WebContent/VAADIN/themes/reindeer/window/img/close-light-hover.png b/WebContent/VAADIN/themes/reindeer/window/img/close-light-hover.png Binary files differnew file mode 100644 index 0000000000..17ac9b8457 --- /dev/null +++ b/WebContent/VAADIN/themes/reindeer/window/img/close-light-hover.png diff --git a/WebContent/VAADIN/themes/reindeer/window/img/close-light-pressed.png b/WebContent/VAADIN/themes/reindeer/window/img/close-light-pressed.png Binary files differnew file mode 100644 index 0000000000..2c84b5bcfb --- /dev/null +++ b/WebContent/VAADIN/themes/reindeer/window/img/close-light-pressed.png diff --git a/WebContent/VAADIN/themes/reindeer/window/img/close-light.png b/WebContent/VAADIN/themes/reindeer/window/img/close-light.png Binary files differnew file mode 100644 index 0000000000..4bbc89cee9 --- /dev/null +++ b/WebContent/VAADIN/themes/reindeer/window/img/close-light.png diff --git a/WebContent/VAADIN/themes/reindeer/window/img/content-bg-light.png b/WebContent/VAADIN/themes/reindeer/window/img/content-bg-light.png Binary files differnew file mode 100644 index 0000000000..b38c902d83 --- /dev/null +++ b/WebContent/VAADIN/themes/reindeer/window/img/content-bg-light.png diff --git a/WebContent/VAADIN/themes/reindeer/window/img/resize-light.png b/WebContent/VAADIN/themes/reindeer/window/img/resize-light.png Binary files differnew file mode 100644 index 0000000000..0c0c9123b9 --- /dev/null +++ b/WebContent/VAADIN/themes/reindeer/window/img/resize-light.png diff --git a/WebContent/VAADIN/themes/reindeer/window/window.css b/WebContent/VAADIN/themes/reindeer/window/window.css index 52aa9a7044..c4ec238e9d 100644 --- a/WebContent/VAADIN/themes/reindeer/window/window.css +++ b/WebContent/VAADIN/themes/reindeer/window/window.css @@ -4,21 +4,31 @@ .v-window-wrap { border: 1px solid #808386; } -/* IE6 needs border on the outer element */ -.v-ie6 .v-window { - border: 1px solid #808386; -} -.v-ie6 .v-window-wrap { - border: none; -} .v-sa .v-window-wrap, .v-ff3 .v-window-wrap, .v-op .v-window-wrap { border-color: rgba(0,0,0,.2); } -.v-ff2 .v-window-wrap { +.v-ff2 .v-window-wrap, +.v-ie6 .v-window-wrap { border: none; } +.v-ff2 .v-window-outerheader, +.v-ie6 .v-window-outerheader { + border: 1px solid #808386; + border-bottom: none; +} +.v-ff2 .v-window-contents, +.v-ie6 .v-window-contents { + border: 1px solid #808386; + border-top: none; + border-bottom: none; +} +.v-ff2 .v-window-footer, +.v-ie6 .v-window-footer { + border: 1px solid #808386; + border-top: none; +} .v-window-outerheader { padding: 12px 32px 0 14px; height: 25px; @@ -32,6 +42,13 @@ color: #fff; text-shadow: #000 0 -1px 0; } +.v-window-error .v-window-header { + padding-left: 13px; + background: transparent url(../common/icons/error.png) no-repeat 0 50%; +} +.v-ie6 .v-window-error .v-window-header { + background-image: url(../common/icons/error-ie6.png); +} .v-window-resizebox { width: 15px; height: 15px; @@ -42,13 +59,8 @@ .v-window-footer { background-repeat: repeat-x; background-image: url(img/footer-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ -} -.v-ie7 .v-window-footer { height: 15px; } -.v-ie7 .v-window-footer-noresize { - height: 0; -} .v-window-closebox { top: 12px; right: 10px; @@ -74,8 +86,61 @@ + +/** + Light style window ----------------------------- +**/ + +.v-window-light .v-window-outerheader { + background: transparent; + padding: 15px 32px 0 18px; + height: 23px; +} +.v-window-light .v-window-header { + font-size: 16px; + color: #292e34; + text-shadow: none; +} +.v-window-light .v-window-resizebox { + width: 12px; + height: 12px; + background-image: url(img/resize-light.png); /** sprite-ref: verticals */ +} +.v-window-light .v-window-footer { + background: transparent; + height: 12px; +} +.v-window-light .v-window-closebox { + right: 1px; + top: 17px; + width: 19px; + height: 15px; + background-image: url(img/close-light.png); /** sprite-ref: verticals */ +} +.v-window-light .v-window-closebox:hover { + background-image: url(img/close-light-hover.png); /** sprite-ref: verticals */ +} +.v-window-light .v-window-closebox:active { + background-image: url(img/close-light-pressed.png); /** sprite-ref: verticals */ +} +.v-window-light .v-window-contents { + background: transparent; +} +/* This must be the last sprite added to the verticals-sprite image */ +.v-window-light .v-window-wrap2 { + background: #f7f7f8 repeat-x; + background-image: url(img/content-bg-light.png); /** sprite-ref: verticals; sprite-alignment: repeat */ +} +.v-ie6 .v-window-light .v-window-wrap2 { + background-image: none; +} + + + + + /** - Black window ----------------------------- + Black style window ----------------------------- **/ .v-window-black .v-window-wrap { @@ -93,6 +158,7 @@ .v-window-black .v-window-wrap2 { background-color: #0b0e0f; -moz-border-radius: 8px; + -webkit-border-radius: 8px; } .v-sa .v-window-black .v-window-wrap2, .v-ff3 .v-window-black .v-window-wrap2, @@ -101,27 +167,30 @@ } .v-window-black .v-window-outerheader { height: auto; - padding: 0; - background: transparent; -} -.v-window-black .v-window-header { - height: auto; - padding: 7px 0 7px 0; + padding: 7px 14px; height: 15px; - font-size: 12px; - font-weight: normal; - color: #dddfe1; background: transparent repeat-x; background-image: url(img/black/header-bg.png); /** sprite-ref: black-verticals; sprite-alignment: repeat */ text-align: center; -moz-border-radius-topright: 8px; -moz-border-radius-topleft: 8px; + -webkit-border-top-right-radius: 8px; + -webkit-border-top-left-radius: 8px; + overflow: hidden; + border: none; +} +.v-window-black .v-window-header { + font-size: 12px; + font-weight: normal; + color: #dddfe1; } .v-window-black .v-window-closebox { top: 8px; } .v-window-black .v-window-footer { background: transparent; + border: none; + height: 14px; } .v-window-black .v-window-resizebox { background: transparent no-repeat; @@ -135,9 +204,9 @@ .v-ie6 .v-window-black .v-window-contents { background: transparent url(img/black/content-bg-ie6.png) repeat-x; } - /* Must be last to make this image last in the sprites */ .v-window-black .v-window-contents { + border: none; background: transparent repeat-x; background-image: url(img/black/content-bg.png); /** sprite-ref: black-verticals; sprite-alignment: repeat */ }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/runo/progressindicator/progressindicator.css b/WebContent/VAADIN/themes/runo/progressindicator/progressindicator.css index a9c20090d6..d8c110471a 100644 --- a/WebContent/VAADIN/themes/runo/progressindicator/progressindicator.css +++ b/WebContent/VAADIN/themes/runo/progressindicator/progressindicator.css @@ -1,12 +1,12 @@ -.v-progressindicator { - background: #dfe2e4 url(img/base.gif) repeat-x 0 1px; -} .v-progressindicator-wrapper { + background: #dfe2e4 url(img/base.gif) repeat-x; border: 1px solid #b6bbbc; } -.v-progressindicator-disabled { - background: #dfe2e4 url(img/disabled.gif); - border: 1px solid #b6bbbc; +.v-disabled .v-progressindicator-wrapper { + background-image: url(img/disabled.gif); +} +.v-progressindicator-indicator { + background: #f7f9f9 url(img/progress.png); } .v-progressindicator-indicator { background: #f7f9f9 url(img/progress.png); diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css index 0bac84efe8..275cb5487d 100644 --- a/WebContent/VAADIN/themes/runo/styles.css +++ b/WebContent/VAADIN/themes/runo/styles.css @@ -723,15 +723,11 @@ div.v-app-loading { } .v-progressindicator-wrapper { overflow: hidden; /* for IE6 */ - height: 9px; + height: 7px; border: 1px solid #ddd; } -.v-progressindicator-disabled { - height: 9px; - overflow: hidden; /* for IE6 */ -} .v-progressindicator-indicator { - height: 9px; + height: 7px; overflow: hidden; /* for IE6 */ background: #ddd; } @@ -1441,7 +1437,7 @@ div.v-tree-node-leaf { font-weight: bold; } /* A more specific selector to make sure padding isn't so easily overridden */ -div.v-window-header { +.div.v-window-header { white-space: nowrap; text-overflow: ellipsis; -ms-text-overflow: ellipsis; @@ -1466,27 +1462,19 @@ div.v-window-header { .v-window-footer { overflow: hidden; zoom: 1; + height: 10px; + position: relative; } .v-window-resizebox { - display: inline; /* fix IE6 double float margin bug */ - float: right; width: 10px; height: 10px; cursor: se-resize; background: #ddd; overflow: hidden; -} -/* IE7 fails with the float:right */ -.v-ie7 .v-window-footer { - position: relative; - height: 10px; -} -.v-ie7 .v-window-resizebox { position: absolute; - float: none; right: 0; } -.v-ie7 .v-window-footer-noresize { +.v-window div.v-window-footer-noresize { height: 0; } .v-window-resizebox-disabled { @@ -2224,15 +2212,15 @@ div.v-window-header { } /* ./WebContent/VAADIN/themes/runo/progressindicator/progressindicator.css */ -.v-progressindicator { - background: #dfe2e4 url(progressindicator/img/base.gif) repeat-x 0 1px; -} .v-progressindicator-wrapper { + background: #dfe2e4 url(progressindicator/img/base.gif) repeat-x; border: 1px solid #b6bbbc; } -.v-progressindicator-disabled { - background: #dfe2e4 url(progressindicator/img/disabled.gif); - border: 1px solid #b6bbbc; +.v-disabled .v-progressindicator-wrapper { + background-image: url(progressindicator/img/disabled.gif); +} +.v-progressindicator-indicator { + background: #f7f9f9 url(progressindicator/img/progress.png); } .v-progressindicator-indicator { background: #f7f9f9 url(progressindicator/img/progress.png); @@ -3126,7 +3114,7 @@ textarea.v-textarea-prompt { border-top: none; border-bottom: none; } -.v-window-footer { +.v-window div.v-window-footer { height: 8px; margin-left: 9px; background: transparent url(window/img/bottom-right.png) no-repeat right top; diff --git a/WebContent/VAADIN/themes/runo/window/window.css b/WebContent/VAADIN/themes/runo/window/window.css index 082a956ff2..2165931d9c 100644 --- a/WebContent/VAADIN/themes/runo/window/window.css +++ b/WebContent/VAADIN/themes/runo/window/window.css @@ -29,7 +29,7 @@ border-top: none; border-bottom: none; } -.v-window-footer { +.v-window div.v-window-footer { height: 8px; margin-left: 9px; background: transparent url(img/bottom-right.png) no-repeat right top; |
