Reindeer theme update: inline datefield now works on black background.

svn changeset:7960/svn branch:6.0

diff --git a/WebContent/VAADIN/themes/reindeer/button/button.css b/WebContent/VAADIN/themes/reindeer/button/button.css
index 35973b057c72868dbfc8fe6ad24d017c6155a401..afe8fa45125d9659b30301bea21431e5da60eea3 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/button/button.css
+++ b/WebContent/VAADIN/themes/reindeer/button/button.css
@@ -366,8 +366,7 @@ div > .v-button.v-button-link:active .v-button-caption,
 }
 /* Buttons on black background */
 .v-ie6 .black .v-button {
-       border: 1px solid #505354;
-       border-bottom-color: #313435;
+       border: 1px solid #0d0e0f;
        background: #202224 url(img/black/right.png) no-repeat 0 -1px;
        color: #c9ccce;
 }

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 297bb0add4575a97720ee8b1e56bf4d7b7ed840c..1f0bc9fdae1c973dc353d77d9b0bbf95fdf052aa 100644 (file)
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 ffd2cc35e98d0e803802684c4b4983120e54f20b..06b80e758dde3d8f61b9f0c81634e1be227b1cac 100644 (file)
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/datefield/datefield.css b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css
index 8c39a3403688ee93ce39a79253894d70b3b31682..b6c507c17f93e1c066badc2611beb1b25cc9b8ed 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css
+++ b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css
@@ -257,4 +257,87 @@ td.v-datefield-calendarpanel-nextyear {
 /* Small adjustment for IE6 */
 .v-ie6 .v-datefield-popupcalendar .v-datefield-button {
        margin-top: 1px;
+}
+
+
+/*------------
+* on black background
+*/
+
+.black td.v-datefield-calendarpanel-month {
+       background-image: url(img/header-bg-black.png); /** sprite-ref: black-verticals; sprite-alignment: repeat */
+       height: 21px;
+}
+.black span.v-datefield-calendarpanel-month {
+       border-left: 1px solid #333638;
+       border-right: 1px solid #232527;
+       text-shadow: #000 0 -1px 0;
+}
+.black .v-datefield-calendarpanel-prevyear button,
+.black .v-datefield-calendarpanel-nextyear button,
+.black .v-datefield-calendarpanel-prevmonth button,
+.black .v-datefield-calendarpanel-nextmonth button {
+       background-image: url(img/year-prev-black.png); /** sprite-ref: black-verticals */
+       height: 21px;
+}
+.black .v-datefield-calendarpanel-nextyear button {
+       background-image: url(img/year-next-black.png); /** sprite-ref: black-verticals */
+}
+.black .v-datefield-calendarpanel-prevyear button:active,
+.v-ie .black .v-datefield-calendarpanel-prevyear button.v-pressed {
+       background-image: url(img/year-prev-black-pressed.png); /** sprite-ref: black-verticals */
+}
+.black .v-datefield-calendarpanel-nextyear button:active,
+.v-ie .black .v-datefield-calendarpanel-nextyear button.v-pressed  {
+       background-image: url(img/year-next-black-pressed.png); /** sprite-ref: black-verticals */
+}
+.black .v-datefield-calendarpanel-prevmonth,
+.black .v-datefield-calendarpanel-nextmonth {
+       background-image: url(img/header-bg-black.png); /** sprite-ref: black-verticals; sprite-alignment: repeat */
+}
+.black .v-datefield-calendarpanel-prevmonth button,
+.black .v-datefield-calendarpanel-nextmonth button {
+       border-left: 1px solid #333638;
+       border-right: 1px solid #232527;
+       background-image: url(img/month-prev-black.png); /** sprite-ref: black-verticals; sprite-alignment: center */
+       margin-top: 0;
+}
+.black .v-datefield-calendarpanel-nextmonth button {
+       background-image: url(img/month-next-black.png); /** sprite-ref: black-verticals; sprite-alignment: center */
+}
+.black .v-datefield-calendarpanel-prevmonth button:active,
+.v-ie .black .v-datefield-calendarpanel-prevmonth button.v-pressed {
+       background-image: url(img/month-prev-black-pressed.png); /** sprite-ref: black-verticals; sprite-alignment: center */
+}
+.black .v-datefield-calendarpanel-nextmonth button:active,
+.v-ie .black .v-datefield-calendarpanel-nextmonth button.v-pressed {
+       background-image: url(img/month-next-black-pressed.png); /** sprite-ref: black-verticals; sprite-alignment: center */
+}
+.v-ie .black .v-datefield-calendarpanel-prevmonth button,
+.v-ie .black .v-datefield-calendarpanel-nextmonth button {
+       border: none;
+}
+.black .v-datefield-calendarpanel-weekdays td {
+       background-image: url(img/weekday-bg-black.png); /** sprite-ref: black-verticals; sprite-alignment: repeat; sprite-margin-bottom: 3px */
+       color: #0a0b0b;
+       text-shadow: #5a5c5e 0 1px 0;
+}
+.black .v-datefield-calendarpanel-weekdays strong {
+       border-top-color: #1b1c1d;
+}
+.black .v-datefield-calendarpanel .v-first {
+       background-image: url(img/weekday-first-black.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 3px */
+}
+.black .v-datefield-calendarpanel .v-last {
+       background-image: url(img/weekday-last-black.png); /** sprite-ref: black-verticals; sprite-alignment: right */
+}
+/* IE fails to position backgrounds inside table element */
+.v-ie .black .v-datefield-calendarpanel-weekdays td {
+       background: url(img/weekday-bg-black.png) repeat-x;
+}
+.v-ie .black .v-datefield-calendarpanel .v-first {
+       background: url(img/weekday-first-black.png) no-repeat;
+}
+.v-ie .black .v-datefield-calendarpanel .v-last {
+       background: url(img/weekday-last-black.png) no-repeat right top;
 }
\ No newline at end of file

diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/header-bg-black-pressed.png b/WebContent/VAADIN/themes/reindeer/datefield/img/header-bg-black-pressed.png
new file mode 100644 (file)
index 0000000..4da33f2
Binary files /dev/null and b/WebContent/VAADIN/themes/reindeer/datefield/img/header-bg-black-pressed.png differ

diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/header-bg-black.png b/WebContent/VAADIN/themes/reindeer/datefield/img/header-bg-black.png
new file mode 100644 (file)
index 0000000..9451754
Binary files /dev/null and b/WebContent/VAADIN/themes/reindeer/datefield/img/header-bg-black.png differ

diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/month-next-black-pressed.png b/WebContent/VAADIN/themes/reindeer/datefield/img/month-next-black-pressed.png
new file mode 100644 (file)
index 0000000..f4c54cd
Binary files /dev/null and b/WebContent/VAADIN/themes/reindeer/datefield/img/month-next-black-pressed.png differ

diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/month-next-black.png b/WebContent/VAADIN/themes/reindeer/datefield/img/month-next-black.png
new file mode 100644 (file)
index 0000000..37001e2
Binary files /dev/null and b/WebContent/VAADIN/themes/reindeer/datefield/img/month-next-black.png differ

diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/month-prev-black-pressed.png b/WebContent/VAADIN/themes/reindeer/datefield/img/month-prev-black-pressed.png
new file mode 100644 (file)
index 0000000..d57ed56
Binary files /dev/null and b/WebContent/VAADIN/themes/reindeer/datefield/img/month-prev-black-pressed.png differ

diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/month-prev-black.png b/WebContent/VAADIN/themes/reindeer/datefield/img/month-prev-black.png
new file mode 100644 (file)
index 0000000..2d525f5
Binary files /dev/null and b/WebContent/VAADIN/themes/reindeer/datefield/img/month-prev-black.png differ

diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/weekday-bg-black.png b/WebContent/VAADIN/themes/reindeer/datefield/img/weekday-bg-black.png
new file mode 100644 (file)
index 0000000..f64cdaf
Binary files /dev/null and b/WebContent/VAADIN/themes/reindeer/datefield/img/weekday-bg-black.png differ

diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/weekday-first-black.png b/WebContent/VAADIN/themes/reindeer/datefield/img/weekday-first-black.png
new file mode 100644 (file)
index 0000000..ff6ee7b
Binary files /dev/null and b/WebContent/VAADIN/themes/reindeer/datefield/img/weekday-first-black.png differ

diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/weekday-last-black.png b/WebContent/VAADIN/themes/reindeer/datefield/img/weekday-last-black.png
new file mode 100644 (file)
index 0000000..984d2c2
Binary files /dev/null and b/WebContent/VAADIN/themes/reindeer/datefield/img/weekday-last-black.png differ

diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/year-next-black-pressed.png b/WebContent/VAADIN/themes/reindeer/datefield/img/year-next-black-pressed.png
new file mode 100644 (file)
index 0000000..038f461
Binary files /dev/null and b/WebContent/VAADIN/themes/reindeer/datefield/img/year-next-black-pressed.png differ

diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/year-next-black.png b/WebContent/VAADIN/themes/reindeer/datefield/img/year-next-black.png
new file mode 100644 (file)
index 0000000..45c762f
Binary files /dev/null and b/WebContent/VAADIN/themes/reindeer/datefield/img/year-next-black.png differ

diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/year-prev-black-pressed.png b/WebContent/VAADIN/themes/reindeer/datefield/img/year-prev-black-pressed.png
new file mode 100644 (file)
index 0000000..3df767e
Binary files /dev/null and b/WebContent/VAADIN/themes/reindeer/datefield/img/year-prev-black-pressed.png differ

diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/year-prev-black.png b/WebContent/VAADIN/themes/reindeer/datefield/img/year-prev-black.png
new file mode 100644 (file)
index 0000000..05b7178
Binary files /dev/null and b/WebContent/VAADIN/themes/reindeer/datefield/img/year-prev-black.png differ

diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index fd6107c3d1f83c86e1400887f4435096dec2191a..3ce2f09d4ecf1ea8e4a94de947ddc1785e9760b4 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/styles.css
+++ b/WebContent/VAADIN/themes/reindeer/styles.css
@@ -2062,8 +2062,7 @@ div > .v-button.v-button-link:active .v-button-caption,
 }
 /* Buttons on black background */
 .v-ie6 .black .v-button {
-       border: 1px solid #505354;
-       border-bottom-color: #313435;
+       border: 1px solid #0d0e0f;
        background: #202224 url(button/img/black/right.png) no-repeat 0 -1px;
        color: #c9ccce;
 }
@@ -2508,6 +2507,115 @@ td.v-datefield-calendarpanel-nextyear {
        margin-top: 1px;
 }
 
+
+/*------------
+* on black background
+*/
+
+.black td.v-datefield-calendarpanel-month {
+  background-image: url(common/img/black-vertical-sprites.png);
+  -background-image: url(common/img/black-vertical-sprites-ie6.png);
+  background-position: left -46px;
+       height: 21px;
+}
+.black span.v-datefield-calendarpanel-month {
+       border-left: 1px solid #333638;
+       border-right: 1px solid #232527;
+       text-shadow: #000 0 -1px 0;
+}
+.black .v-datefield-calendarpanel-prevyear button,
+.black .v-datefield-calendarpanel-nextyear button,
+.black .v-datefield-calendarpanel-prevmonth button,
+.black .v-datefield-calendarpanel-nextmonth button {
+  background-image: url(common/img/black-vertical-sprites.png);
+  -background-image: url(common/img/black-vertical-sprites-ie6.png);
+  background-position: left -67px;
+       height: 21px;
+}
+.black .v-datefield-calendarpanel-nextyear button {
+  background-image: url(common/img/black-vertical-sprites.png);
+  -background-image: url(common/img/black-vertical-sprites-ie6.png);
+  background-position: left -88px;
+}
+.black .v-datefield-calendarpanel-prevyear button:active,
+.v-ie .black .v-datefield-calendarpanel-prevyear button.v-pressed {
+  background-image: url(common/img/black-vertical-sprites.png);
+  -background-image: url(common/img/black-vertical-sprites-ie6.png);
+  background-position: left -109px;
+}
+.black .v-datefield-calendarpanel-nextyear button:active,
+.v-ie .black .v-datefield-calendarpanel-nextyear button.v-pressed  {
+  background-image: url(common/img/black-vertical-sprites.png);
+  -background-image: url(common/img/black-vertical-sprites-ie6.png);
+  background-position: left -130px;
+}
+.black .v-datefield-calendarpanel-prevmonth,
+.black .v-datefield-calendarpanel-nextmonth {
+  background-image: url(common/img/black-vertical-sprites.png);
+  -background-image: url(common/img/black-vertical-sprites-ie6.png);
+  background-position: left -151px;
+}
+.black .v-datefield-calendarpanel-prevmonth button,
+.black .v-datefield-calendarpanel-nextmonth button {
+       border-left: 1px solid #333638;
+       border-right: 1px solid #232527;
+  background-image: url(common/img/black-vertical-sprites.png);
+  -background-image: url(common/img/black-vertical-sprites-ie6.png);
+  background-position: center -172px;
+       margin-top: 0;
+}
+.black .v-datefield-calendarpanel-nextmonth button {
+  background-image: url(common/img/black-vertical-sprites.png);
+  -background-image: url(common/img/black-vertical-sprites-ie6.png);
+  background-position: center -193px;
+}
+.black .v-datefield-calendarpanel-prevmonth button:active,
+.v-ie .black .v-datefield-calendarpanel-prevmonth button.v-pressed {
+  background-image: url(common/img/black-vertical-sprites.png);
+  -background-image: url(common/img/black-vertical-sprites-ie6.png);
+  background-position: center -214px;
+}
+.black .v-datefield-calendarpanel-nextmonth button:active,
+.v-ie .black .v-datefield-calendarpanel-nextmonth button.v-pressed {
+  background-image: url(common/img/black-vertical-sprites.png);
+  -background-image: url(common/img/black-vertical-sprites-ie6.png);
+  background-position: center -235px;
+}
+.v-ie .black .v-datefield-calendarpanel-prevmonth button,
+.v-ie .black .v-datefield-calendarpanel-nextmonth button {
+       border: none;
+}
+.black .v-datefield-calendarpanel-weekdays td {
+  background-image: url(common/img/black-vertical-sprites.png);
+  -background-image: url(common/img/black-vertical-sprites-ie6.png);
+  background-position: left -256px;
+       color: #0a0b0b;
+       text-shadow: #5a5c5e 0 1px 0;
+}
+.black .v-datefield-calendarpanel-weekdays strong {
+       border-top-color: #1b1c1d;
+}
+.black .v-datefield-calendarpanel .v-first {
+  background-image: url(common/img/black-vertical-sprites.png);
+  -background-image: url(common/img/black-vertical-sprites-ie6.png);
+  background-position: left -275px;
+}
+.black .v-datefield-calendarpanel .v-last {
+  background-image: url(common/img/black-vertical-sprites.png);
+  -background-image: url(common/img/black-vertical-sprites-ie6.png);
+  background-position: right -294px;
+}
+/* IE fails to position backgrounds inside table element */
+.v-ie .black .v-datefield-calendarpanel-weekdays td {
+       background: url(datefield/img/weekday-bg-black.png) repeat-x;
+}
+.v-ie .black .v-datefield-calendarpanel .v-first {
+       background: url(datefield/img/weekday-first-black.png) no-repeat;
+}
+.v-ie .black .v-datefield-calendarpanel .v-last {
+       background: url(datefield/img/weekday-last-black.png) no-repeat right top;
+}
+
 /* ./WebContent/VAADIN/themes/reindeer/formlayout/formlayout.css */
 .v-formlayout-cell .v-errorindicator {
        width: 13px;
@@ -2942,7 +3050,7 @@ td.v-datefield-calendarpanel-nextyear {
 .black .v-filterselect {
   background-image: url(common/img/black-vertical-sprites.png);
   -background-image: url(common/img/black-vertical-sprites-ie6.png);
-  background-position: left -46px;
+  background-position: left -310px;
 }
 .v-app .black .v-filterselect-input,
 .v-window .black .v-filterselect-input,
@@ -2950,37 +3058,37 @@ td.v-datefield-calendarpanel-nextyear {
        color: #c9ccce;
   background-image: url(common/img/black-vertical-sprites.png);
   -background-image: url(common/img/black-vertical-sprites-ie6.png);
-  background-position: left -70px;
+  background-position: left -334px;
 }
 .black .v-filterselect-focus {
   background-image: url(common/img/black-vertical-sprites.png);
   -background-image: url(common/img/black-vertical-sprites-ie6.png);
-  background-position: left -94px;
+  background-position: left -358px;
 }
 .black .v-filterselect-focus .v-filterselect-input {
   background-image: url(common/img/black-vertical-sprites.png);
   -background-image: url(common/img/black-vertical-sprites-ie6.png);
-  background-position: left -118px;
+  background-position: left -382px;
 }
 .black .v-filterselect-button {
   background-image: url(common/img/black-vertical-sprites.png);
   -background-image: url(common/img/black-vertical-sprites-ie6.png);
-  background-position: left -142px;
+  background-position: left -406px;
 }
 .black .v-filterselect-button:hover {
   background-image: url(common/img/black-vertical-sprites.png);
   -background-image: url(common/img/black-vertical-sprites-ie6.png);
-  background-position: left -166px;
+  background-position: left -430px;
 }
 .black .v-filterselect-button:active {
   background-image: url(common/img/black-vertical-sprites.png);
   -background-image: url(common/img/black-vertical-sprites-ie6.png);
-  background-position: left -190px;
+  background-position: left -454px;
 }
 .black .v-filterselect-focus .v-filterselect-button {
   background-image: url(common/img/black-vertical-sprites.png);
   -background-image: url(common/img/black-vertical-sprites-ie6.png);
-  background-position: left -214px;
+  background-position: left -478px;
 }
 .black .v-filterselect-focus .v-filterselect-button:hover {
   background-image: url(common/img/vertical-sprites.png);
@@ -2990,7 +3098,7 @@ td.v-datefield-calendarpanel-nextyear {
 .black .v-filterselect-focus .v-filterselect-button:active {
   background-image: url(common/img/black-vertical-sprites.png);
   -background-image: url(common/img/black-vertical-sprites-ie6.png);
-  background-position: left -238px;
+  background-position: left -502px;
 }
 .black .v-disabled .v-filterselect-button:hover,
 .black .v-readonly .v-filterselect-button:hover {
@@ -3474,7 +3582,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 -262px;
+  background-position: left -526px;
        color: #c9ccce;
        text-shadow: #000 0 0 1px;
 }