taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #668 from taigaio/issue/2971/home-error 

Issue/2971/home error
stable
Alejandro 2015-10-16 08:54:24 +02:00
parent daec7312c0 361a38188e
commit 5e0ae616e3
4 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/coffee/modules/common/confirm.coffee
View File

@ -245,7 +245,7 @@ class ConfirmService extends taiga.Service
delete @.tsem delete @.tsem
el.on "click", ".icon-delete", (event) => el.on "click", ".icon-delete, .close", (event) =>
body.find(selector) body.find(selector)
.removeClass('active') .removeClass('active')
.addClass('inactive') .addClass('inactive')

3
app/partials/includes/components/notification-message.jade
View File

@ -25,4 +25,5 @@ div.notification-light.notification-message-light-error
div.text div.text
h4.warning(translate="NOTIFICATION.WARNING") h4.warning(translate="NOTIFICATION.WARNING")
p(translate="NOTIFICATION.WARNING_TEXT") 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

41
app/styles/components/notification-message.scss
View File

@ -96,40 +96,47 @@
} }
.notification-light { .notification-light {
align-items: center;
background: rgba($gray-light, .95); background: rgba($gray-light, .95);
color: $white; color: $white;
left: calc(50% - 200px); display: flex;
padding: 1rem 1rem .2rem; justify-content: space-between;
opacity: 0;
padding: 1rem;
position: absolute; position: absolute;
top: 0; top: 0;
transform: translateY(-100%); transform: translateY(-100%);
width: 400px; transition: all .6s;
width: 100%;
z-index: 99999; z-index: 99999;
&.inactive { &.inactive {
transition: all .6s ease-in-out; opacity: 0;
transform: translateY(-100%);
transition: all .6s;
} }
&.active { &.active {
opacity: 1;
transform: translateY(0); transform: translateY(0);
transition: all .6s ease-in-out; transition: all .6s;
} }
.text { p {
display: inline-block; @extend %light;
margin-left: .5rem; @extend %small;
width: 80%; margin: 0;
} }
.warning { .warning {
@extend %large;
@extend %bold;
color: $white; color: $white;
line-height: 2.4rem; line-height: 1.5rem;
} }
.icon-delete { .close {
color: $white; margin-right: 1rem;
position: absolute; width: 2rem;
right: 1rem; path {
fill: $white;
}
} }
} }
.notification-message-light-error { .notification-message-light-error {
background: rgba($red, .95); background: rgba($red, .8);
} }

3
app/svg/remove.svg Normal file
View File

@ -0,0 +1,3 @@
<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 1000 1000">
<path d="M749.2 197.3 500 446.4 250.8 197.2 197.2 250.8 446.4 500 197.3 749.2 250.8 802.7 500 553.6 749.2 802.8 802.8 749.2 553.6 500 802.7 250.8 749.2 197.3Z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 291 B