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-08-21 16:56:11 +02:00
parent 32920c55b1 89fb464915
commit 1e7e53d852
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/app/views/generic/searchable_select.jst.eco
View file

@ -7,12 +7,15 @@
<%= @autofocus %> <%= @autofocus %>
value="<%= @value %>" value="<%= @value %>"
> >
<div class="searchableSelect-autocomplete"><span class="searchableSelect-autocomplete-invisible js-autocomplete-invisible"></span><span class="searchableSelect-autocomplete-visible js-autocomplete-visible"></span></div>
<input <input
class="searchableSelect-main form-control js-input<%= " #{ @class }" if @class %>" class="searchableSelect-main form-control js-input<%= " #{ @class }" if @class %>"
placeholder="<%= @placeholder %>" placeholder="<%= @placeholder %>"
value="<%= @valueName %>" value="<%= @valueName %>"
> >
<div class="searchableSelect-autocomplete">
<span class="searchableSelect-autocomplete-invisible js-autocomplete-invisible"></span>
<span class="searchableSelect-autocomplete-visible js-autocomplete-visible"></span>
</div>
<svg class="icon-arrow-down"><use xlink:href="#icon-arrow-down" /></svg> <svg class="icon-arrow-down"><use xlink:href="#icon-arrow-down" /></svg>
<div class="small loading icon"></div> <div class="small loading icon"></div>
</div> </div>

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

@ -5835,18 +5835,15 @@ output {
} }
.searchableSelect-main { .searchableSelect-main {
background: none;
position: relative; position: relative;
} }
.searchableSelect-shadow { .searchableSelect-shadow {
pointer-events: none; display: none;
color: transparent; }
position: absolute;
left: 0; .dropdown-menu {
top: 0; margin-top: -3px;
right: 0;
border: none;
} }
&.dropdown li:hover:not(.is-active) { &.dropdown li:hover:not(.is-active) {
@ -5869,6 +5866,7 @@ output {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
pointer-events: none; pointer-events: none;
display: flex;
} }
.searchableSelect-autocomplete-invisible { .searchableSelect-autocomplete-invisible {