diff --git a/app/coffee/modules/common/confirm.coffee b/app/coffee/modules/common/confirm.coffee index 28851121..aa0bbed2 100644 --- a/app/coffee/modules/common/confirm.coffee +++ b/app/coffee/modules/common/confirm.coffee @@ -245,7 +245,7 @@ class ConfirmService extends taiga.Service delete @.tsem - el.on "click", ".icon-delete", (event) => + el.on "click", ".icon-delete, .close", (event) => body.find(selector) .removeClass('active') .addClass('inactive') diff --git a/app/partials/includes/components/notification-message.jade b/app/partials/includes/components/notification-message.jade index d0feaeaf..82b3ab05 100644 --- a/app/partials/includes/components/notification-message.jade +++ b/app/partials/includes/components/notification-message.jade @@ -25,4 +25,5 @@ div.notification-light.notification-message-light-error div.text h4.warning(translate="NOTIFICATION.WARNING") p(translate="NOTIFICATION.WARNING_TEXT") - a.icon.icon-delete(href="", title="{{'NOTIFICATION.CLOSE' | translate}}") + a.close(href="", title="{{'NOTIFICATION.CLOSE' | translate}}") + include ../../../svg/remove.svg diff --git a/app/styles/components/notification-message.scss b/app/styles/components/notification-message.scss index e2e9e451..daf23d06 100644 --- a/app/styles/components/notification-message.scss +++ b/app/styles/components/notification-message.scss @@ -96,40 +96,47 @@ } .notification-light { + align-items: center; background: rgba($gray-light, .95); color: $white; - left: calc(50% - 200px); - padding: 1rem 1rem .2rem; + display: flex; + justify-content: space-between; + opacity: 0; + padding: 1rem; position: absolute; top: 0; transform: translateY(-100%); - width: 400px; + transition: all .6s; + width: 100%; z-index: 99999; &.inactive { - transition: all .6s ease-in-out; + opacity: 0; + transform: translateY(-100%); + transition: all .6s; } &.active { + opacity: 1; transform: translateY(0); - transition: all .6s ease-in-out; + transition: all .6s; } - .text { - display: inline-block; - margin-left: .5rem; - width: 80%; + p { + @extend %light; + @extend %small; + margin: 0; } .warning { - @extend %large; - @extend %bold; color: $white; - line-height: 2.4rem; + line-height: 1.5rem; } - .icon-delete { - color: $white; - position: absolute; - right: 1rem; + .close { + margin-right: 1rem; + width: 2rem; + path { + fill: $white; + } } } .notification-message-light-error { - background: rgba($red, .95); + background: rgba($red, .8); } diff --git a/app/svg/remove.svg b/app/svg/remove.svg new file mode 100644 index 00000000..6097c7df --- /dev/null +++ b/app/svg/remove.svg @@ -0,0 +1,3 @@ + + +