Merge branch 'develop' of github.com:martini/zammad into develop
This commit is contained in:
commit
c78b77b763
2 changed files with 11 additions and 3 deletions
|
@ -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 %>>
|
||||
<% if @attribute.options: %>
|
||||
<% for row in @attribute.options: %>
|
||||
|
|
|
@ -1140,6 +1140,10 @@ fieldset > .form-group {
|
|||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.controls-select {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.controls-label {
|
||||
margin: 11px 10px 0;
|
||||
flex-shrink: 0;
|
||||
|
@ -2424,7 +2428,7 @@ footer {
|
|||
Safari font rendering bugfix while animating
|
||||
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;
|
||||
}
|
||||
|
||||
|
@ -2642,7 +2646,7 @@ footer {
|
|||
top: 53px;
|
||||
z-index: 900;
|
||||
display: none;
|
||||
overflow: scroll;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.search.open .custom-dropdown-menu {
|
||||
|
@ -3533,6 +3537,10 @@ footer {
|
|||
background: none;
|
||||
}
|
||||
|
||||
.form-inline .controls-select {
|
||||
position: static;
|
||||
}
|
||||
|
||||
.bulkAction-secondStep .form-group {
|
||||
min-width: 140px;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue