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-10-19 14:10:08 +02:00
commit c78b77b763
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/views/generic/select.jst.eco
View file

@ -1,4 +1,4 @@
<div class="u-positionOrigin"> <div class="controls-select">
<select id="<%= @attribute.id %>" class="form-control<%= " #{ @attribute.class }" if @attribute.class %>" name="<%= @attribute.name %>" <%= @attribute.multiple %> <%= @attribute.required %> <%= @attribute.autofocus %>> <select id="<%= @attribute.id %>" class="form-control<%= " #{ @attribute.class }" if @attribute.class %>" name="<%= @attribute.name %>" <%= @attribute.multiple %> <%= @attribute.required %> <%= @attribute.autofocus %>>
<% if @attribute.options: %> <% if @attribute.options: %>
<% for row in @attribute.options: %> <% for row in @attribute.options: %>

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

@ -1140,6 +1140,10 @@ fieldset > .form-group {
margin-bottom: 0; margin-bottom: 0;
} }
.controls-select {
position: relative;
}
.controls-label { .controls-label {
margin: 11px 10px 0; margin: 11px 10px 0;
flex-shrink: 0; flex-shrink: 0;
@ -2424,7 +2428,7 @@ footer {
Safari font rendering bugfix while animating Safari font rendering bugfix while animating
http://stackoverflow.com/questions/9733011/safari-changing-font-weights-when-unrelated-animations-are-running http://stackoverflow.com/questions/9733011/safari-changing-font-weights-when-unrelated-animations-are-running
*/ */
z-index: 60000; z-index: 899; // stay beneath #global-search-results
position: relative; position: relative;
} }
@ -2642,7 +2646,7 @@ footer {
top: 53px; top: 53px;
z-index: 900; z-index: 900;
display: none; display: none;
overflow: scroll; overflow: auto;
} }
.search.open .custom-dropdown-menu { .search.open .custom-dropdown-menu {
@ -3533,6 +3537,10 @@ footer {
background: none; background: none;
} }
.form-inline .controls-select {
position: static;
}
.bulkAction-secondStep .form-group { .bulkAction-secondStep .form-group {
min-width: 140px; min-width: 140px;
} }