Fixes #3471: Notification "styles" (i.e. types) should work similarly to other compon...

svn changeset:9072/svn branch:6.1

diff --git a/WebContent/VAADIN/themes/base/notification/notification.css b/WebContent/VAADIN/themes/base/notification/notification.css
index 514d274488d74621703d3d33e360c6af0fb35709..6ab069b08c6f96381709f07c2c1380a3620ae290 100644 (file)
--- a/WebContent/VAADIN/themes/base/notification/notification.css
+++ b/WebContent/VAADIN/themes/base/notification/notification.css
@@ -7,35 +7,35 @@
 }
 .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;
 }\r
-.v-Notification.system {\r
+.v-Notification-system {\r
        background-color: red;\r
        opacity: .7;\r
        filter: alpha(opacity=70);\r
 }\r
-.v-Notification.system h1 {\r
+.v-Notification-system h1 {\r
        display: block;\r
        margin: 0;\r
 }\r
-.v-Notification.system p {\r
+.v-Notification-system p {\r
        white-space: nowrap;\r
 }
\ No newline at end of file

diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css
index 1b28fef5e0971f743cc43f5085e7f5e693e08d99..29be722503f701c25fe7cae09b5d4dc8a210fb19 100644 (file)
--- a/WebContent/VAADIN/themes/base/styles.css
+++ b/WebContent/VAADIN/themes/base/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;
 }
 

diff --git a/WebContent/VAADIN/themes/reindeer/notification/notification.css b/WebContent/VAADIN/themes/reindeer/notification/notification.css
index f266f0576d64c48c234132259188c98e40a45b72..62a45d9d860e133e54b67b638d54f539a1df97fd 100644 (file)
--- 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 f1d5c4d60c62816780e7641b1464c0d8ac85aa74..da13566aeccc8adcd92443a70d3941851234964e 100644 (file)
--- 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;
 }
 

diff --git a/WebContent/VAADIN/themes/runo/notification/notification.css b/WebContent/VAADIN/themes/runo/notification/notification.css
index da71112abb14d8f47d064584fda80084b54afa7f..e526877f2df42c07e6f688bbfc2424e65612137f 100644 (file)
--- a/WebContent/VAADIN/themes/runo/notification/notification.css
+++ b/WebContent/VAADIN/themes/runo/notification/notification.css
@@ -11,16 +11,16 @@
 }
 .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;
        font-weight: normal;
        white-space: nowrap;
        margin: 0 10px 0 0;
 }
-.v-Notification.warning {
+.v-Notification-warning {
        background: #fff1e4;
        color: #dd3400;
        border: 2px solid #ffaa90;
@@ -29,7 +29,7 @@
        border-radius: 5px;
        opacity: 1;
 }
-.v-Notification.error {
+.v-Notification-error {
        background: #f23d00 url(img/close-error.png) no-repeat right 5px;
        padding-right: 30px;
        border: 3px solid #c30000;
@@ -37,12 +37,12 @@
        -webkit-border-radius: 6px;
        border-radius: 6px;
 }
-.v-Notification.tray {
+.v-Notification-tray {
        background: #575e60;
        padding: 0.5em;
        margin: 0 5px 5px 0;
 }
-.v-Notification.tray h1 {
+.v-Notification-tray h1 {
        display: block;
        font-weight: bold;
        font-size: 0.9em;
@@ -54,13 +54,13 @@
        -webkit-border-radius: 3px;
        border-radius: 3px;
 }
-.v-Notification.tray p {
+.v-Notification-tray p {
        display: block;
        font-size: 0.9em;
        line-height: 1.1;
        margin: 8px 10px 5px 10px;
        color: #e4e7ea;
 }\r
-.v-Notification.system {\r
+.v-Notification-system {\r
        background-color: #ff0a0a;\r
 }
\ No newline at end of file

diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css
index 5aef0bc5795466c105b036e755688e61e6e54b39..b4d79b92e587f31cdfd190a25e8b02bd09d2c0e8 100644 (file)
--- a/WebContent/VAADIN/themes/runo/styles.css
+++ b/WebContent/VAADIN/themes/runo/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;
 }
 
@@ -2152,16 +2152,16 @@ div.v-tree-node-leaf {
 }
 .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;
        font-weight: normal;
        white-space: nowrap;
        margin: 0 10px 0 0;
 }
-.v-Notification.warning {
+.v-Notification-warning {
        background: #fff1e4;
        color: #dd3400;
        border: 2px solid #ffaa90;
@@ -2170,7 +2170,7 @@ div.v-tree-node-leaf {
        border-radius: 5px;
        opacity: 1;
 }
-.v-Notification.error {
+.v-Notification-error {
        background: #f23d00 url(notification/img/close-error.png) no-repeat right 5px;
        padding-right: 30px;
        border: 3px solid #c30000;
@@ -2178,12 +2178,12 @@ div.v-tree-node-leaf {
        -webkit-border-radius: 6px;
        border-radius: 6px;
 }
-.v-Notification.tray {
+.v-Notification-tray {
        background: #575e60;
        padding: 0.5em;
        margin: 0 5px 5px 0;
 }
-.v-Notification.tray h1 {
+.v-Notification-tray h1 {
        display: block;
        font-weight: bold;
        font-size: 0.9em;
@@ -2195,14 +2195,14 @@ div.v-tree-node-leaf {
        -webkit-border-radius: 3px;
        border-radius: 3px;
 }
-.v-Notification.tray p {
+.v-Notification-tray p {
        display: block;
        font-size: 0.9em;
        line-height: 1.1;
        margin: 8px 10px 5px 10px;
        color: #e4e7ea;
 }
-.v-Notification.system {
+.v-Notification-system {
        background-color: #ff0a0a;
 }
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VNotification.java b/src/com/vaadin/terminal/gwt/client/ui/VNotification.java
index a7accae95db049779b5f9f61cf235a343aa89f89..e5c8be92e58d177684b868fbe6f47361065122ec 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VNotification.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VNotification.java
@@ -112,6 +112,7 @@ public class VNotification extends VOverlay {
         if (style != null) {\r
             temporaryStyle = style;\r
             addStyleName(style);\r
+            addStyleDependentName(style);\r
         }\r
         super.show();\r
         setPosition(position);\r
@@ -124,6 +125,7 @@ public class VNotification extends VOverlay {
         cancelFade();\r
         if (temporaryStyle != null) {\r
             removeStyleName(temporaryStyle);\r
+            removeStyleDependentName(temporaryStyle);\r
             temporaryStyle = null;\r
         }\r
         super.hide();\r