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

date + time layoutRef

Browse source
This commit is contained in:
Felix Niklas 2015-09-29 15:54:14 +02:00
parent 51963fe859
commit 1ad13c2b59
4 changed files with 682 additions and 610 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/layout_ref.coffee
View file

@ -848,6 +848,8 @@ class TicketZoomRef extends App.ControllerContent
startDate: new Date().toLocaleDateString("en-US") # returns 9/25/2015 startDate: new Date().toLocaleDateString("en-US") # returns 9/25/2015
container: @$('.js-datepicker').parent() container: @$('.js-datepicker').parent()
@$('.js-timepicker').timepicker()
# for testing purposes the highlights get stored in localStorage # for testing purposes the highlights get stored in localStorage
loadHighlights: -> loadHighlights: ->
if highlights = localStorage['highlights'] if highlights = localStorage['highlights']

2
app/assets/javascripts/app/views/layout_ref/import_wizard.jst.eco
View file

@ -39,7 +39,7 @@
<p> <p>
Enter the link provided by the plugin at the end of the installation to link the two systems: Enter the link provided by the plugin at the end of the installation to link the two systems:
</p> </p>
<div class="form-group fromGroup--standalone"> <div class="form-group formGroup--standalone">
<label for="otrs-link">OTRS Link</label> <label for="otrs-link">OTRS Link</label>
<div class="u-positionOrigin"> <div class="u-positionOrigin">
<input type="url" id="otrs-link" class="form-control" placeholder="http://otrs.company.de/otrs"> <input type="url" id="otrs-link" class="form-control" placeholder="http://otrs.company.de/otrs">

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

File diff suppressed because it is too large Load diff

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

@ -867,7 +867,7 @@ fieldset {
} }
} }
fieldset .form-group { fieldset > .form-group {
padding: 0 4px; padding: 0 4px;
&:last-child { &:last-child {
@ -875,11 +875,6 @@ fieldset .form-group {
} }
} }
fieldset > *:not(.form-group) .form-control {
margin-left: 4px;
margin-right: 4px;
}
.form-group { .form-group {
margin-bottom: 16px; margin-bottom: 16px;
@ -888,7 +883,7 @@ fieldset > *:not(.form-group) .form-control {
} }
} }
.datetime.form-group .controls { .date.form-group .controls {
position: relative; position: relative;
} }
@ -1071,10 +1066,20 @@ fieldset > *:not(.form-group) .form-control {
} }
} }
.fromGroup--standalone .form-control { .formGroup--standalone .form-control {
margin-bottom: 0; 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="radio"],
input[type="checkbox"] { input[type="checkbox"] {
margin: 0; margin: 0;