Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' of github.com:martini/zammad into develop

Browse source
This commit is contained in:
Martin Edenhofer 2015-09-30 14:05:51 +02:00
commit fc3c8ef808
1 changed files with 16 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
app/assets/stylesheets/zammad.scss
View file

@ -4251,28 +4251,26 @@ footer {
} }
.alert { .alert {
padding: 10px 15px; padding: 10px 15px 8px;
border-radius: 3px; border-radius: 3px;
color: hsl(202,5%,18%); color: white;
border: none;
&.alert--info { &.alert--info {
border-color: hsl(188,50%,72%); background: hsl(203,65%,55%);
background: hsl(191,53%,79%);
} }
&.alert--success { &.alert--success {
border-color: hsl(145,51%,70%); background: hsl(145,51%,45%);
background: hsl(145,51%,77%);
} }
&.alert--warning { &.alert--warning {
border-color: hsl(43,92%,71%); color: hsl(45,98%,17%);
background: hsl(42,94%,80%); background: hsl(45,98%,63%);
} }
&.alert--danger { &.alert--danger {
border-color: hsl(9,72%,62%); background: hsl(11,85%,48%);
background: hsl(12,73%,66%);
} }
} }
@ -6412,7 +6410,7 @@ output {
#notify { #notify {
position: absolute; position: absolute;
top: 20px; top: 10px;
left: 0; left: 0;
right: 0; right: 0;
@extend .zIndex-10; @extend .zIndex-10;
@ -6429,29 +6427,23 @@ output {
.noty_message { .noty_message {
pointer-events: auto; pointer-events: auto;
display: inline-block; display: inline-block;
background: white; background: hsl(203,65%,55%);
border: 1px solid hsl(0,0%,80%); padding: 10px 15px 8px;
border-bottom-color: hsl(0,0%,70%);
padding: 10px 15px;
border-radius: 3px; border-radius: 3px;
color: hsl(202,5%,18%); color: white;
box-shadow:
0 6px 12px hsla(210,17%,10%,.21);
} }
&.noty_type_success .noty_message { &.noty_type_success .noty_message {
border-color: hsl(145,51%,70%); background: hsl(145,51%,45%);
background: hsl(145,51%,77%);
} }
&.noty_type_alert .noty_message { &.noty_type_alert .noty_message {
border-color: hsl(43,92%,71%); color: hsl(45,98%,17%);
background: hsl(42,94%,80%); background: hsl(45,98%,63%);
} }
&.noty_type_error .noty_message { &.noty_type_error .noty_message {
border-color: hsl(9,72%,62%); background: hsl(11,85%,48%);
background: hsl(12,73%,66%);
} }
a { a {