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-01-21 17:20:54 +01:00
commit d25591dd48
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -284,6 +284,7 @@ span[data-tooltip]:hover:before {
&.btn--action { &.btn--action {
@extend label; @extend label;
height: 31px;
padding: 7px 11px 5px !important; padding: 7px 11px 5px !important;
} }
@ -843,9 +844,6 @@ textarea,
margin-top: 6px; margin-top: 6px;
margin-left: auto; margin-left: auto;
@extend .horizontal; @extend .horizontal;
/*
@extend .justify;
*/
@extend .self-start; @extend .self-start;
.btn { .btn {
@ -1338,17 +1336,19 @@ ol.tabs li {
height: 6px; height: 6px;
border-radius: 100%; border-radius: 100%;
background: #2c2d36; background: #2c2d36;
will-change: opacity;
transform: translateZ(0);
} }
.modified.priority.icon:after { .modified.priority.icon:after {
-webkit-animation: fade 1s ease 2s infinite alternate; -webkit-animation: fade 2s ease-in-out infinite;
-moz-animation: fade 1s ease 2s infinite alternate; -moz-animation: fade 2s ease-in-out infinite;
animation: fade 1s ease 2s infinite alternate; animation: fade 2s ease-in-out infinite;
} }
@-webkit-keyframes fade { from { opacity: 0 } to { opacity: 1 } } @-webkit-keyframes fade { from { opacity: 1 } 50% { opacity: 0 } to { opacity: 1 } }
@-moz-keyframes fade { from { opacity: 0 } to { opacity: 1 } } @-moz-keyframes fade { from { opacity: 1 } 50% { opacity: 0 } to { opacity: 1 } }
@keyframes fade { from { opacity: 0 } to { opacity: 1 } } @keyframes fade { from { opacity: 1 } 50% { opacity: 0 } to { opacity: 1 } }
.organization.icon { .organization.icon {
height: 13px; height: 13px;
@ -4168,11 +4168,14 @@ footer {
display: block; display: block;
padding-left: 40px; padding-left: 40px;
position: absolute; position: absolute;
overflow: auto; bottom: auto;
background: hsla(210,17%,98%,.55); min-height: 100vh;
.modal-backdrop { .modal-backdrop {
display: none; position: absolute;
background: hsla(210,17%,93%,.55);
height: 100% !important;
opacity: 1;
} }
.modal-dialog { .modal-dialog {