date + time layoutRef
This commit is contained in:
parent
51963fe859
commit
1ad13c2b59
4 changed files with 682 additions and 610 deletions
|
@ -848,6 +848,8 @@ class TicketZoomRef extends App.ControllerContent
|
|||
startDate: new Date().toLocaleDateString("en-US") # returns 9/25/2015
|
||||
container: @$('.js-datepicker').parent()
|
||||
|
||||
@$('.js-timepicker').timepicker()
|
||||
|
||||
# for testing purposes the highlights get stored in localStorage
|
||||
loadHighlights: ->
|
||||
if highlights = localStorage['highlights']
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
<p>
|
||||
Enter the link provided by the plugin at the end of the installation to link the two systems:
|
||||
</p>
|
||||
<div class="form-group fromGroup--standalone">
|
||||
<div class="form-group formGroup--standalone">
|
||||
<label for="otrs-link">OTRS Link</label>
|
||||
<div class="u-positionOrigin">
|
||||
<input type="url" id="otrs-link" class="form-control" placeholder="http://otrs.company.de/otrs">
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -867,7 +867,7 @@ fieldset {
|
|||
}
|
||||
}
|
||||
|
||||
fieldset .form-group {
|
||||
fieldset > .form-group {
|
||||
padding: 0 4px;
|
||||
|
||||
&:last-child {
|
||||
|
@ -875,11 +875,6 @@ fieldset .form-group {
|
|||
}
|
||||
}
|
||||
|
||||
fieldset > *:not(.form-group) .form-control {
|
||||
margin-left: 4px;
|
||||
margin-right: 4px;
|
||||
}
|
||||
|
||||
.form-group {
|
||||
margin-bottom: 16px;
|
||||
|
||||
|
@ -888,7 +883,7 @@ fieldset > *:not(.form-group) .form-control {
|
|||
}
|
||||
}
|
||||
|
||||
.datetime.form-group .controls {
|
||||
.date.form-group .controls {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
|
@ -1071,10 +1066,20 @@ fieldset > *:not(.form-group) .form-control {
|
|||
}
|
||||
}
|
||||
|
||||
.fromGroup--standalone .form-control {
|
||||
.formGroup--standalone .form-control {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.formGroup-bundle {
|
||||
display: flex;
|
||||
align-items: flex-end;
|
||||
margin: 0 4px;
|
||||
|
||||
.formGroup-bundle-label {
|
||||
margin: 0 5px 27px 11px;
|
||||
}
|
||||
}
|
||||
|
||||
input[type="radio"],
|
||||
input[type="checkbox"] {
|
||||
margin: 0;
|
||||
|
|
Loading…
Reference in a new issue