Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

refactor datetime, fix ff flex bug

Browse source
This commit is contained in:
Felix Niklas 2015-10-08 14:10:54 +02:00
parent c9bcf4fe00
commit a5e39d4799
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/app/views/generic/datetime.jst.eco
View file

@ -1,6 +1,6 @@
<div class="controls--bundle" data-name="<%= @attribute.nameRaw %>"> <div class="horizontal" data-name="<%= @attribute.nameRaw %>">
<input type="hidden" value="<%= @attribute.value %>" name="<%= @attribute.name %>"> <input type="hidden" value="<%= @attribute.value %>" name="<%= @attribute.name %>">
<input type="text" value="" class="form-control js-datepicker" data-item="date"> <input type="text" value="" class="form-control flex-shrink-horizontal js-datepicker" data-item="date">
<div class="controls-label"><%- @T('at') %></div> <div class="controls-label"><%- @T('at') %></div>
<input type="text" value="" class="form-control time js-timepicker" data-item="time"> <input type="text" value="" class="form-control time js-timepicker" data-item="time">
</div> </div>

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

@ -1193,14 +1193,10 @@ fieldset > .form-group {
margin-bottom: 0; margin-bottom: 0;
} }
.controls--bundle {
display: flex;
.controls-label { .controls-label {
margin: 11px 10px 0; margin: 11px 10px 0;
flex-shrink: 0; flex-shrink: 0;
} }
}
input[type="radio"], input[type="radio"],
input[type="checkbox"] { input[type="checkbox"] {
@ -6977,6 +6973,21 @@ body.fit {
flex: 1; flex: 1;
} }
/*
Firefox minimum content bugfix
https://github.com/philipwalton/flexbugs#1-minimum-content-sizing-of-flex-items-not-honored
"By default, flex items won’t shrink below their minimum
content size (the length of the longest word or fixed-size element).
To change this, set the min-width or min-height property."
*/
.flex-shrink-horizontal {
min-width: 0;
}
.flex-full { .flex-full {
flex: 1 1 100%; flex: 1 1 100%;
} }