summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN
diff options
context:
space:
mode:
authorJouni Koivuviita <jouni.koivuviita@itmill.com>2009-07-07 06:51:22 +0000
committerJouni Koivuviita <jouni.koivuviita@itmill.com>2009-07-07 06:51:22 +0000
commiteade8d33602f3b2174c7135cee3d5f3403fff601 (patch)
tree576d3b58d218ea4203827772cafad23c65be801c /WebContent/VAADIN
parent0b31d84fede9c1482c6ac9d1cb2e7bb4bbc1715c (diff)
downloadvaadin-framework-eade8d33602f3b2174c7135cee3d5f3403fff601.tar.gz
vaadin-framework-eade8d33602f3b2174c7135cee3d5f3403fff601.zip
Modified Reindeer black styles to be a bit more lighter, easier to see textfields and comboboxes on low contrast displays.
Fixes blue and black layout styles for IE6 (previously had a child selector in layouts.css which caused IE6 fail the whole selector). svn changeset:8336/svn branch:6.0
Diffstat (limited to 'WebContent/VAADIN')
-rw-r--r--WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.css4
-rw-r--r--WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.pngbin3319 -> 3238 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites.pngbin8124 -> 8069 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/layouts/layouts.css10
-rw-r--r--WebContent/VAADIN/themes/reindeer/select/img/black/center-black-focus.pngbin0 -> 125 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/select/img/black/center-black.png (renamed from WebContent/VAADIN/themes/reindeer/select/img/center-black.png)bin129 -> 130 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/select/img/black/left-black-focus-ie6.pngbin0 -> 201 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/select/img/black/left-black-focus.pngbin0 -> 156 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/select/img/black/left-black-ie6.pngbin0 -> 207 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/select/img/black/left-black.pngbin0 -> 154 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/select/img/black/right-black-focus-hover.pngbin0 -> 980 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/select/img/black/right-black-focus-pressed.pngbin0 -> 950 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/select/img/black/right-black-focus.pngbin0 -> 670 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/select/img/black/right-black-hover.pngbin0 -> 918 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/select/img/black/right-black-pressed.pngbin0 -> 891 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/select/img/black/right-black.pngbin0 -> 614 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/select/img/center-black-focus.pngbin129 -> 0 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/select/img/left-black-focus-ie6.pngbin217 -> 0 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/select/img/left-black-focus.pngbin163 -> 0 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/select/img/left-black-ie6.pngbin225 -> 0 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/select/img/left-black.pngbin162 -> 0 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/select/img/right-black-focus-hover.pngbin977 -> 0 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/select/img/right-black-focus-pressed.pngbin936 -> 0 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/select/img/right-black-focus.pngbin662 -> 0 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/select/img/right-black-hover.pngbin907 -> 0 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/select/img/right-black-pressed.pngbin881 -> 0 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/select/img/right-black.pngbin618 -> 0 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/select/select.css34
-rw-r--r--WebContent/VAADIN/themes/reindeer/splitpanel/splitpanel.css12
-rw-r--r--WebContent/VAADIN/themes/reindeer/styles.css85
-rw-r--r--WebContent/VAADIN/themes/reindeer/table/table.css17
-rw-r--r--WebContent/VAADIN/themes/reindeer/textfield/img/bg-black.pngbin124 -> 124 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/textfield/img/bg-border-image-black-focus.pngbin218 -> 202 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/textfield/img/bg-border-image-black.pngbin214 -> 202 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/textfield/textfield.css21
-rw-r--r--WebContent/VAADIN/themes/reindeer/window/img/black/content-bg-ie6.pngbin254 -> 343 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/window/img/black/header-bg-ie6.pngbin241 -> 238 bytes
-rw-r--r--WebContent/VAADIN/themes/reindeer/window/img/black/resize-ie6.pngbin213 -> 213 bytes
38 files changed, 123 insertions, 60 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.css b/WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.css
index 50993b8ad3..87c598956f 100644
--- a/WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.css
+++ b/WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.css
@@ -4,8 +4,8 @@
/** sprite: verticals; sprite-image: url(../common/img/vertical-sprites.png); sprite-layout: vertical */
/** sprite: horizontals; sprite-image: url(../common/img/horizontal-sprites.png); sprite-layout: horizontal */
-/** sprite: black-verticals; sprite-image: url(../common/img/black-vertical-sprites.png); sprite-layout: vertical; sprite-matte-color: #0b0e0f */
-/** sprite: black-horizontals; sprite-image: url(../common/img/black-horizontal-sprites.png); sprite-layout: horizontal; sprite-matte-color: #0b0e0f */
+/** sprite: black-verticals; sprite-image: url(../common/img/black-vertical-sprites.png); sprite-layout: vertical; sprite-matte-color: #1e2022 */
+/** sprite: black-horizontals; sprite-image: url(../common/img/black-horizontal-sprites.png); sprite-layout: horizontal; sprite-matte-color: #1e2022 */
/*------------
* Buttons
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 533ac3d3c3..84c52dbf4c 100644
--- a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png
+++ b/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png
Binary files 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 a3249e4f2e..387abf2d4b 100644
--- a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites.png
+++ b/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites.png
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/layouts/layouts.css b/WebContent/VAADIN/themes/reindeer/layouts/layouts.css
index 7ac88f92a1..2c39ffcf3a 100644
--- a/WebContent/VAADIN/themes/reindeer/layouts/layouts.css
+++ b/WebContent/VAADIN/themes/reindeer/layouts/layouts.css
@@ -27,14 +27,18 @@
/* Blue background */
.v-verticallayout-blue,
.v-horizontallayout-blue,
-.v-orderedlayout-blue,
+.v-orderedlayout-blue {
+ background-color: #bcd3de;
+}
.v-panel-content > div.blue {
background-color: #bcd3de;
}
/* Black background */
.v-verticallayout-black,
.v-horizontallayout-black,
-.v-orderedlayout-black,
+.v-orderedlayout-black {
+ background-color: #1e2022;
+}
.v-panel-content > div.black {
- background: #16181a url(img/black-bg.png) repeat-x;
+ background-color: #1e2022;
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/center-black-focus.png b/WebContent/VAADIN/themes/reindeer/select/img/black/center-black-focus.png
new file mode 100644
index 0000000000..1d47349076
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/select/img/black/center-black-focus.png
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/center-black.png b/WebContent/VAADIN/themes/reindeer/select/img/black/center-black.png
index 5abccb423f..a5cfcebf3b 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/center-black.png
+++ b/WebContent/VAADIN/themes/reindeer/select/img/black/center-black.png
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-focus-ie6.png b/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-focus-ie6.png
new file mode 100644
index 0000000000..5cf13fac6a
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-focus-ie6.png
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-focus.png b/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-focus.png
new file mode 100644
index 0000000000..720c310c35
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-focus.png
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-ie6.png b/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-ie6.png
new file mode 100644
index 0000000000..d06d599e0e
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-ie6.png
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/left-black.png b/WebContent/VAADIN/themes/reindeer/select/img/black/left-black.png
new file mode 100644
index 0000000000..9908a79990
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/select/img/black/left-black.png
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/right-black-focus-hover.png b/WebContent/VAADIN/themes/reindeer/select/img/black/right-black-focus-hover.png
new file mode 100644
index 0000000000..2f98d641d2
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/select/img/black/right-black-focus-hover.png
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/right-black-focus-pressed.png b/WebContent/VAADIN/themes/reindeer/select/img/black/right-black-focus-pressed.png
new file mode 100644
index 0000000000..5a8012b861
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/select/img/black/right-black-focus-pressed.png
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/right-black-focus.png b/WebContent/VAADIN/themes/reindeer/select/img/black/right-black-focus.png
new file mode 100644
index 0000000000..a5c88ed7cb
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/select/img/black/right-black-focus.png
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/right-black-hover.png b/WebContent/VAADIN/themes/reindeer/select/img/black/right-black-hover.png
new file mode 100644
index 0000000000..8113640f15
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/select/img/black/right-black-hover.png
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/right-black-pressed.png b/WebContent/VAADIN/themes/reindeer/select/img/black/right-black-pressed.png
new file mode 100644
index 0000000000..ef5ee44451
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/select/img/black/right-black-pressed.png
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/right-black.png b/WebContent/VAADIN/themes/reindeer/select/img/black/right-black.png
new file mode 100644
index 0000000000..1bd04abb46
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/select/img/black/right-black.png
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/center-black-focus.png b/WebContent/VAADIN/themes/reindeer/select/img/center-black-focus.png
deleted file mode 100644
index 91d7a49042..0000000000
--- a/WebContent/VAADIN/themes/reindeer/select/img/center-black-focus.png
+++ /dev/null
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/left-black-focus-ie6.png b/WebContent/VAADIN/themes/reindeer/select/img/left-black-focus-ie6.png
deleted file mode 100644
index e56cc9f4cb..0000000000
--- a/WebContent/VAADIN/themes/reindeer/select/img/left-black-focus-ie6.png
+++ /dev/null
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/left-black-focus.png b/WebContent/VAADIN/themes/reindeer/select/img/left-black-focus.png
deleted file mode 100644
index d294d3e0fd..0000000000
--- a/WebContent/VAADIN/themes/reindeer/select/img/left-black-focus.png
+++ /dev/null
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/left-black-ie6.png b/WebContent/VAADIN/themes/reindeer/select/img/left-black-ie6.png
deleted file mode 100644
index 88b442df7a..0000000000
--- a/WebContent/VAADIN/themes/reindeer/select/img/left-black-ie6.png
+++ /dev/null
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/left-black.png b/WebContent/VAADIN/themes/reindeer/select/img/left-black.png
deleted file mode 100644
index 84948e0875..0000000000
--- a/WebContent/VAADIN/themes/reindeer/select/img/left-black.png
+++ /dev/null
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/right-black-focus-hover.png b/WebContent/VAADIN/themes/reindeer/select/img/right-black-focus-hover.png
deleted file mode 100644
index 1d9741f7d4..0000000000
--- a/WebContent/VAADIN/themes/reindeer/select/img/right-black-focus-hover.png
+++ /dev/null
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/right-black-focus-pressed.png b/WebContent/VAADIN/themes/reindeer/select/img/right-black-focus-pressed.png
deleted file mode 100644
index f474432f50..0000000000
--- a/WebContent/VAADIN/themes/reindeer/select/img/right-black-focus-pressed.png
+++ /dev/null
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/right-black-focus.png b/WebContent/VAADIN/themes/reindeer/select/img/right-black-focus.png
deleted file mode 100644
index afcab805e8..0000000000
--- a/WebContent/VAADIN/themes/reindeer/select/img/right-black-focus.png
+++ /dev/null
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/right-black-hover.png b/WebContent/VAADIN/themes/reindeer/select/img/right-black-hover.png
deleted file mode 100644
index d8bfd8122f..0000000000
--- a/WebContent/VAADIN/themes/reindeer/select/img/right-black-hover.png
+++ /dev/null
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/right-black-pressed.png b/WebContent/VAADIN/themes/reindeer/select/img/right-black-pressed.png
deleted file mode 100644
index bb862c235c..0000000000
--- a/WebContent/VAADIN/themes/reindeer/select/img/right-black-pressed.png
+++ /dev/null
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/right-black.png b/WebContent/VAADIN/themes/reindeer/select/img/right-black.png
deleted file mode 100644
index 6bae936fd1..0000000000
--- a/WebContent/VAADIN/themes/reindeer/select/img/right-black.png
+++ /dev/null
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/select/select.css b/WebContent/VAADIN/themes/reindeer/select/select.css
index 6a79cab10e..0062c62034 100644
--- a/WebContent/VAADIN/themes/reindeer/select/select.css
+++ b/WebContent/VAADIN/themes/reindeer/select/select.css
@@ -207,48 +207,48 @@
/* Combobox on black background */
.black .v-filterselect {
- background-image: url(img/left-black.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */
+ background-image: url(img/black/left-black.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */
}
.v-ie6 .black .v-filterselect {
- background-image: url(img/left-black-ie6.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */
+ background-image: url(img/black/left-black-ie6.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */
}
.v-app .black .v-filterselect-input,
.v-window .black .v-filterselect-input,
.v-window-black .v-filterselect-input,
.v-popupview-popup .black .v-filterselect-input {
color: #c9ccce;
- background-image: url(img/center-black.png); /** sprite-ref: black-verticals; sprite-alignment: repeat; sprite-margin-bottom: 1px */
+ background-image: url(img/black/center-black.png); /** sprite-ref: black-verticals; sprite-alignment: repeat; sprite-margin-bottom: 1px */
}
.black .v-filterselect-focus {
- background-image: url(img/left-black-focus.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */
+ background-image: url(img/black/left-black-focus.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */
}
.v-ie6 .black .v-filterselect-focus {
- background-image: url(img/left-black-focus-ie6.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */
+ background-image: url(img/black/left-black-focus-ie6.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */
}
.black .v-filterselect-focus .v-filterselect-input {
- background-image: url(img/center-black-focus.png); /** sprite-ref: black-verticals; sprite-alignment: repeat; sprite-margin-bottom: 1px */
+ background-image: url(img/black/center-black-focus.png); /** sprite-ref: black-verticals; sprite-alignment: repeat; sprite-margin-bottom: 1px */
}
.black .v-filterselect-button {
- background-image: url(img/right-black.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */
+ background-image: url(img/black/right-black.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */
}
.black .v-filterselect-button:hover {
- background-image: url(img/right-black-hover.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */
+ background-image: url(img/black/right-black-hover.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */
}
.black .v-filterselect-button:active {
- background-image: url(img/right-black-pressed.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */
+ background-image: url(img/black/right-black-pressed.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */
}
.black .v-filterselect-focus .v-filterselect-button {
- background-image: url(img/right-black-focus.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */
+ background-image: url(img/black/right-black-focus.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */
}
.black .v-filterselect-focus .v-filterselect-button:hover {
- background-image: url(img/right-black-focus-hover.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */
+ background-image: url(img/black/right-black-focus-hover.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */
}
.black .v-filterselect-focus .v-filterselect-button:active {
- background-image: url(img/right-black-focus-pressed.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */
+ background-image: url(img/black/right-black-focus-pressed.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */
}
.black .v-disabled .v-filterselect-button:hover,
.black .v-readonly .v-filterselect-button:hover {
- background-image: url(img/right-black.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */
+ background-image: url(img/black/right-black.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */
}
.black .v-filterselect-prompt .v-filterselect-input {
color: #5f6366;
@@ -259,10 +259,10 @@
/* Native selects on black background */
.black .v-select select,
.black .v-select-twincol select {
- border: 1px solid #343536;
- border-top-color: #2a2a2b;
- border-bottom-color: #3a3b3c;
- background: #1b1d1e;
+ border-color: #38393a;
+ border-top-color: #2c2d2e;
+ border-bottom-color: #3e3f3f;
+ background: #151717;
color: #c9ccce;
}
diff --git a/WebContent/VAADIN/themes/reindeer/splitpanel/splitpanel.css b/WebContent/VAADIN/themes/reindeer/splitpanel/splitpanel.css
index c8c472b425..112601d267 100644
--- a/WebContent/VAADIN/themes/reindeer/splitpanel/splitpanel.css
+++ b/WebContent/VAADIN/themes/reindeer/splitpanel/splitpanel.css
@@ -45,4 +45,16 @@
height: 3px;
margin-top: -2px;
background: transparent;
+}
+
+/* Splitpanels on blue background */
+.blue .v-splitpanel-hsplitter-small,
+.blue .v-splitpanel-hsplitter-small-locked {
+ background: #7c8a91;
+}
+
+/* Splitpanels on black background */
+.black .v-splitpanel-hsplitter-small,
+.black .v-splitpanel-hsplitter-small-locked {
+ background: #4e5253;
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index 03fdd2c836..ebb2353edb 100644
--- a/WebContent/VAADIN/themes/reindeer/styles.css
+++ b/WebContent/VAADIN/themes/reindeer/styles.css
@@ -2720,6 +2720,9 @@ td.v-datefield-calendarpanel-nextyear {
}
/* ./WebContent/VAADIN/themes/reindeer/formlayout/formlayout.css */
+.v-formlayout-errorcell {
+ width: 13px;
+}
.v-formlayout-cell .v-errorindicator {
width: 13px;
height: 16px;
@@ -2755,14 +2758,15 @@ td.v-datefield-calendarpanel-nextyear {
}
/* form */
.v-form-errormessage {
- background: transparent url(icons/16/error.png) no-repeat top left;
+ background: transparent url(common/icons/error.png) no-repeat 3px 2px;
padding-left: 20px;
margin-bottom: 5px;
margin-top: 5px;
min-height: 20px;
}
.v-ie6 .v-form-errormessage {
- height: 20px
+ height: 20px;
+ background-image: url(common/icons/error-ie6.png);
}
.v-form fieldset {
border: none;
@@ -2873,16 +2877,20 @@ td.v-datefield-calendarpanel-nextyear {
/* Blue background */
.v-verticallayout-blue,
.v-horizontallayout-blue,
-.v-orderedlayout-blue,
+.v-orderedlayout-blue {
+ background-color: #bcd3de;
+}
.v-panel-content > div.blue {
background-color: #bcd3de;
}
/* Black background */
.v-verticallayout-black,
.v-horizontallayout-black,
-.v-orderedlayout-black,
+.v-orderedlayout-black {
+ background-color: #1e2022;
+}
.v-panel-content > div.black {
- background: #16181a url(layouts/img/black-bg.png) repeat-x;
+ background-color: #1e2022;
}
/* ./WebContent/VAADIN/themes/reindeer/menubar/menubar.css */
@@ -3391,10 +3399,10 @@ td.v-datefield-calendarpanel-nextyear {
/* Native selects on black background */
.black .v-select select,
.black .v-select-twincol select {
- border: 1px solid #343536;
- border-top-color: #2a2a2b;
- border-bottom-color: #3a3b3c;
- background: #1b1d1e;
+ border-color: #38393a;
+ border-top-color: #2c2d2e;
+ border-bottom-color: #3e3f3f;
+ background: #151717;
color: #c9ccce;
}
@@ -3506,6 +3514,18 @@ td.v-datefield-calendarpanel-nextyear {
background: transparent;
}
+/* Splitpanels on blue background */
+.blue .v-splitpanel-hsplitter-small,
+.blue .v-splitpanel-hsplitter-small-locked {
+ background: #7c8a91;
+}
+
+/* Splitpanels on black background */
+.black .v-splitpanel-hsplitter-small,
+.black .v-splitpanel-hsplitter-small-locked {
+ background: #4e5253;
+}
+
/* ./WebContent/VAADIN/themes/reindeer/table/table.css */
.v-table-header-wrap {
border-color: #c2c3c4;
@@ -3649,6 +3669,10 @@ td.v-datefield-calendarpanel-nextyear {
position: relative;
top: 1px;
-webkit-box-shadow: rgba(0,0,0,.5) 0 1px 2px;
+ -moz-box-shadow: rgba(0,0,0,.5) 0 1px 2px;
+}
+.v-table-borderless .v-table-scrollposition span {
+ top: 0;
}
/* row in column selector */
.v-contextmenu .v-on,
@@ -3672,6 +3696,16 @@ td.v-datefield-calendarpanel-nextyear {
}
+/* Table on blue background */
+.blue .v-table-header-wrap {
+ border-color: #92a2aa;
+}
+.blue .v-table-body {
+ border-color: #92a2aa;
+ border-top-color: #c2c3c4;
+}
+
+
/* Strong style */
.v-table-strong .v-table-header-wrap {
border-color: #2b3033;
@@ -3682,6 +3716,9 @@ td.v-datefield-calendarpanel-nextyear {
color: #e7e9ea;
text-shadow: #000 0 -1px 0;
}
+.v-table-strong .v-table-body {
+ border-top-color: #2b3033;
+}
.v-table-strong .v-table-resizer {
border-right-color: #1c1f21;
}
@@ -4207,16 +4244,14 @@ input.v-textfield-prompt {
background: transparent;
border-width: 0 3px 0 3px;
padding: 4px 0 0 0;
- height: 20px;
+ height: 21px;
-webkit-border-image: url(textfield/img/bg-border-image.png) 0 3 0 3 stretch stretch;
-moz-border-image: url(textfield/img/bg-border-image.png) 0 3 0 3 stretch stretch;
- -o-border-image: url(textfield/img/bg-border-image.png) 0 3 0 3 stretch stretch;
}
.v-sa input.v-textfield-focus,
.v-ff35 input.v-textfield-focus {
-webkit-border-image: url(textfield/img/bg-border-image-focus.png) 0 3 0 3 stretch stretch;
-moz-border-image: url(textfield/img/bg-border-image-focus.png) 0 3 0 3 stretch stretch;
- -o-border-image: url(textfield/img/bg-border-image-focus.png) 0 3 0 3 stretch stretch;
}
/* Small style textfield */
.v-app input.v-textfield-small,
@@ -4239,10 +4274,10 @@ input.v-textfield-prompt {
}
/* Textfield on black background */
.black .v-textfield {
- border-color: #343536;
- border-top-color: #2a2a2b;
- border-bottom-color: #3a3b3c;
- background: #1b1d1e;
+ border-color: #38393a;
+ border-top-color: #2c2d2e;
+ border-bottom-color: #3e3f3f;
+ background: #151717;
background-image: url(common/img/black-vertical-sprites.png);
-background-image: url(common/img/black-vertical-sprites-ie6.png);
background-position: left -740px;
@@ -4253,23 +4288,21 @@ input.v-textfield-prompt {
.v-window-black .v-textfield-focus,
.v-window .black .v-textfield-focus,
.v-popupview-popup .black .v-textfield-focus {
- border-color: #4e6a80;
- border-top-color: #3a5163;
- border-bottom-color: #557086;
+ border-color: #4b7192;
+ border-top-color: #3b5a75;
+ border-bottom-color: #507596;
}
/* Capable browsers get fancier border images */
.v-sa .black input.v-textfield,
.v-ff35 .black input.v-textfield {
-webkit-border-image: url(textfield/img/bg-border-image-black.png) 0 3 0 3 stretch stretch;
-moz-border-image: url(textfield/img/bg-border-image-black.png) 0 3 0 3 stretch stretch;
- -o-border-image: url(textfield/img/bg-border-image-black.png) 0 3 0 3 stretch stretch;
height: 19px;
}
.v-sa .black input.v-textfield-focus,
.v-ff35 .black input.v-textfield-focus {
-webkit-border-image: url(textfield/img/bg-border-image-black-focus.png) 0 3 0 3 stretch stretch;
-moz-border-image: url(textfield/img/bg-border-image-black-focus.png) 0 3 0 3 stretch stretch;
- -o-border-image: url(textfield/img/bg-border-image-black-focus.png) 0 3 0 3 stretch stretch;
}
.v-sa .black input.v-textfield-small,
.v-ff35 .black input.v-textfield-small {
@@ -4291,7 +4324,6 @@ input.v-textfield-readonly,
background: transparent;
-webkit-border-image: none;
-moz-border-image: none;
- -o-border-image: none;
border-width: 0;
}
@@ -4387,6 +4419,9 @@ input.v-textfield-readonly,
color: #fff;
text-shadow: #000 0 -1px 0;
white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ -ms-text-overflow: ellipsis;
}
.v-window-error .v-window-header {
padding-left: 13px;
@@ -4519,17 +4554,17 @@ input.v-textfield-readonly,
.v-sa .v-window-black .v-window-wrap,
.v-ff3 .v-window-black .v-window-wrap,
.v-op .v-window-black .v-window-wrap {
- border-color: rgba(0,0,0,.9);
+ border-color: rgba(0,0,0,.8);
}
.v-window-black .v-window-wrap2 {
- background-color: #0b0e0f;
+ background-color: #1d2021;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
}
.v-sa .v-window-black .v-window-wrap2,
.v-ff3 .v-window-black .v-window-wrap2,
.v-op .v-window-black .v-window-wrap2 {
- background-color: rgba(11,14,15,.9);
+ background-color: rgba(29,32,33,.9);
}
.v-window-black .v-window-outerheader {
height: auto;
diff --git a/WebContent/VAADIN/themes/reindeer/table/table.css b/WebContent/VAADIN/themes/reindeer/table/table.css
index 6ddcd71a21..1d20e0ffdd 100644
--- a/WebContent/VAADIN/themes/reindeer/table/table.css
+++ b/WebContent/VAADIN/themes/reindeer/table/table.css
@@ -126,6 +126,10 @@
position: relative;
top: 1px;
-webkit-box-shadow: rgba(0,0,0,.5) 0 1px 2px;
+ -moz-box-shadow: rgba(0,0,0,.5) 0 1px 2px;
+}
+.v-table-borderless .v-table-scrollposition span {
+ top: 0;
}
/* row in column selector */
.v-contextmenu .v-on,
@@ -145,6 +149,16 @@
}
+/* Table on blue background */
+.blue .v-table-header-wrap {
+ border-color: #92a2aa;
+}
+.blue .v-table-body {
+ border-color: #92a2aa;
+ border-top-color: #c2c3c4;
+}
+
+
/* Strong style */
.v-table-strong .v-table-header-wrap {
border-color: #2b3033;
@@ -153,6 +167,9 @@
color: #e7e9ea;
text-shadow: #000 0 -1px 0;
}
+.v-table-strong .v-table-body {
+ border-top-color: #2b3033;
+}
.v-table-strong .v-table-resizer {
border-right-color: #1c1f21;
}
diff --git a/WebContent/VAADIN/themes/reindeer/textfield/img/bg-black.png b/WebContent/VAADIN/themes/reindeer/textfield/img/bg-black.png
index ed00223de9..54c41f8bd5 100644
--- a/WebContent/VAADIN/themes/reindeer/textfield/img/bg-black.png
+++ b/WebContent/VAADIN/themes/reindeer/textfield/img/bg-black.png
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/textfield/img/bg-border-image-black-focus.png b/WebContent/VAADIN/themes/reindeer/textfield/img/bg-border-image-black-focus.png
index 5c992745ec..9defe8108a 100644
--- a/WebContent/VAADIN/themes/reindeer/textfield/img/bg-border-image-black-focus.png
+++ b/WebContent/VAADIN/themes/reindeer/textfield/img/bg-border-image-black-focus.png
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/textfield/img/bg-border-image-black.png b/WebContent/VAADIN/themes/reindeer/textfield/img/bg-border-image-black.png
index c88b3d31ad..2f501f3866 100644
--- a/WebContent/VAADIN/themes/reindeer/textfield/img/bg-border-image-black.png
+++ b/WebContent/VAADIN/themes/reindeer/textfield/img/bg-border-image-black.png
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css
index 95b0984664..60350450d7 100644
--- a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css
+++ b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css
@@ -42,16 +42,14 @@ input.v-textfield-prompt {
background: transparent;
border-width: 0 3px 0 3px;
padding: 4px 0 0 0;
- height: 20px;
+ height: 21px;
-webkit-border-image: url(img/bg-border-image.png) 0 3 0 3 stretch stretch;
-moz-border-image: url(img/bg-border-image.png) 0 3 0 3 stretch stretch;
- -o-border-image: url(img/bg-border-image.png) 0 3 0 3 stretch stretch;
}
.v-sa input.v-textfield-focus,
.v-ff35 input.v-textfield-focus {
-webkit-border-image: url(img/bg-border-image-focus.png) 0 3 0 3 stretch stretch;
-moz-border-image: url(img/bg-border-image-focus.png) 0 3 0 3 stretch stretch;
- -o-border-image: url(img/bg-border-image-focus.png) 0 3 0 3 stretch stretch;
}
/* Small style textfield */
.v-app input.v-textfield-small,
@@ -74,10 +72,10 @@ input.v-textfield-prompt {
}
/* Textfield on black background */
.black .v-textfield {
- border-color: #343536;
- border-top-color: #2a2a2b;
- border-bottom-color: #3a3b3c;
- background: #1b1d1e;
+ border-color: #38393a;
+ border-top-color: #2c2d2e;
+ border-bottom-color: #3e3f3f;
+ background: #151717;
background-image: url(img/bg-black.png); /** sprite-ref: black-verticals; sprite-alignment: repeat; sprite-margin-bottom: 22px */
color: #c9ccce;
text-shadow: #000 0 0 1px;
@@ -86,23 +84,21 @@ input.v-textfield-prompt {
.v-window-black .v-textfield-focus,
.v-window .black .v-textfield-focus,
.v-popupview-popup .black .v-textfield-focus {
- border-color: #4e6a80;
- border-top-color: #3a5163;
- border-bottom-color: #557086;
+ border-color: #4b7192;
+ border-top-color: #3b5a75;
+ border-bottom-color: #507596;
}
/* Capable browsers get fancier border images */
.v-sa .black input.v-textfield,
.v-ff35 .black input.v-textfield {
-webkit-border-image: url(img/bg-border-image-black.png) 0 3 0 3 stretch stretch;
-moz-border-image: url(img/bg-border-image-black.png) 0 3 0 3 stretch stretch;
- -o-border-image: url(img/bg-border-image-black.png) 0 3 0 3 stretch stretch;
height: 19px;
}
.v-sa .black input.v-textfield-focus,
.v-ff35 .black input.v-textfield-focus {
-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;
}
.v-sa .black input.v-textfield-small,
.v-ff35 .black input.v-textfield-small {
@@ -124,6 +120,5 @@ input.v-textfield-readonly,
background: transparent;
-webkit-border-image: none;
-moz-border-image: none;
- -o-border-image: none;
border-width: 0;
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/content-bg-ie6.png b/WebContent/VAADIN/themes/reindeer/window/img/black/content-bg-ie6.png
index 39e712127e..8ff06a11ed 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/black/content-bg-ie6.png
+++ b/WebContent/VAADIN/themes/reindeer/window/img/black/content-bg-ie6.png
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/header-bg-ie6.png b/WebContent/VAADIN/themes/reindeer/window/img/black/header-bg-ie6.png
index c86b4b7bcd..ddfc27f6e6 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/black/header-bg-ie6.png
+++ b/WebContent/VAADIN/themes/reindeer/window/img/black/header-bg-ie6.png
Binary files differ
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/resize-ie6.png b/WebContent/VAADIN/themes/reindeer/window/img/black/resize-ie6.png
index ca9f912af5..011b64a918 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/black/resize-ie6.png
+++ b/WebContent/VAADIN/themes/reindeer/window/img/black/resize-ie6.png
Binary files differ