diff options
author | Jouni Koivuviita <jouni.koivuviita@itmill.com> | 2009-10-05 09:27:19 +0000 |
---|---|---|
committer | Jouni Koivuviita <jouni.koivuviita@itmill.com> | 2009-10-05 09:27:19 +0000 |
commit | e6a00c35b9bf2575292da98b6ec5e38ad27f3b21 (patch) | |
tree | fd4dbcadd8384cde795fc6871565e3a6d91e9a3e /WebContent/VAADIN/themes/reindeer | |
parent | 9e0a7ff98936a0b2abed0fa17c33157d9d1312b2 (diff) | |
download | vaadin-framework-e6a00c35b9bf2575292da98b6ec5e38ad27f3b21.tar.gz vaadin-framework-e6a00c35b9bf2575292da98b6ec5e38ad27f3b21.zip |
Fixes #3471: Notification "styles" (i.e. types) should work similarly to other component stylenames
svn changeset:9073/svn branch:6.2
Diffstat (limited to 'WebContent/VAADIN/themes/reindeer')
-rw-r--r-- | WebContent/VAADIN/themes/reindeer/notification/notification.css | 12 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/reindeer/styles.css | 34 |
2 files changed, 23 insertions, 23 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/notification/notification.css b/WebContent/VAADIN/themes/reindeer/notification/notification.css index f266f0576d..62a45d9d86 100644 --- a/WebContent/VAADIN/themes/reindeer/notification/notification.css +++ b/WebContent/VAADIN/themes/reindeer/notification/notification.css @@ -10,29 +10,29 @@ .v-Notification p { line-height: 1.3; } -.v-Notification.warning { +.v-Notification-warning { background: #fdf3b5; color: #ca9a61; border: 3px solid #fee3af; } -.v-Notification.error { +.v-Notification-error { background: #b40000 url(img/error-close.png) no-repeat right top; border: 3px solid #ca3030; } -.v-Notification.tray { +.v-Notification-tray { margin: 0 5px 5px 0; background: #3b3c3e; border: 2px solid #585b5c; padding: 0.8em 0.9em; } -.v-Notification.tray h1 { +.v-Notification-tray h1 { font-size: 14px; line-height: 18px; } -.v-Notification.tray p { +.v-Notification-tray p { font-size: 12px; font-weight: normal; } -.v-Notification.system { +.v-Notification-system { background-color: #b40000; }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css index f1d5c4d60c..da13566aec 100644 --- a/WebContent/VAADIN/themes/reindeer/styles.css +++ b/WebContent/VAADIN/themes/reindeer/styles.css @@ -664,36 +664,36 @@ div.v-app-loading { } .v-Notification h1, .v-Notification p, -.v-Notification.error h1, -.v-Notification.error p, -.v-Notification.warning h1, -.v-Notification.warning p { +.v-Notification-error h1, +.v-Notification-error p, +.v-Notification-warning h1, +.v-Notification-warning p { display: inline; white-space: nowrap; margin: 0 0.5em 0 0; } -.v-Notification.warning { +.v-Notification-warning { background: orange; } -.v-Notification.error { +.v-Notification-error { background: red; } -.v-Notification.tray h1 { +.v-Notification-tray h1 { display: block; } -.v-Notification.tray p { +.v-Notification-tray p { display: block; } -.v-Notification.system { +.v-Notification-system { background-color: red; opacity: .7; filter: alpha(opacity=70); } -.v-Notification.system h1 { +.v-Notification-system h1 { display: block; margin: 0; } -.v-Notification.system p { +.v-Notification-system p { white-space: nowrap; } @@ -3021,30 +3021,30 @@ td.v-datefield-calendarpanel-nextyear { .v-Notification p { line-height: 1.3; } -.v-Notification.warning { +.v-Notification-warning { background: #fdf3b5; color: #ca9a61; border: 3px solid #fee3af; } -.v-Notification.error { +.v-Notification-error { background: #b40000 url(notification/img/error-close.png) no-repeat right top; border: 3px solid #ca3030; } -.v-Notification.tray { +.v-Notification-tray { margin: 0 5px 5px 0; background: #3b3c3e; border: 2px solid #585b5c; padding: 0.8em 0.9em; } -.v-Notification.tray h1 { +.v-Notification-tray h1 { font-size: 14px; line-height: 18px; } -.v-Notification.tray p { +.v-Notification-tray p { font-size: 12px; font-weight: normal; } -.v-Notification.system { +.v-Notification-system { background-color: #b40000; } |