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

formGroup-bundle: adjust architecture

Browse source
This commit is contained in:
Felix Niklas 2015-10-05 16:57:22 +02:00
parent 070adb47c3
commit 825c71cf31
2 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco
View file

@ -452,20 +452,14 @@
</div><span class="help-inline"></span> <span class="help-block"></span> </div><span class="help-inline"></span> <span class="help-block"></span>
</div> </div>
</div> </div>
<div class="formGroup-bundle"> <div class="date form-group formGroup--bundle">
<div class="date form-group flex"> <div class="formGroup-label">
<div class="formGroup-label"> <label for="Ticket_187247_pending_time">Pending till <span>*</span></label>
<label for="Ticket_187247_pending_time">Pending till <span>*</span></label>
</div>
<div class="controls">
<input type="text" value="10/28/2015" class="form-control js-datepicker">
</div>
</div> </div>
<div class="formGroup-bundle-label">at</div> <div class="controls">
<div class="datetime form-group"> <input type="text" value="10/28/2015" class="form-control js-datepicker">
<div class="controls"> <div class="controls-label">at</div>
<input type="text" value="08:00" class="form-control time js-timepicker"> <input type="text" value="08:00" class="form-control time js-timepicker">
</div>
</div> </div>
</div> </div>
<div class="select form-group"> <div class="select form-group">

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

@ -1108,13 +1108,11 @@ fieldset > .form-group {
margin-bottom: 0; margin-bottom: 0;
} }
.formGroup-bundle { .formGroup--bundle .controls {
display: flex; display: flex;
align-items: flex-end;
margin: 0 4px;
.formGroup-bundle-label { .controls-label {
margin: 0 10px 27px 10px; margin: 11px 10px 0;
} }
} }