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-06-11 16:00:09 +02:00
commit b3bbcc0b60
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/stylesheets/zammad.css.scss
View file

@ -1719,12 +1719,14 @@ footer {
.tasks { .tasks {
background: #2c2d36; background: #2c2d36;
flex: 1; flex: 1;
overflow: auto;
} }
.tasks.tasks--standalone { .tasks.tasks--standalone {
background: none; background: none;
margin: 8px 0 0; margin: 8px 0 0;
padding: 0; padding: 0;
overflow: visible;
} }
.tasks--standalone .task { .tasks--standalone .task {
@ -2024,7 +2026,7 @@ footer {
right: 0; right: 0;
bottom: 0; bottom: 0;
top: 53px; top: 53px;
z-index: 1002; z-index: 900;
display: none; display: none;
overflow: scroll; overflow: scroll;
} }
@ -2361,7 +2363,7 @@ footer {
border: none; border: none;
color: hsl(206,7%,28%); color: hsl(206,7%,28%);
box-shadow: 0 1px 14px rgba(0,8,14,.25); box-shadow: 0 1px 14px rgba(0,8,14,.25);
@extend .zIndex-9; z-index: 900;
} }
.popover-body { .popover-body {
@ -4141,7 +4143,7 @@ footer {
.modal { .modal {
position: fixed; position: fixed;
@extend .zIndex-10; z-index: 1000;
} }
.modal-dialog { .modal-dialog {