From 719b0b133c2593d9f006d1f9646c563be035480d Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Wed, 27 May 2009 10:51:29 +0000 Subject: [PATCH] Small fixes to panel and tabsheet styles on blue background. Reverted one fix from combobox, now works better in IE also. Committed missing menubar image. svn changeset:8029/svn branch:6.0 --- .../VAADIN/themes/base/select/select.css | 2 +- WebContent/VAADIN/themes/base/styles.css | 2 +- .../common/img/vertical-sprites-ie6.png | Bin 6613 -> 6639 bytes .../reindeer/common/img/vertical-sprites.png | Bin 18218 -> 18322 bytes .../reindeer/menubar/img/menu-sel-bg.png | Bin 0 -> 211 bytes .../themes/reindeer/menubar/menubar.css | 3 + .../VAADIN/themes/reindeer/panel/panel.css | 9 + WebContent/VAADIN/themes/reindeer/styles.css | 163 ++++++++++-------- .../themes/reindeer/tabsheet/tabsheet.css | 9 + WebContent/VAADIN/themes/runo/styles.css | 2 +- 10 files changed, 117 insertions(+), 73 deletions(-) create mode 100644 WebContent/VAADIN/themes/reindeer/menubar/img/menu-sel-bg.png diff --git a/WebContent/VAADIN/themes/base/select/select.css b/WebContent/VAADIN/themes/base/select/select.css index 0c2b4716f0..9bfcfefd45 100644 --- a/WebContent/VAADIN/themes/base/select/select.css +++ b/WebContent/VAADIN/themes/base/select/select.css @@ -68,7 +68,7 @@ border: 1px solid #eee; } .v-filterselect-suggestmenu table { - border-spacing: 0; + border-collapse: collapse; border: none; } .v-filterselect-suggestmenu .gwt-MenuItem { diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css index 351f957a7d..bcfef2eaa5 100644 --- a/WebContent/VAADIN/themes/base/styles.css +++ b/WebContent/VAADIN/themes/base/styles.css @@ -825,7 +825,7 @@ div.v-progressindicator-indeterminate-disabled { border: 1px solid #eee; } .v-filterselect-suggestmenu table { - border-spacing: 0; + border-collapse: collapse; border: none; } .v-filterselect-suggestmenu .gwt-MenuItem { 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 cdd691e46e99b0f8e5cc9368196df3b5f11134d3..0cd0917f631c3ca145a5c1e12f0e1e09ffac4d17 100644 GIT binary patch delta 4679 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 JPDHLkV1kgc7KH!+ delta 4671 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 B^LhXP diff --git a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites.png b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites.png index 6913ed8070f7064c14dc49acc9a5eb27f0e02d25..c69166af1f347f61227d9d5d89bf882c2ff58e96 100644 GIT binary patch literal 18322 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 literal 18218 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 G5}E)iT}!F} literal 0 HcmV?d00001 diff --git a/WebContent/VAADIN/themes/reindeer/menubar/menubar.css b/WebContent/VAADIN/themes/reindeer/menubar/menubar.css index 492f853fef..a5090003cd 100644 --- a/WebContent/VAADIN/themes/reindeer/menubar/menubar.css +++ b/WebContent/VAADIN/themes/reindeer/menubar/menubar.css @@ -42,4 +42,7 @@ /* Submenu icon (remove after #2849 is fixed) */ .v-menubar-submenu .menuitem img[align="right"] { margin-right: -15px; +} +.v-ie .v-menubar-submenu .menuitem img[align="right"] { + margin-top: -14px; } \ No newline at end of file diff --git a/WebContent/VAADIN/themes/reindeer/panel/panel.css b/WebContent/VAADIN/themes/reindeer/panel/panel.css index df48181f4a..f60daf70e4 100644 --- a/WebContent/VAADIN/themes/reindeer/panel/panel.css +++ b/WebContent/VAADIN/themes/reindeer/panel/panel.css @@ -16,6 +16,11 @@ border: 1px solid #dcdcdc; border-bottom: none; border-top: none; + color: #222; + text-shadow: none; +} +.blue .v-panel-content { + border-color: #a8bcc5; } .v-sa .v-panel-content, .v-ff3 .v-panel-content { @@ -32,6 +37,10 @@ background: #e2e2e2; overflow: hidden; } +.blue .v-panel-deco { + border-color: #92a3ac; + background: #adc2cd; +} .v-sa .v-panel-deco, .v-ff3 .v-panel-deco { border-top-color: rgba(0,0,0,.1); diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css index 35f75058b2..e53bf04764 100644 --- a/WebContent/VAADIN/themes/reindeer/styles.css +++ b/WebContent/VAADIN/themes/reindeer/styles.css @@ -825,7 +825,7 @@ div.v-progressindicator-indeterminate-disabled { border: 1px solid #eee; } .v-filterselect-suggestmenu table { - border-spacing: 0; + border-collapse: collapse; border: none; } .v-filterselect-suggestmenu .gwt-MenuItem { @@ -2879,13 +2879,18 @@ td.v-datefield-calendarpanel-nextyear { text-shadow: #3b5a7a 0 1px 0; } .v-menubar .menuitem-selected { - background-image: url(menubar/img/menu-sel-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -423px; } /* Submenu icon (remove after #2849 is fixed) */ .v-menubar-submenu .menuitem img[align="right"] { margin-right: -15px; } +.v-ie .v-menubar-submenu .menuitem img[align="right"] { + margin-top: -14px; +} /* ./WebContent/VAADIN/themes/reindeer/notification/notification.css */ .v-Notification { @@ -2914,6 +2919,11 @@ td.v-datefield-calendarpanel-nextyear { border: 1px solid #dcdcdc; border-bottom: none; border-top: none; + color: #222; + text-shadow: none; +} +.blue .v-panel-content { + border-color: #a8bcc5; } .v-sa .v-panel-content, .v-ff3 .v-panel-content { @@ -2930,6 +2940,10 @@ td.v-datefield-calendarpanel-nextyear { background: #e2e2e2; overflow: hidden; } +.blue .v-panel-deco { + border-color: #92a3ac; + background: #adc2cd; +} .v-sa .v-panel-deco, .v-ff3 .v-panel-deco { border-top-color: rgba(0,0,0,.1); @@ -2968,7 +2982,7 @@ td.v-datefield-calendarpanel-nextyear { background-repeat: no-repeat; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -423px; + background-position: left -446px; padding-left: 2px; } .v-app .v-filterselect-input, @@ -2977,7 +2991,7 @@ td.v-datefield-calendarpanel-nextyear { background: transparent repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -448px; + background-position: left -471px; border: none; height: 21px; } @@ -2996,12 +3010,12 @@ td.v-datefield-calendarpanel-nextyear { .v-filterselect-focus { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -472px; + background-position: left -495px; } .v-filterselect-focus .v-filterselect-input { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -497px; + background-position: left -520px; } .v-filterselect-button { overflow: hidden; @@ -3009,39 +3023,39 @@ td.v-datefield-calendarpanel-nextyear { height: 24px; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -521px; + background-position: left -544px; cursor: default; } .v-filterselect-button:hover { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -545px; + background-position: left -568px; } .v-filterselect-button:active { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -569px; + background-position: left -592px; } .v-filterselect-focus .v-filterselect-button { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -593px; + background-position: left -616px; } .v-filterselect-focus .v-filterselect-button:hover { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -617px; + background-position: left -640px; } .v-filterselect-focus .v-filterselect-button:active { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -641px; + background-position: left -664px; } .v-disabled .v-filterselect-button:hover, .v-readonly .v-filterselect-button:hover { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -665px; + background-position: left -688px; } .v-filterselect-suggestpopup { background: #f8f8f9; @@ -3073,7 +3087,7 @@ td.v-datefield-calendarpanel-nextyear { background: transparent repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -689px; + background-position: left -712px; color: #fff; text-shadow: #3b5a7a 0 1px 0; } @@ -3094,25 +3108,25 @@ td.v-datefield-calendarpanel-nextyear { background-repeat: repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -709px; + background-position: left -732px; } .v-filterselect-prevpage:hover { background-repeat: repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -720px; + background-position: left -743px; } .v-filterselect-nextpage:active { background-repeat: repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -731px; + background-position: left -754px; } .v-filterselect-prevpage:active { background-repeat: repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -742px; + background-position: left -765px; } .v-filterselect-nextpage-off span, .v-filterselect-prevpage-off span { @@ -3128,7 +3142,7 @@ td.v-datefield-calendarpanel-nextyear { background: transparent no-repeat center 3px; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: center -753px; + background-position: center -776px; user-select: none; -moz-user-select: none; -webkit-user-select: none; @@ -3136,17 +3150,17 @@ td.v-datefield-calendarpanel-nextyear { .v-filterselect-prevpage span { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: center -764px; + background-position: center -787px; } .v-filterselect-nextpage:hover span { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: center -775px; + background-position: center -798px; } .v-filterselect-prevpage:hover span { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: center -786px; + background-position: center -809px; } .v-filterselect-status { text-shadow: #e9eaeb 0 1px 0; @@ -3159,7 +3173,7 @@ td.v-datefield-calendarpanel-nextyear { background-repeat: repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -797px; + background-position: left -820px; -moz-border-radius-bottomleft: 3px; -moz-border-radius-bottomright: 3px; -webkit-border-bottom-left-radius: 3px; @@ -3305,7 +3319,7 @@ td.v-datefield-calendarpanel-nextyear { background: transparent; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -814px; + background-position: left -837px; width: 10px; height: 10px; margin-top: -5px; @@ -3313,7 +3327,7 @@ td.v-datefield-calendarpanel-nextyear { .v-slider-handle:active { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -824px; + background-position: left -847px; } .v-slider-vertical { width: 2px; @@ -3357,7 +3371,7 @@ td.v-datefield-calendarpanel-nextyear { background-repeat: repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -834px; + background-position: left -857px; } .v-splitpanel-vsplitter div { height: 7px; @@ -3366,7 +3380,7 @@ td.v-datefield-calendarpanel-nextyear { background-position: 50%; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: center -841px; + background-position: center -864px; } /* Small style */ @@ -3397,7 +3411,7 @@ td.v-datefield-calendarpanel-nextyear { background: transparent repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -848px; + background-position: left -871px; height: 20px; text-transform: uppercase; font-size: 10px; @@ -3432,13 +3446,13 @@ td.v-datefield-calendarpanel-nextyear { background: transparent no-repeat right 7px; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: right -868px; + background-position: right -891px; } .v-table-header-cell-desc .v-table-caption-container { background: transparent no-repeat right 7px; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: right -888px; + background-position: right -911px; } .v-table-body { border-color: #c2c3c4; @@ -3471,12 +3485,12 @@ td.v-datefield-calendarpanel-nextyear { background: transparent no-repeat; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -908px; + background-position: left -931px; } .v-table-column-selector:active { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -928px; + background-position: left -951px; } .v-table-focus-slot-left { border-left-color: #222; @@ -3491,7 +3505,7 @@ td.v-datefield-calendarpanel-nextyear { background: transparent repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -948px; + background-position: left -971px; padding: 4px; text-transform: uppercase; font-size: 10px; @@ -3516,7 +3530,7 @@ td.v-datefield-calendarpanel-nextyear { background: transparent repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -968px; + background-position: left -991px; border: 1px solid #939494; border: none; border-radius-bottomleft: 4px; @@ -3540,7 +3554,7 @@ td.v-datefield-calendarpanel-nextyear { background: transparent no-repeat 0 4px; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -990px; + background-position: left -1013px; padding-left: 12px; padding-right: 4px; } @@ -3551,7 +3565,7 @@ td.v-datefield-calendarpanel-nextyear { .v-contextmenu .gwt-MenuItem-selected .v-on { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1004px; + background-position: left -1027px; } /* Borderless style */ .v-table-borderless .v-table-header-wrap, @@ -3564,7 +3578,7 @@ td.v-datefield-calendarpanel-nextyear { border-top-color: #2b3033; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1019px; + background-position: left -1042px; color: #e7e9ea; text-shadow: #000 0 -1px 0; } @@ -3574,27 +3588,27 @@ td.v-datefield-calendarpanel-nextyear { .v-table-strong .v-table-header-cell-asc .v-table-caption-container { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: right -1039px; + background-position: right -1062px; } .v-table-strong ..v-table-header-cell-desc .v-table-caption-container { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: right -1058px; + background-position: right -1081px; } .v-table-strong .v-table-column-selector { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1077px; + background-position: left -1100px; } .v-table-strong .v-table-column-selector:active { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1097px; + background-position: left -1120px; } .v-table-strong .v-table-header-drag { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1117px; + background-position: left -1140px; color: #e7e9ea; text-shadow: #000 0 -1px 0; } @@ -3673,7 +3687,7 @@ td.v-datefield-calendarpanel-nextyear { background: transparent; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1137px; + background-position: left -1160px; width: 18px; height: 17px; overflow: hidden; @@ -3685,23 +3699,23 @@ td.v-datefield-calendarpanel-nextyear { .v-tabsheet-scrollerNext { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1154px; + background-position: left -1177px; } .v-tabsheet-scrollerPrev:active { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1171px; + background-position: left -1194px; } .v-tabsheet-scrollerNext:active { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1188px; + background-position: left -1211px; } .v-tabsheet-scrollerPrev-disabled, .v-tabsheet-scrollerPrev-disabled:active { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1205px; + background-position: left -1228px; opacity: 1; filter: none; } @@ -3709,7 +3723,7 @@ td.v-datefield-calendarpanel-nextyear { .v-tabsheet-scrollerNext-disabled:active { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1222px; + background-position: left -1245px; opacity: 1; filter: none; } @@ -3742,14 +3756,14 @@ td.v-datefield-calendarpanel-nextyear { background: no-repeat; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1240px; + background-position: left -1263px; padding: 0 0 0 3px; } .v-tabsheet-framed .v-tabsheet-tabitemcell-first { padding-left: 10px; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1272px; + background-position: left -1295px; } .v-tabsheet-framed .v-tabsheet-tabitem, .v-tabsheet-framed .v-tabsheet-spacertd div { @@ -3758,7 +3772,7 @@ td.v-datefield-calendarpanel-nextyear { background: transparent repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1304px; + background-position: left -1327px; padding: 0; color: #222; text-shadow: #fff 0 1px 0; @@ -3769,7 +3783,7 @@ td.v-datefield-calendarpanel-nextyear { background: no-repeat right top; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: right -1336px; + background-position: right -1359px; padding: 9px 8px 0 6px; } .v-tabsheet-framed .v-tabsheet-tabitem .v-captiontext { @@ -3778,23 +3792,23 @@ td.v-datefield-calendarpanel-nextyear { .v-tabsheet-framed .v-tabsheet-tabitemcell-selected { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1368px; + background-position: left -1391px; } .v-tabsheet-framed .v-tabsheet-tabitemcell-selected-first { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1400px; + background-position: left -1423px; } .v-tabsheet-framed .v-tabsheet-tabitem-selected { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1432px; + background-position: left -1455px; color: #232930; } .v-tabsheet-framed .v-tabsheet-tabitem-selected .v-caption { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: right -1464px; + background-position: right -1487px; } .v-tabsheet-framed .v-tabsheet-spacertd div { margin-right: 4px; @@ -3803,12 +3817,17 @@ td.v-datefield-calendarpanel-nextyear { background: transparent no-repeat right top; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: right -1496px; + background-position: right -1519px; } .v-tabsheet-content-framed { border: 1px solid #dcdcdc; border-bottom: none; border-top: none; + color: #222; + text-shadow: none; +} +.blue .v-tabsheet-content-framed { + border-color: #a8bcc5; } .v-tabsheet-content-framed .v-tabsheet-tabsheetpanel { background: #fff; @@ -3823,6 +3842,10 @@ td.v-datefield-calendarpanel-nextyear { background: #e2e2e2; overflow: hidden; } +.blue .v-tabsheet-deco-framed { + border-color: #92a3ac; + background: #adc2cd; +} .v-sa .v-tabsheet-deco-framed, .v-ff3 .v-tabsheet-deco-framed { border-top-color: rgba(0,0,0,.1); @@ -3851,7 +3874,7 @@ td.v-datefield-calendarpanel-nextyear { background-repeat: repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1528px; + background-position: left -1551px; border-radius: 3px; -moz-border-radius: 3px; margin: 0; @@ -4002,7 +4025,7 @@ input.v-textfield-readonly, background: #4d749f repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1551px; + background-position: left -1574px; color: #fff; padding: 1px 2px; -webkit-border-radius: 2px; @@ -4058,7 +4081,7 @@ input.v-textfield-readonly, background: transparent repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1571px; + background-position: left -1594px; } .v-window-header { font-weight: bold; @@ -4081,13 +4104,13 @@ input.v-textfield-readonly, background: transparent; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1608px; + background-position: left -1631px; } .v-window-footer { background-repeat: repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1623px; + background-position: left -1646px; height: 15px; } .v-window-closebox { @@ -4098,17 +4121,17 @@ input.v-textfield-readonly, background: transparent; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1638px; + background-position: left -1661px; } .v-window-closebox:hover { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1654px; + background-position: left -1677px; } .v-window-closebox:active { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1670px; + background-position: left -1693px; } .v-window-contents { background: #fff; @@ -4141,7 +4164,7 @@ input.v-textfield-readonly, height: 12px; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1686px; + background-position: left -1709px; } .v-window-light .v-window-footer { background: transparent; @@ -4154,17 +4177,17 @@ input.v-textfield-readonly, height: 15px; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1698px; + background-position: left -1721px; } .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 -1713px; + background-position: left -1736px; } .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 -1728px; + background-position: left -1751px; } .v-window-light .v-window-contents { background: transparent; @@ -4174,7 +4197,7 @@ input.v-textfield-readonly, background: #f7f7f8 repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1743px; + background-position: left -1766px; } .v-ie6 .v-window-light .v-window-wrap2 { background-image: none; diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.css index dd18e3a445..2f7fbd8fb7 100644 --- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.css +++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.css @@ -173,6 +173,11 @@ border: 1px solid #dcdcdc; border-bottom: none; border-top: none; + color: #222; + text-shadow: none; +} +.blue .v-tabsheet-content-framed { + border-color: #a8bcc5; } .v-tabsheet-content-framed .v-tabsheet-tabsheetpanel { background: #fff; @@ -187,6 +192,10 @@ background: #e2e2e2; overflow: hidden; } +.blue .v-tabsheet-deco-framed { + border-color: #92a3ac; + background: #adc2cd; +} .v-sa .v-tabsheet-deco-framed, .v-ff3 .v-tabsheet-deco-framed { border-top-color: rgba(0,0,0,.1); diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css index ce3cdcde44..885fd4f3e6 100644 --- a/WebContent/VAADIN/themes/runo/styles.css +++ b/WebContent/VAADIN/themes/runo/styles.css @@ -825,7 +825,7 @@ div.v-progressindicator-indeterminate-disabled { border: 1px solid #eee; } .v-filterselect-suggestmenu table { - border-spacing: 0; + border-collapse: collapse; border: none; } .v-filterselect-suggestmenu .gwt-MenuItem { -- 2.39.5