diff options
author | Artur Signell <artur@vaadin.com> | 2012-02-03 22:20:34 +0200 |
---|---|---|
committer | Artur Signell <artur@vaadin.com> | 2012-02-03 22:20:34 +0200 |
commit | 4ede774d6c121f51537078ae9890bbf44f835e12 (patch) | |
tree | 9a988f6575466981186e3d845901a05c1dbad6d9 /WebContent/VAADIN | |
parent | 1d590265134781e90eb8d1607b287c76cf090fa2 (diff) | |
parent | 98737932a588f1b4a8f8115f2545da63ae7f4e4a (diff) | |
download | vaadin-framework-4ede774d6c121f51537078ae9890bbf44f835e12.tar.gz vaadin-framework-4ede774d6c121f51537078ae9890bbf44f835e12.zip |
Merge commit '98737932a588f1b4a8f8115f2545da63ae7f4e4a'
Conflicts:
WebContent/VAADIN/themes/base/button/button.css
WebContent/VAADIN/themes/runo/button/button.css
tests/integration_tests.xml
Diffstat (limited to 'WebContent/VAADIN')
10 files changed, 488 insertions, 488 deletions
diff --git a/WebContent/VAADIN/themes/base/button/button.css b/WebContent/VAADIN/themes/base/button/button.css index 1bc7d3ac92..2e14d59a90 100644 --- a/WebContent/VAADIN/themes/base/button/button.css +++ b/WebContent/VAADIN/themes/base/button/button.css @@ -1,159 +1,159 @@ -/*
- * Default button (more customizable)
- * -------------------------------------- */
-.v-button {
- display: inline-block;
- zoom: 1;
- text-align: center;
- text-decoration: none;
- border: 2px outset #ddd;
- background: #eee;
- cursor: pointer;
- white-space: nowrap;
- margin: 0;
- padding: .2em 1em;
- color: inherit;
- font: inherit;
- line-height: normal;
- -khtml-user-select: none;
- -moz-user-select: none;
- -ie-user-select: none;
- user-select: none;
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- -ms-box-sizing: border-box;
- box-sizing: border-box;
-}
-
-.v-button.v-disabled {
- cursor: default;
-}
-
-.v-button-wrap,
-.v-button-caption {
- vertical-align: middle;
- white-space: nowrap;
- font: inherit;
- color: inherit;
- line-height: normal;
- }
-
-.v-button .v-icon,
-.v-nativebutton .v-icon {
- vertical-align: middle;
- margin-right: 3px;
- border: none;
- }
-
-.v-button .v-errorindicator,
-.v-nativebutton .v-errorindicator {
- display: inline-block;
- zoom: 1;
- vertical-align: middle;
- float: none;
-}
-
-/* Link style (we really should deprecate this) */
-.v-button-link,
-.v-nativebutton-link {
- border: none;
- text-align: left;
- background: transparent;
- padding: 0;
- color: inherit;
- -khtml-user-select: text;
- -moz-user-select: text;
- -ie-user-select: text;
- user-select: text;
-}
-
-/* Inset Safari focus outline a bit */
-.v-sa .v-button-link:focus{
- outline-offset: -3px;
- }
-
-.v-button-link .v-button-caption,
-.v-nativebutton-link .v-nativebutton-caption {
- text-decoration: underline;
- color: inherit;
- text-align: left;
- }
-
-
-/*
- * NativeButton styles (html button element)
- * -------------------------------------- */
-.v-nativebutton {
- text-align: center;
- cursor: pointer;
- white-space: nowrap;
- margin: 0;
- color: inherit;
- font: inherit;
- line-height: normal;
- }
-.v-nativebutton .v-nativebutton-caption {
- vertical-align: middle;
- white-space: nowrap;
- font: inherit;
- color: inherit;
- }
-
-.v-nativebutton .v-icon {
- vertical-align: middle;
- margin-right: 3px;
- }
-
-.v-nativebutton .v-errorindicator {
- display: inline-block;
- zoom: 1;
- float: none;
-}
-/* Fixes stretched buttons in IE7*/
-.v-ie .v-nativebutton {
- overflow: visible;
- padding-left: 1em;
- padding-right: 1em;
-}
-
-.v-ie .v-nativebutton-link {
- padding: 0;
-}
-
-/*
- * Checkbox styles
- * -------------------------------------- */
-
- .v-checkbox {
- display: block;
- }
-
-.v-checkbox,
-.v-checkbox label,
-.v-checkbox input,
-.v-checkbox .v-icon {
- vertical-align: middle;
- white-space: nowrap;
-}
-
-.v-checkbox .v-icon {
- margin: 0 2px;
-}
-.v-checkbox .v-errorindicator {
- float: none;
- display: inline;
- display: inline-block;
- zoom: 1;
-}
-
-
-/* Disabled by default
-.v-checkbox-error {
- background: #ffe0e0;
-}
-*/
-/* Disabled by default
-.v-checkbox-required {
- background: #ffe0e0;
-}
+/* + * Default button (more customizable) + * -------------------------------------- */ +.v-button { + display: inline-block; + zoom: 1; + text-align: center; + text-decoration: none; + border: 2px outset #ddd; + background: #eee; + cursor: pointer; + white-space: nowrap; + margin: 0; + padding: .2em 1em; + color: inherit; + font: inherit; + line-height: normal; + -khtml-user-select: none; + -moz-user-select: none; + -ie-user-select: none; + user-select: none; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; +} + +.v-button.v-disabled { + cursor: default; +} + +.v-button-wrap, +.v-button-caption { + vertical-align: middle; + white-space: nowrap; + font: inherit; + color: inherit; + line-height: normal; + } + +.v-button .v-icon, +.v-nativebutton .v-icon { + vertical-align: middle; + margin-right: 3px; + border: none; + } + +.v-button .v-errorindicator, +.v-nativebutton .v-errorindicator { + display: inline-block; + zoom: 1; + vertical-align: middle; + float: none; +} + +/* Link style (we really should deprecate this) */ +.v-button-link, +.v-nativebutton-link { + border: none; + text-align: left; + background: transparent; + padding: 0; + color: inherit; + -khtml-user-select: text; + -moz-user-select: text; + -ie-user-select: text; + user-select: text; +} + +/* Inset Safari focus outline a bit */ +.v-sa .v-button-link:focus{ + outline-offset: -3px; + } + +.v-button-link .v-button-caption, +.v-nativebutton-link .v-nativebutton-caption { + text-decoration: underline; + color: inherit; + text-align: left; + } + + +/* + * NativeButton styles (html button element) + * -------------------------------------- */ +.v-nativebutton { + text-align: center; + cursor: pointer; + white-space: nowrap; + margin: 0; + color: inherit; + font: inherit; + line-height: normal; + } +.v-nativebutton .v-nativebutton-caption { + vertical-align: middle; + white-space: nowrap; + font: inherit; + color: inherit; + } + +.v-nativebutton .v-icon { + vertical-align: middle; + margin-right: 3px; + } + +.v-nativebutton .v-errorindicator { + display: inline-block; + zoom: 1; + float: none; +} +/* Fixes stretched buttons in IE7*/ +.v-ie .v-nativebutton { + overflow: visible; + padding-left: 1em; + padding-right: 1em; +} + +.v-ie .v-nativebutton-link { + padding: 0; +} + +/* + * Checkbox styles + * -------------------------------------- */ + + .v-checkbox { + display: block; + } + +.v-checkbox, +.v-checkbox label, +.v-checkbox input, +.v-checkbox .v-icon { + vertical-align: middle; + white-space: nowrap; +} + +.v-checkbox .v-icon { + margin: 0 2px; +} +.v-checkbox .v-errorindicator { + float: none; + display: inline; + display: inline-block; + zoom: 1; +} + + +/* Disabled by default +.v-checkbox-error { + background: #ffe0e0; +} +*/ +/* Disabled by default +.v-checkbox-required { + background: #ffe0e0; +} */
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/notification/notification.css b/WebContent/VAADIN/themes/base/notification/notification.css index 9455c25a36..ccd5b8d218 100644 --- a/WebContent/VAADIN/themes/base/notification/notification.css +++ b/WebContent/VAADIN/themes/base/notification/notification.css @@ -27,13 +27,13 @@ } .v-Notification-tray p { display: block; -}
-.v-Notification-system {
- background-color: red;
- opacity: .7;
- filter: alpha(opacity=70);
-}
-.v-Notification-system h1 {
- display: block;
- margin: 0;
-}
+} +.v-Notification-system { + background-color: red; + opacity: .7; + filter: alpha(opacity=70); +} +.v-Notification-system h1 { + display: block; + margin: 0; +} diff --git a/WebContent/VAADIN/themes/base/table/table.css b/WebContent/VAADIN/themes/base/table/table.css index 877faf364f..653063ccb5 100644 --- a/WebContent/VAADIN/themes/base/table/table.css +++ b/WebContent/VAADIN/themes/base/table/table.css @@ -234,11 +234,11 @@ margin-top: -1px; margin-bottom: -1px; } -/* row in column selector */
+/* row in column selector */ .v-on { -
+ } -.v-off {
+.v-off { color: #ddd; } /************************************* diff --git a/WebContent/VAADIN/themes/runo/button/button.css b/WebContent/VAADIN/themes/runo/button/button.css index 530c981436..5515db5aec 100644 --- a/WebContent/VAADIN/themes/runo/button/button.css +++ b/WebContent/VAADIN/themes/runo/button/button.css @@ -1,156 +1,156 @@ -.v-button {
- padding: 1px;
- border: none;
- background: transparent;
- }
-
-.v-button:focus {
- outline: none;
- }
-
-.v-button:focus .v-button-wrap {
- border-color: #57a7ed;
- border-top-color: #60aef1;
- border-bottom-color: #4c9adf;
- -webkit-box-shadow: 0 0 2px #57a7ed;
- -moz-box-shadow: 0 0 2px #57a7ed;
- }
-
-.v-button:active .v-button-wrap,
-.v-button.v-pressed .v-button-wrap {
- background-position: 0 -79px;
- background-color: #e7e9e9;
- border-color: #b8bdbe;
- border-top-color: #9da1a2;
- border-bottom-color: #babfc0;
- border-color: rgba(146,151,152,.9);
- border-top-color: rgba(146,151,152,1);
- -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.4) inset;
- -moz-box-shadow: 0 1px 2px rgba(0,0,0,.4) inset;;
- text-shadow: none;
- }
-
-.v-button .v-button-wrap,
-.v-disabled.v-button .v-button-wrap {
- display: block;
- font-size: 12px;
- border: 1px solid #bdc1c2;
- border-top-color: #cbcfd0;
- border-bottom-color: #b6bbbb;
- border-color: rgba(146,151,152,.8);
- border-top-color: rgba(146,151,152,.6);
- background: #e6e8e8 url(img/bg.png) repeat-x;
- -webkit-background-origin: padding;
- -moz-background-origin: padding;
- padding: 3px 15px;
- -webkit-border-radius: 11px;
- -moz-border-radius: 11px;
- border-radius: 11px;
- line-height: 14px;
- min-height: 14px;
- -webkit-box-shadow: 0 1px 0 rgba(0,0,0,.15);
- -moz-box-shadow: 0 1px 0 rgba(0,0,0,.15);
- text-shadow: 0 1px 0 #fff;
- color: #464f52;
- overflow: hidden;
- text-overflow: ellipsis;
- }
-
-/* Small style */
-.v-button-small .v-button-wrap,
-.v-disabled.v-button-small .v-button-wrap {
- font-size: 11px;
- line-height: 13px;
- padding: 1px 12px;
- min-height: 13px;
- }
-
-
-/* Big style */
-.v-button-big .v-button-wrap,
-.v-disabled.v-button-big .v-button-wrap {
- font-size: 15px;
- line-height: 18px;
- padding: 4px 18px;
- min-height: 18px;
- -webkit-border-radius: 14px;
- -moz-border-radius: 14px;
- border-radius: 14px;
- }
-
-
-
-/* Default style */
-.v-button-default:focus .v-button-wrap {
- background-color: #60839a;
- background-position: 0 -158px;
- text-shadow: 0 -1px 0 #657883;
- }
-
-.v-button-default:active .v-button-wrap,
-.v-button-default.v-pressed .v-button-wrap {
- background-position: 0 -79px;
- background-color: #8f9898;
- border-color: #737e81;
- border-top-color: #576063;
- border-bottom-color: #747f82;
- color: #f0f2f2;
- text-shadow: 0 -1px 0 #5d6969;
- -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.4) inset;;
- -moz-box-shadow: 0 1px 2px rgba(0,0,0,.4) inset;;
- }
-
-.v-button-default .v-button-wrap,
-.v-disabled.v-button-default .v-button-wrap {
- border-color: #899395;
- border-top-color: #a4abae;
- border-bottom-color: #727b7d;
- background: #869090 url(img/bg-default.png) repeat-x;
- text-shadow: 0 -1px 0 #797e7e;
- color: #fff;
- font-weight: bold;
- -webkit-box-shadow: 0 1px 0 rgba(0,0,0,.22);
- -moz-box-shadow: 0 1px 0 rgba(0,0,0,.22);
- }
-
-
-
-
-/* Link style */
-.v-button-link,
-.v-disabled.v-button-link {
- padding: 0;
- }
-
-.v-button-link .v-button-wrap,
-.v-disabled.v-button-link .v-button-wrap,
-.v-button-link:active .v-button-wrap,
-.v-disabled.v-button-pressedv-button-link .v-button-wrap {
- border: none;
- background: transparent;
- padding: 0;
- font-size: 13px;
- -webkit-box-shadow: none;
- -mox-box-shadow: none;
- -webkit-border-radius: 0;
- -moz-border-radius: 0;
- border-radius: 0;
- text-shadow: none;
- }
-
-.v-button-link:focus {
- outline: 1px dotted #4897dc;
- }
-
-.v-button-link:focus .v-button-wrap {
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
- }
-
-
-
-
-/* Checkbox styles */
-.v-checkbox .v-errorindicator {
- padding-left: 10px;
+.v-button { + padding: 1px; + border: none; + background: transparent; + } + +.v-button:focus { + outline: none; + } + +.v-button:focus .v-button-wrap { + border-color: #57a7ed; + border-top-color: #60aef1; + border-bottom-color: #4c9adf; + -webkit-box-shadow: 0 0 2px #57a7ed; + -moz-box-shadow: 0 0 2px #57a7ed; + } + +.v-button:active .v-button-wrap, +.v-button.v-pressed .v-button-wrap { + background-position: 0 -79px; + background-color: #e7e9e9; + border-color: #b8bdbe; + border-top-color: #9da1a2; + border-bottom-color: #babfc0; + border-color: rgba(146,151,152,.9); + border-top-color: rgba(146,151,152,1); + -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.4) inset; + -moz-box-shadow: 0 1px 2px rgba(0,0,0,.4) inset;; + text-shadow: none; + } + +.v-button .v-button-wrap, +.v-disabled.v-button .v-button-wrap { + display: block; + font-size: 12px; + border: 1px solid #bdc1c2; + border-top-color: #cbcfd0; + border-bottom-color: #b6bbbb; + border-color: rgba(146,151,152,.8); + border-top-color: rgba(146,151,152,.6); + background: #e6e8e8 url(img/bg.png) repeat-x; + -webkit-background-origin: padding; + -moz-background-origin: padding; + padding: 3px 15px; + -webkit-border-radius: 11px; + -moz-border-radius: 11px; + border-radius: 11px; + line-height: 14px; + min-height: 14px; + -webkit-box-shadow: 0 1px 0 rgba(0,0,0,.15); + -moz-box-shadow: 0 1px 0 rgba(0,0,0,.15); + text-shadow: 0 1px 0 #fff; + color: #464f52; + overflow: hidden; + text-overflow: ellipsis; + } + +/* Small style */ +.v-button-small .v-button-wrap, +.v-disabled.v-button-small .v-button-wrap { + font-size: 11px; + line-height: 13px; + padding: 1px 12px; + min-height: 13px; + } + + +/* Big style */ +.v-button-big .v-button-wrap, +.v-disabled.v-button-big .v-button-wrap { + font-size: 15px; + line-height: 18px; + padding: 4px 18px; + min-height: 18px; + -webkit-border-radius: 14px; + -moz-border-radius: 14px; + border-radius: 14px; + } + + + +/* Default style */ +.v-button-default:focus .v-button-wrap { + background-color: #60839a; + background-position: 0 -158px; + text-shadow: 0 -1px 0 #657883; + } + +.v-button-default:active .v-button-wrap, +.v-button-default.v-pressed .v-button-wrap { + background-position: 0 -79px; + background-color: #8f9898; + border-color: #737e81; + border-top-color: #576063; + border-bottom-color: #747f82; + color: #f0f2f2; + text-shadow: 0 -1px 0 #5d6969; + -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.4) inset;; + -moz-box-shadow: 0 1px 2px rgba(0,0,0,.4) inset;; + } + +.v-button-default .v-button-wrap, +.v-disabled.v-button-default .v-button-wrap { + border-color: #899395; + border-top-color: #a4abae; + border-bottom-color: #727b7d; + background: #869090 url(img/bg-default.png) repeat-x; + text-shadow: 0 -1px 0 #797e7e; + color: #fff; + font-weight: bold; + -webkit-box-shadow: 0 1px 0 rgba(0,0,0,.22); + -moz-box-shadow: 0 1px 0 rgba(0,0,0,.22); + } + + + + +/* Link style */ +.v-button-link, +.v-disabled.v-button-link { + padding: 0; + } + +.v-button-link .v-button-wrap, +.v-disabled.v-button-link .v-button-wrap, +.v-button-link:active .v-button-wrap, +.v-disabled.v-button-pressedv-button-link .v-button-wrap { + border: none; + background: transparent; + padding: 0; + font-size: 13px; + -webkit-box-shadow: none; + -mox-box-shadow: none; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + text-shadow: none; + } + +.v-button-link:focus { + outline: 1px dotted #4897dc; + } + +.v-button-link:focus .v-button-wrap { + -webkit-box-shadow: none; + -moz-box-shadow: none; + } + + + + +/* Checkbox styles */ +.v-checkbox .v-errorindicator { + padding-left: 10px; } diff --git a/WebContent/VAADIN/themes/runo/datefield/datefield.css b/WebContent/VAADIN/themes/runo/datefield/datefield.css index 5b80a0a5db..0bfa060a09 100644 --- a/WebContent/VAADIN/themes/runo/datefield/datefield.css +++ b/WebContent/VAADIN/themes/runo/datefield/datefield.css @@ -3,138 +3,138 @@ height: 18px; } .v-datefield-button { - font-size:13px;
- width: 22px;
- height: 24px;
- padding: 0;
- overflow: hidden;
- border: none;
+ font-size:13px; + width: 22px; + height: 24px; + padding: 0; + overflow: hidden; + border: none; background: transparent url(img/open-button.png) no-repeat right 0; - vertical-align: top;
-}
-.v-datefield-popup {
- font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
- color: #464f52;
- font-size: 12px;
- background: #f6f7f7;
- border: 1px solid #b6bbbc;
+ vertical-align: top; +} +.v-datefield-popup { + font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif; + color: #464f52; + font-size: 12px; + background: #f6f7f7; + border: 1px solid #b6bbbc; padding: 2px 6px; -webkit-border-radius: 4px; -moz-border-radius: 4px; - border-radius: 4px;
-}
-.v-datefield-calendarpanel {
- width: 230px;
-}
-.v-datefield-popup .v-datefield-calendarpanel {
- width: 200px;
+ border-radius: 4px; +} +.v-datefield-calendarpanel { + width: 230px; +} +.v-datefield-popup .v-datefield-calendarpanel { + width: 200px; } .v-datefield-year .v-datefield-calendarpanel { width: 100px; -}
-.v-datefield-calendarpanel td {
- text-align: right;
-}
-.v-datefield-calendarpanel td span {
- display: block;
-}
-.v-datefield-calendarpanel-header {
+} +.v-datefield-calendarpanel td { + text-align: right; +} +.v-datefield-calendarpanel td span { + display: block; +} +.v-datefield-calendarpanel-header { height: 30px; - font-size: 13px;
-}
-td.v-datefield-calendarpanel-month {
- font-weight: bold;
+ font-size: 13px; +} +td.v-datefield-calendarpanel-month { + font-weight: bold; text-shadow: 0 1px 0 #fff; - width: 150px;
+ width: 150px; } .v-datefield-calendarpanel-prevyear, .v-datefield-calendarpanel-nextyear, .v-datefield-calendarpanel-prevmonth, .v-datefield-calendarpanel-nextmonth { width: 16px; -}
-/* Year buttons */
-.v-datefield-calendarpanel .v-button-prevyear,
-.v-datefield-calendarpanel .v-button-nextyear {
- display: block;
- width: 16px;
- height: 16px;
- border: none;
- padding: 0;
- background: transparent url(img/prevyear.png) no-repeat;
- text-indent: -90000px;
- margin: 0 auto;
-}
-.v-datefield-calendarpanel .v-button-nextyear {
- background: transparent url(img/nextyear.png) no-repeat;
-}
-.v-datefield-calendarpanel .v-button-prevyear:hover,
-.v-datefield-calendarpanel .v-button-nextyear:hover {
- background-position: left bottom;
-}
-/* Month buttons */
-.v-datefield-calendarpanel .v-button-prevmonth,
-.v-datefield-calendarpanel .v-button-nextmonth {
- display: block;
- width: 11px;
- height: 16px;
- border: none;
- padding: 0;
- background: transparent url(img/prevmonth.png) no-repeat;
- text-indent: -90000px;
- margin: 0 auto;
-}
-.v-datefield-calendarpanel .v-button-nextmonth {
- background: transparent url(img/nextmonth.png) no-repeat;
-}
-.v-datefield-calendarpanel .v-button-prevmonth:hover,
-.v-datefield-calendarpanel .v-button-nextmonth:hover {
- background-position: left bottom;
-}
-.v-datefield-calendarpanel strong {
- color: #ee5311;
- display: block;
+} +/* Year buttons */ +.v-datefield-calendarpanel .v-button-prevyear, +.v-datefield-calendarpanel .v-button-nextyear { + display: block; + width: 16px; + height: 16px; + border: none; + padding: 0; + background: transparent url(img/prevyear.png) no-repeat; + text-indent: -90000px; + margin: 0 auto; +} +.v-datefield-calendarpanel .v-button-nextyear { + background: transparent url(img/nextyear.png) no-repeat; +} +.v-datefield-calendarpanel .v-button-prevyear:hover, +.v-datefield-calendarpanel .v-button-nextyear:hover { + background-position: left bottom; +} +/* Month buttons */ +.v-datefield-calendarpanel .v-button-prevmonth, +.v-datefield-calendarpanel .v-button-nextmonth { + display: block; + width: 11px; + height: 16px; + border: none; + padding: 0; + background: transparent url(img/prevmonth.png) no-repeat; + text-indent: -90000px; + margin: 0 auto; +} +.v-datefield-calendarpanel .v-button-nextmonth { + background: transparent url(img/nextmonth.png) no-repeat; +} +.v-datefield-calendarpanel .v-button-prevmonth:hover, +.v-datefield-calendarpanel .v-button-nextmonth:hover { + background-position: left bottom; +} +.v-datefield-calendarpanel strong { + color: #ee5311; + display: block; width: 20px; - font-size: 12px;
-}
-.v-datefield-calendarpanel-day,
+ font-size: 12px; +} +.v-datefield-calendarpanel-day, .v-datefield-calendarpanel-weeknumber, -.v-datefield-calendarpanel-day-today {
- padding: 1px 3px;
- width: 14px;
- height: 16px;
-}
-.v-datefield-calendarpanel-day-today {
- border: 1px solid #429ce9;
- width: 12px;
- height: 14px
-}
-.v-datefield-calendarpanel-day-entry {
- color: #6a98b5;
-}
-.v-datefield-calendarpanel-day-disabled {
- font-weight: normal;
- color: #dddddd;
-}
-.v-datefield-calendarpanel-day-entry.v-datefield-calendarpanel-day-disabled {
- color: #afd6f8;
-}
-.v-datefield-calendarpanel-day-selected {
- font-weight: bold;
- width: 14px;
- height: 16px;
- color: #fff;
- padding: 1px 3px;
- background: transparent url(img/selected-bg.png) no-repeat 50% 50%;
- border: none;
-}
-.v-datefield-time {
- font-size: 11px;
-}
-.v-datefield-time .v-select {
- font-size: 10px;
- padding: 0;
- margin: 0;
+.v-datefield-calendarpanel-day-today { + padding: 1px 3px; + width: 14px; + height: 16px; +} +.v-datefield-calendarpanel-day-today { + border: 1px solid #429ce9; + width: 12px; + height: 14px +} +.v-datefield-calendarpanel-day-entry { + color: #6a98b5; +} +.v-datefield-calendarpanel-day-disabled { + font-weight: normal; + color: #dddddd; +} +.v-datefield-calendarpanel-day-entry.v-datefield-calendarpanel-day-disabled { + color: #afd6f8; +} +.v-datefield-calendarpanel-day-selected { + font-weight: bold; + width: 14px; + height: 16px; + color: #fff; + padding: 1px 3px; + background: transparent url(img/selected-bg.png) no-repeat 50% 50%; + border: none; +} +.v-datefield-time { + font-size: 11px; +} +.v-datefield-time .v-select { + font-size: 10px; + padding: 0; + margin: 0; } .v-datefield-rendererror .v-textfield { background: #ff9999; diff --git a/WebContent/VAADIN/themes/runo/notification/notification.css b/WebContent/VAADIN/themes/runo/notification/notification.css index bc9b3f665d..1d9f868a14 100644 --- a/WebContent/VAADIN/themes/runo/notification/notification.css +++ b/WebContent/VAADIN/themes/runo/notification/notification.css @@ -59,9 +59,9 @@ line-height: 1.2; margin: 4px 10px 5px 10px; color: #e4e7ea; -}
-.v-Notification-system {
+} +.v-Notification-system { background-color: #ff0a0a; font-size: .9em; - padding: 14px 32px;
+ padding: 14px 32px; }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.css index 9c6559b0f3..7028b3ed16 100644 --- a/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.css +++ b/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.css @@ -103,10 +103,10 @@ background-color: #fff; border-bottom: 1px solid #dee2e3; border-top: none; -}
-.v-tabsheet-hidetabs .v-tabsheet-content {
- border-top: 1px solid #b5babb;
-}
+} +.v-tabsheet-hidetabs .v-tabsheet-content { + border-top: 1px solid #b5babb; +} .v-tabsheet-deco { height: 10px; background: transparent url(../panel/img/bottom-right.png) repeat-x right top; diff --git a/WebContent/VAADIN/themes/tests-components/styles.css b/WebContent/VAADIN/themes/tests-components/styles.css index da173964f4..c38f32f132 100644 --- a/WebContent/VAADIN/themes/tests-components/styles.css +++ b/WebContent/VAADIN/themes/tests-components/styles.css @@ -1,39 +1,39 @@ -@import url(../reindeer/styles.css);
-
-.missing {
- color: red;
- font-weight: bold;
-}
-
-.v-tree-node-caption-red {
- color: red;
-}
-
-.v-tree-node-caption-green {
- color: green;
-}
-
-.v-tree-node-caption-blue {
- color: blue;
-}
-
-.v-tree-node-caption-bold {
- font-weight: bold;
-}
-
-.background-lightblue {
- background: lightblue;
-}
-
-.border-red-1px {
- border: 1px solid red;
-}
-
-.border-blue-2px {
- border: 2px solid blue;
-}
-
-.v-table-row-tables-test-cell-style-red-row,
-.v-table-cell-content-tables-test-cell-style-red-row {
- background: #f00;
+@import url(../reindeer/styles.css); + +.missing { + color: red; + font-weight: bold; +} + +.v-tree-node-caption-red { + color: red; +} + +.v-tree-node-caption-green { + color: green; +} + +.v-tree-node-caption-blue { + color: blue; +} + +.v-tree-node-caption-bold { + font-weight: bold; +} + +.background-lightblue { + background: lightblue; +} + +.border-red-1px { + border: 1px solid red; +} + +.border-blue-2px { + border: 2px solid blue; +} + +.v-table-row-tables-test-cell-style-red-row, +.v-table-cell-content-tables-test-cell-style-red-row { + background: #f00; }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1975.html b/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1975.html index 26b6548dd0..9c7a6942c9 100644 --- a/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1975.html +++ b/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1975.html @@ -1 +1 @@ -<b>Testing custom layout..</b>
+<b>Testing custom layout..</b> diff --git a/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket2022.html b/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket2022.html index 430548173d..6bde912879 100644 --- a/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket2022.html +++ b/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket2022.html @@ -1,2 +1,2 @@ <div>This is an utf-8 string: åäöéèáèë<br/> -The same in ISO-8859-1: åäöéèáèë</div>
+The same in ISO-8859-1: åäöéèáèë</div> |