Fix wrong notification colors in type-default themes. #2196

Conflicts: styles/web/type-default.less
telerik · Oct 5, 2016 · 642705d · 642705d
1 parent 19a4ff5
commit 642705d
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 14 deletions.
diff --git a/styles/web/kendo.black.less b/styles/web/kendo.black.less
@@ -15,7 +15,7 @@
 @selected-gradient: "rgba(255,255,255,.12) 0%, rgba(255,255,255,.08) 50%, rgba(255,255,255,.05) 50%, rgba(255,255,255,.0) 100%";
 
 @error: #be5138;
-@warning: #ffe79e;
+@warning: #ffb400;
 @success: #2b893c;
 @info: #0c779b;
 

diff --git a/styles/web/kendo.blueopal.less b/styles/web/kendo.blueopal.less
@@ -15,7 +15,7 @@
 @selected-gradient: "rgba(255,255,255,.0) 0%, rgba(255,255,255,.23) 100%";
 
 @error: #db4240;
-@warning: #ffe79e;
+@warning: #ffb400;
 @success: #37b400;
 @info: #0066cc;
 

diff --git a/styles/web/kendo.default.less b/styles/web/kendo.default.less
@@ -15,7 +15,7 @@
 @selected-gradient: "rgba(255,255,255,.2) 0%, rgba(255,255,255,.0) 100%";
 
 @error: #db4240;
-@warning: #ffe79e;
+@warning: #ffc000;
 @success: #37b400;
 @info: #0066cc;
 

diff --git a/styles/web/kendo.silver.less b/styles/web/kendo.silver.less
@@ -14,8 +14,8 @@
 @selected-text-color: #fff;
 @selected-gradient: "rgba(255,255,255,0) 0%, rgba(255,255,255,.2) 100%";
 
-@error: #db4240;
-@warning: #ffe79e;
+@error: #d92800;
+@warning: #ff9800;
 @success: #3ea44e;
 @info: #2498bc;
 

diff --git a/styles/web/kendo.uniform.less b/styles/web/kendo.uniform.less
@@ -15,7 +15,7 @@
 @selected-gradient: "rgba(0,0,0,.13) 0%, rgba(0,0,0,.08) 100%";
 
 @error: #f45835;
-@warning: #ffe9a8;
+@warning: #f4bc35;
 @success: #52c664;
 @info: #3e6b99;
 

diff --git a/styles/web/type-default.less b/styles/web/type-default.less
@@ -40,17 +40,18 @@
 @error-border-color: darken(@error, 29%);
 @disabled-text-color: contrast(@base, lighten(@base, 40%), darken(@base, 15%), 0.5);
 @notification-info-background-color: @info;
-@notification-info-text-color: contrast(@info, lighten(@hover-text-color, 50%), darken(@info, 50%), 0.5);
-@notification-info-border-color: contrast(@info, lighten(@info, 1%), darken(@info, 11%), 0.5);
+@notification-info-text-color: #fff;
+@notification-info-border-color: @notification-info-background-color;
 @notification-success-background-color: @success;
-@notification-success-text-color: contrast(@success, lighten(@hover-text-color, 25%), darken(@success, 50%), 0.5);
-@notification-success-border-color: darken(@success, 10%);
+@notification-success-text-color: @notification-info-text-color;
+@notification-success-border-color: @notification-success-background-color;
 @notification-warning-background-color: @warning;
-@notification-warning-text-color: contrast(@warning, lighten(@hover-text-color, 22%), darken(@warning, 50%), 0.5);
-@notification-warning-border-color: contrast(@warning, lighten(@warning, 1%), darken(@warning, 3%), 0.5);
+@notification-warning-text-color: #000;
+@notification-warning-border-color: @notification-warning-background-color;
 @notification-error-background-color: @error;
-@notification-error-text-color: contrast(@error, lighten(@hover-text-color, 25%), darken(@error, 50%), 0.5);
-@notification-error-border-color: darken(@error, 10%);
+@notification-error-text-color: @notification-info-text-color;
+@notification-error-border-color: @notification-error-background-color;
+@notification-gradient: "rgba(255,255,255,.25) 0%, rgba(255,255,255,0) 100%";
 @tooltip-text-color: @header-text-color;
 @tooltip-background-color: @header-background-color;
 @tooltip-border-color: @secondary-border-color;
@@ -1504,6 +1505,10 @@ div.k-filebrowser-dropzone em
     border-color: @notification-error-border-color;
 }
 
+.k-widget.k-notification {
+    .composite-background(@notification-gradient);
+}
+
 /* Gantt */
 
 .k-gantt .k-treelist