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

Issue/2971/home error
stable
Alejandro 2015-10-16 08:54:24 +02:00
commit 5e0ae616e3
4 changed files with 30 additions and 19 deletions

View File

@ -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')

View File

@ -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

View File

@ -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;
}
.close {
margin-right: 1rem;
width: 2rem;
path {
fill: $white;
}
.icon-delete {
color: $white;
position: absolute;
right: 1rem;
}
}
.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>

After

Width:  |  Height:  |  Size: 291 B