Skip to content

Commit bda99bc

Browse files
authored
Merge branch 'master' into feature/bundler-ignores
2 parents 7a90175 + 4a7b82c commit bda99bc

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

app/assets/javascripts/datepicker.js.coffee

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ app.datepicker = new class
4242
changeYear: $(elem).data('changeyear')
4343
changeMonth: $(elem).data('changemonth')
4444
beforeShowDay: unavailableDates($(elem))
45+
dateFormat: 'dd.mm.yy'
46+
setDate: $(elem).val()
4547
})))
4648
@bindListeners()
4749

app/assets/stylesheets/_orders.scss

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,6 @@ h1.top {
179179
.title,
180180
.subtitle {
181181
height: $row-line-height;
182-
183-
.small {
184-
color: $gray;
185-
line-height: 21.8px;
186-
}
187182
}
188183

189184
td > * {

app/assets/stylesheets/puzzletime.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,11 @@ a.disabled:hover {
239239
color: $btn-link-disabled-color;
240240
}
241241

242+
span.subtle-hint {
243+
color: $gray;
244+
line-height: 21.8px;
245+
}
246+
242247
.form-action {
243248
@extend .form-control;
244249
width: auto;

app/views/accounting_posts/_cockpit_accounting_post_row_head.html.haml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
row.shortnames,
1212
edit_order_accounting_post_path(@order, row.accounting_post))
1313
- if row.accounting_post.closed?
14-
%span.small geschlossen
14+
%span.subtle-hint geschlossen
1515
- unless row.accounting_post.billable
1616
%i.options-icon.icon-dollar-stroke
1717
- if Settings.meal_compensation.active

app/views/plannings/orders/_board.html.haml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
%span{ title: post }
3434
%strong #{post.work_item.path_shortnames}:
3535
=post.work_item.name
36+
- if post.work_item.closed?
37+
%span.subtle-hint (geschlossen)
3638
%i.glyphicon.glyphicon-chevron-down
3739
%small.text-muted{ id: "group_header_times_#{dom_id(post)}" }
3840
= render 'accounting_post_total', post: post

0 commit comments

Comments
 (0)