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

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

Browse source
This commit is contained in:
Martin Edenhofer 2014-09-15 23:35:40 +02:00
commit ca86b893c0
1 changed files with 23 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
app/assets/stylesheets/zzz.css.erb
View file

@ -1241,9 +1241,9 @@ ol.tabs li {
}
.recipients.icon {
width: 15px;
width: 16px;
height: 12px;
background-position: -54px -336px;
background-position: -54px -339px;
}
@ -1398,42 +1398,6 @@ footer {
display: inline-block;
}
/*
* noty changes
*/
.noty_bar.noty_layout_top {
}
.qq-upload-icon {
margin: 6px 20px 0 0;
height: 18px;
}
.qq-upload-icon .glyphicon {
font-size: 15px;
}
.qq-upload-button {
display: block;
/*or inline-block*/
width: 40px;
padding: 8px 0 5px;
text-align: center;
}
.qq-upload-list {
text-align: left;
margin: 5px 10px 0;
padding: 0;
list-style: disc;
}
.qq-upload-list li {
font-size: 14px;
padding: 5px;
background-color: transparent;
}
.sub_attribute .control-label {
width: 60px;
}
@ -3100,6 +3064,27 @@ footer {
display: block;
}
.qq-upload-list li {
padding: 4px 5px 0;
margin: 0 5px;
color: hsl(60,1%,34%);
font-size: 0.9em;
line-height: auto;
background: none;
}
.qq-upload-list li:hover {
background: hsl(200,20%,97%);
}
.qq-upload-file {
color: hsl(202,66%,55%);
}
.qq-upload-size {
font-size: inherit;
}
.switch-back-to-user {
position: absolute;
background-color: #389ed9;