# HG changeset patch # User Marcin Lulek # Date 2016-08-26 15:00:44 # Node ID e3c25eda566422bec40deab7f7866119721c569d # Parent 1eda65ea4264b025a33922cb6cdad86a7debab88 notifications: make styling match the design diff --git a/rhodecode/public/css/polymer.less b/rhodecode/public/css/polymer.less --- a/rhodecode/public/css/polymer.less +++ b/rhodecode/public/css/polymer.less @@ -5,11 +5,5 @@ @import 'rcicons'; @import 'fonts'; @import 'variables'; -@import 'legacy_code_styles'; @import 'type'; -@import 'alerts'; @import 'buttons'; -@import 'tags'; -@import 'examples'; -@import 'login'; -@import 'comments'; diff --git a/rhodecode/public/js/src/components/rhodecode-toast/rhodecode-toast.html b/rhodecode/public/js/src/components/rhodecode-toast/rhodecode-toast.html --- a/rhodecode/public/js/src/components/rhodecode-toast/rhodecode-toast.html +++ b/rhodecode/public/js/src/components/rhodecode-toast/rhodecode-toast.html @@ -2,6 +2,7 @@
- {{_gettext('Close now')}} + {{_gettext('Close now')}}
diff --git a/rhodecode/public/js/src/components/rhodecode-toast/rhodecode-toast.less b/rhodecode/public/js/src/components/rhodecode-toast/rhodecode-toast.less --- a/rhodecode/public/js/src/components/rhodecode-toast/rhodecode-toast.less +++ b/rhodecode/public/js/src/components/rhodecode-toast/rhodecode-toast.less @@ -1,3 +1,5 @@ +@import '../../../../css/variables'; + paper-toast{ width: 100%; min-width: 400px; @@ -27,13 +29,16 @@ paper-toast a{ min-width: 100px; font-weight: bold; text-transform: uppercase; - &.info, &.success { - color: #0ac878; + &.info{ + color: @alert4; + } + &.success { + color: @alert1; } &.error, &.danger { - color: #e85e4d; + color: @alert2; } &.warning { - color: #ffc854; + color: @alert3; } } diff --git a/rhodecode/templates/admin/my_account/my_account_notifications.html b/rhodecode/templates/admin/my_account/my_account_notifications.html --- a/rhodecode/templates/admin/my_account/my_account_notifications.html +++ b/rhodecode/templates/admin/my_account/my_account_notifications.html @@ -36,7 +36,7 @@