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-02-10 14:54:21 +01:00
commit 7cd515f6f2
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/lib/app_post/column_select.coffee
View file

@ -50,6 +50,7 @@ class App.ColumnSelect extends Spine.Controller
@pool.find("[data-value='#{value}']").addClass 'is-hidden' @pool.find("[data-value='#{value}']").addClass 'is-hidden'
@values.push(value) @values.push(value)
@shadow.val(@values) @shadow.val(@values)
@shadow.trigger('change')
@placeholder.addClass 'is-hidden' @placeholder.addClass 'is-hidden'
@ -64,6 +65,7 @@ class App.ColumnSelect extends Spine.Controller
@selected.find("[data-value='#{value}']").addClass 'is-hidden' @selected.find("[data-value='#{value}']").addClass 'is-hidden'
@values.splice(@values.indexOf(value), 1) @values.splice(@values.indexOf(value), 1)
@shadow.val(@values) @shadow.val(@values)
@shadow.trigger('change')
if !@values.length if !@values.length
@placeholder.removeClass 'is-hidden' @placeholder.removeClass 'is-hidden'

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

@ -1195,6 +1195,17 @@ fieldset {
} }
} }
/*
Firefox Specific Hack
to fix the overflow of column select with long names
https://stackoverflow.com/questions/17408815/fieldset-resizes-wrong-appears-to-have-unremovable-min-width-min-content/17863685#17863685
*/
@-moz-document url-prefix() {
fieldset { display: table-cell; }
}
fieldset > .form-group { fieldset > .form-group {
padding: 0 4px; padding: 0 4px;