From: Jouni Koivuviita Date: Thu, 28 May 2009 06:42:56 +0000 (+0000) Subject: Table normal style variant for black background added to Reindeer theme. X-Git-Tag: 6.7.0.beta1~2753 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=55796c9f02c2c2e90659f2f781e6e1a162f6f636;p=vaadin-framework.git Table normal style variant for black background added to Reindeer theme. svn changeset:8040/svn branch:6.0 --- diff --git a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png index c18d7b05c2..f8eb2af29f 100644 Binary files a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png and b/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png differ diff --git a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites.png b/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites.png index 49c0475ef1..a3249e4f2e 100644 Binary files a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites.png and b/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites.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 d426cc8b80..a65612cf3f 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 8cfacdf59b..04cc05ea9d 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 81d6fc5aaa..6a2dc2e988 100644 --- a/WebContent/VAADIN/themes/reindeer/styles.css +++ b/WebContent/VAADIN/themes/reindeer/styles.css @@ -3532,7 +3532,8 @@ td.v-datefield-calendarpanel-nextyear { .v-table-row-odd { background: #eff0f1; } -.v-table .v-selected { +.v-table .v-selected, +.black .v-table .v-selected { background: #4d749f url(common/img/sel-bg.png) repeat-x; /* We can't include this in the sprite, since we don't know the row height */ color: #fff; text-shadow: #3b5a7a 0 1px 0; @@ -3603,6 +3604,7 @@ td.v-datefield-calendarpanel-nextyear { -webkit-border-bottom-right-radius: 4px; height: 13px; padding: 4px 30px; + color: #222; text-shadow: #fff 0 1px 0; width: 100px; position: relative; @@ -3629,11 +3631,8 @@ td.v-datefield-calendarpanel-nextyear { -background-image: url(common/img/vertical-sprites-ie6.png); background-position: left -1075px; } -/* Borderless style */ -.v-table-borderless .v-table-header-wrap, -.v-table-borderless .v-table-body { - border: none; -} + + /* Strong style */ .v-table-strong .v-table-header-wrap { border-color: #2b3033; @@ -3679,6 +3678,76 @@ td.v-datefield-calendarpanel-nextyear { border-color: #9ca1a5; } + +/* Table on black background (normal style) */ +.black .v-table-header-wrap { + border-color: #252729; + background-image: url(common/img/black-vertical-sprites.png); + -background-image: url(common/img/black-vertical-sprites-ie6.png); + background-position: left -622px; + color: #e7eaee; + text-shadow: #000 0 -1px 0; +} +.black .v-table-resizer { + border-right-color: #252729; +} +.black .v-table-header-cell-asc .v-table-caption-container { + background-image: url(common/img/black-vertical-sprites.png); + -background-image: url(common/img/black-vertical-sprites-ie6.png); + background-position: right -642px; +} +.black .v-table-header-cell-desc .v-table-caption-container { + background-image: url(common/img/black-vertical-sprites.png); + -background-image: url(common/img/black-vertical-sprites-ie6.png); + background-position: right -661px; +} +.black .v-table-column-selector { + background-image: url(common/img/black-vertical-sprites.png); + -background-image: url(common/img/black-vertical-sprites-ie6.png); + background-position: left -680px; +} +.black .v-table-column-selector:active { + background-image: url(common/img/black-vertical-sprites.png); + -background-image: url(common/img/black-vertical-sprites-ie6.png); + background-position: left -700px; +} +.black .v-table-header-drag { + background-image: url(common/img/black-vertical-sprites.png); + -background-image: url(common/img/black-vertical-sprites-ie6.png); + background-position: left -720px; + color: #e7eaee; + text-shadow: #000 0 -1px 0; +} +.black .v-table-focus-slot-left, +.black .v-table-focus-slot-right { + border-color: #9ca1a5; +} +.black .v-table-body { + border-color: #252729; + background: transparent; +} +.black .v-table-cell-content { + border-right-color: #252729; + border-bottom: 1px solid #252729; +} +.black .v-table-cell-wrapper { + padding-bottom: 2px; +} +.black .v-table-row-odd { + background: transparent; +} +/* Selection background-color combined with default style selector, so we don't have to duplicate the sprite image in the final sprite collection */ +.black .v-table .v-selected .v-table-cell-content { + border-bottom: 1px solid #4d749f; +} + + +/* Borderless style */ +.v-table-borderless .v-table-header-wrap, +.v-table-borderless .v-table-body { + border: none; +} + /* ./WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.css */ .v-tabsheet-spacertd div { border-color: #bfbfbf; @@ -4085,7 +4154,7 @@ input.v-textfield-prompt { background: #1b1d1e; background-image: url(common/img/black-vertical-sprites.png); -background-image: url(common/img/black-vertical-sprites-ie6.png); - background-position: left -622px; + background-position: left -740px; color: #c9ccce; text-shadow: #000 0 0 1px; } @@ -4377,7 +4446,7 @@ input.v-textfield-readonly, background: transparent repeat-x; background-image: url(common/img/black-vertical-sprites.png); -background-image: url(common/img/black-vertical-sprites-ie6.png); - background-position: left -645px; + background-position: left -763px; text-align: center; -moz-border-radius-topright: 8px; -moz-border-radius-topleft: 8px; @@ -4403,14 +4472,14 @@ input.v-textfield-readonly, background: transparent no-repeat; background-image: url(common/img/black-vertical-sprites.png); -background-image: url(common/img/black-vertical-sprites-ie6.png); - background-position: left -674px; + background-position: left -792px; width: 14px; height: 14px; } .v-ie6 .v-window-black .v-window-resizebox { background-image: url(common/img/black-vertical-sprites.png); -background-image: url(common/img/black-vertical-sprites-ie6.png); - background-position: left -688px; + background-position: left -806px; } .v-ie6 .v-window-black .v-window-contents { background: transparent url(window/img/black/content-bg-ie6.png) repeat-x; @@ -4421,5 +4490,5 @@ input.v-textfield-readonly, background: transparent repeat-x; background-image: url(common/img/black-vertical-sprites.png); -background-image: url(common/img/black-vertical-sprites-ie6.png); - background-position: left -702px; + background-position: left -820px; } diff --git a/WebContent/VAADIN/themes/reindeer/table/img/asc.png b/WebContent/VAADIN/themes/reindeer/table/img/asc.png index cdcc3c2b51..050d6c715b 100644 Binary files a/WebContent/VAADIN/themes/reindeer/table/img/asc.png and b/WebContent/VAADIN/themes/reindeer/table/img/asc.png differ diff --git a/WebContent/VAADIN/themes/reindeer/table/img/col-sel-black-pressed.png b/WebContent/VAADIN/themes/reindeer/table/img/col-sel-black-pressed.png new file mode 100644 index 0000000000..69ed19c41f Binary files /dev/null and b/WebContent/VAADIN/themes/reindeer/table/img/col-sel-black-pressed.png differ diff --git a/WebContent/VAADIN/themes/reindeer/table/img/col-sel-black.png b/WebContent/VAADIN/themes/reindeer/table/img/col-sel-black.png new file mode 100644 index 0000000000..6cf004991d Binary files /dev/null and b/WebContent/VAADIN/themes/reindeer/table/img/col-sel-black.png differ diff --git a/WebContent/VAADIN/themes/reindeer/table/img/desc.png b/WebContent/VAADIN/themes/reindeer/table/img/desc.png index 6b988c79e0..c3edfa25b9 100644 Binary files a/WebContent/VAADIN/themes/reindeer/table/img/desc.png and b/WebContent/VAADIN/themes/reindeer/table/img/desc.png differ diff --git a/WebContent/VAADIN/themes/reindeer/table/img/header-bg-black.png b/WebContent/VAADIN/themes/reindeer/table/img/header-bg-black.png new file mode 100644 index 0000000000..1ccbca7168 Binary files /dev/null and b/WebContent/VAADIN/themes/reindeer/table/img/header-bg-black.png differ diff --git a/WebContent/VAADIN/themes/reindeer/table/table.css b/WebContent/VAADIN/themes/reindeer/table/table.css index 157e79c82b..8abce9421e 100644 --- a/WebContent/VAADIN/themes/reindeer/table/table.css +++ b/WebContent/VAADIN/themes/reindeer/table/table.css @@ -56,7 +56,8 @@ .v-table-row-odd { background: #eff0f1; } -.v-table .v-selected { +.v-table .v-selected, +.black .v-table .v-selected { background: #4d749f url(../common/img/sel-bg.png) repeat-x; /* We can't include this in the sprite, since we don't know the row height */ color: #fff; text-shadow: #3b5a7a 0 1px 0; @@ -119,6 +120,7 @@ -webkit-border-bottom-right-radius: 4px; height: 13px; padding: 4px 30px; + color: #222; text-shadow: #fff 0 1px 0; width: 100px; position: relative; @@ -141,11 +143,8 @@ .v-contextmenu .gwt-MenuItem-selected .v-on { background-image: url(../common/icons/bullet-white.png); /** sprite-ref: verticals; sprite-margin-top: 4px; sprite-margin-bottom: 5px */ } -/* Borderless style */ -.v-table-borderless .v-table-header-wrap, -.v-table-borderless .v-table-body { - border: none; -} + + /* Strong style */ .v-table-strong .v-table-header-wrap { border-color: #2b3033; @@ -177,4 +176,62 @@ .v-table-strong .v-table-focus-slot-left, .v-table-strong .v-table-focus-slot-right { border-color: #9ca1a5; +} + + +/* Table on black background (normal style) */ +.black .v-table-header-wrap { + border-color: #252729; + background-image: url(img/header-bg-black.png); /** sprite-ref: black-verticals; sprite-alignment: repeat */ + color: #e7eaee; + text-shadow: #000 0 -1px 0; +} +.black .v-table-resizer { + border-right-color: #252729; +} +.black .v-table-header-cell-asc .v-table-caption-container { + background-image: url(img/asc.png); /** sprite-ref: black-verticals; sprite-alignment: right; sprite-margin-top: 7px; sprite-margin-bottom: 6px; sprite-margin-right: 6px; */ +} +.black .v-table-header-cell-desc .v-table-caption-container { + background-image: url(img/desc.png); /** sprite-ref: black-verticals; sprite-alignment: right; sprite-margin-top: 7px; sprite-margin-bottom: 6px; sprite-margin-right: 6px; */ +} +.black .v-table-column-selector { + background-image: url(img/col-sel-black.png); /** sprite-ref: black-verticals */ +} +.black .v-table-column-selector:active { + background-image: url(img/col-sel-black-pressed.png); /** sprite-ref: black-verticals */ +} +.black .v-table-header-drag { + background-image: url(img/header-bg-black.png); /** sprite-ref: black-verticals; sprite-alignment: repeat */ + color: #e7eaee; + text-shadow: #000 0 -1px 0; +} +.black .v-table-focus-slot-left, +.black .v-table-focus-slot-right { + border-color: #9ca1a5; +} +.black .v-table-body { + border-color: #252729; + background: transparent; +} +.black .v-table-cell-content { + border-right-color: #252729; + border-bottom: 1px solid #252729; +} +.black .v-table-cell-wrapper { + padding-bottom: 2px; +} +.black .v-table-row-odd { + background: transparent; +} +/* Selection background-color combined with default style selector, so we don't have to duplicate the sprite image in the final sprite collection */ +.black .v-table .v-selected .v-table-cell-content { + border-bottom: 1px solid #4d749f; +} + + +/* Borderless style */ +.v-table-borderless .v-table-header-wrap, +.v-table-borderless .v-table-body { + border: none; } \ No newline at end of file