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 2016-04-06 16:08:46 +02:00
commit db267ec8fd
3 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/app/views/widget/organization.jst.eco
View file

@ -32,6 +32,7 @@
<a href="<%- user.uiUrl() %>" class="userList-name user-popover" data-id="<%- user.id %>"> <a href="<%- user.uiUrl() %>" class="userList-name user-popover" data-id="<%- user.id %>">
<%= user.displayName() %> <%= user.displayName() %>
</a> </a>
</div>
<% end %> <% end %>
</div> </div>
</div> </div>

12
app/assets/stylesheets/bootstrap.css vendored
View file

@ -1738,18 +1738,6 @@ input[type="search"] {
font-weight: normal; font-weight: normal;
cursor: pointer; cursor: pointer;
} }
.radio input[type="radio"],
.radio-inline input[type="radio"],
.checkbox input[type="checkbox"],
.checkbox-inline input[type="checkbox"] {
position: absolute;
margin-top: 4px \9;
margin-left: -20px;
}
.radio + .radio,
.checkbox + .checkbox {
margin-top: -5px;
}
.radio-inline, .radio-inline,
.checkbox-inline { .checkbox-inline {
display: inline-block; display: inline-block;

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

@ -5939,7 +5939,7 @@ footer {
} }
.checkbox.form-group .controls label { .checkbox.form-group .controls label {
padding: 3px 0 3px 20px; padding: 2px 0;
font: inherit; font: inherit;
font-size: 13px; font-size: 13px;
margin-bottom: 0; margin-bottom: 0;
@ -5949,11 +5949,6 @@ footer {
@extend .u-clickable; @extend .u-clickable;
} }
.checkbox.form-group input[type=checkbox] {
margin-top: 7px;
vertical-align: bottom;
}
.userSearch-label { .userSearch-label {
margin: 11px 10px 0 0; margin: 11px 10px 0 0;
} }