diff --git a/frontend/.gitignore b/frontend/.gitignore index d10296ee..6205b523 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -1,6 +1,9 @@ # See https://help.github.com/ignore-files/ for more about ignoring files. + # compiled output +public/assets/tailwind.css + /dist /tmp diff --git a/frontend/app/analysis/edit/template.hbs b/frontend/app/analysis/edit/template.hbs index 630dd91d..a3e600be 100644 --- a/frontend/app/analysis/edit/template.hbs +++ b/frontend/app/analysis/edit/template.hbs @@ -25,9 +25,18 @@ as |f| >
- + \ No newline at end of file diff --git a/frontend/app/analysis/index/template.hbs b/frontend/app/analysis/index/template.hbs index f35ba5d1..0e4417ba 100644 --- a/frontend/app/analysis/index/template.hbs +++ b/frontend/app/analysis/index/template.hbs @@ -5,25 +5,25 @@

Analysis

{{#unless this.prefetchData.isRunning}} - - + Customer @@ -45,12 +45,19 @@ Comment - - {{#let (unique-id) as |id|}} - - - {{/let}} - + + {{#let (unique-id) as |id|}} + + + {{/let}} + @@ -230,8 +237,8 @@ - - + +
{{/unless}} {{#if this.appliedFilters.length}} @@ -482,4 +489,4 @@ {{/if}} -{{/if}} +{{/if}} \ No newline at end of file diff --git a/frontend/app/application/template.hbs b/frontend/app/application/template.hbs index 35a76897..1584fece 100644 --- a/frontend/app/application/template.hbs +++ b/frontend/app/application/template.hbs @@ -4,4 +4,4 @@
-{{outlet}} +{{outlet}} \ No newline at end of file diff --git a/frontend/app/components/async-list/template.hbs b/frontend/app/components/async-list/template.hbs index aa9f9b2b..e0921e36 100644 --- a/frontend/app/components/async-list/template.hbs +++ b/frontend/app/components/async-list/template.hbs @@ -20,4 +20,4 @@ {{else}} {{yield "body" @data.value}} -{{/if}} +{{/if}} \ No newline at end of file diff --git a/frontend/app/components/attendance-slider/component.js b/frontend/app/components/attendance-slider/component.js index 9f4017dc..15df4e9d 100644 --- a/frontend/app/components/attendance-slider/component.js +++ b/frontend/app/components/attendance-slider/component.js @@ -109,7 +109,7 @@ export default class AttendanceSlider extends Component { labels.push({ value: pad2joincolon(h, m), - size: m === 0 ? "lg" : "sm", + size: m === 0 ? "text-black/80" : "text-black/65", style: htmlSafe(`left: ${offsetH + offsetM}%;`), }); } diff --git a/frontend/app/components/attendance-slider/template.hbs b/frontend/app/components/attendance-slider/template.hbs index 8ac236ee..c95f2ea8 100644 --- a/frontend/app/components/attendance-slider/template.hbs +++ b/frontend/app/components/attendance-slider/template.hbs @@ -1,4 +1,4 @@ -
+
-
+
{{#each this.labels as |label|}}
-
+
{{label.value}}
{{/each}}
-
+
{{this.duration}}
-
+
\ No newline at end of file diff --git a/frontend/app/components/balance-donut/component.js b/frontend/app/components/balance-donut/component.js index 7d81c3f6..170f34c0 100644 --- a/frontend/app/components/balance-donut/component.js +++ b/frontend/app/components/balance-donut/component.js @@ -13,20 +13,20 @@ class BalanceDonutComponent extends Component { return abs(this.args.balance.usedDays / this.args.balance.credit); } - get color() { + get strokeClass() { if (this.args.balance.usedDuration) { - return "primary"; + return "stroke-primary"; } if (this.value > 1 || this.value < 0) { - return "danger"; + return "stroke-danger"; } if (this.value === 1) { - return "warning"; + return "stroke-warning"; } - return "success"; + return "stroke-adfinis-green/75"; } radius = 100 / (2 * PI); diff --git a/frontend/app/components/balance-donut/template.hbs b/frontend/app/components/balance-donut/template.hbs index 68746a83..cd9d3f18 100644 --- a/frontend/app/components/balance-donut/template.hbs +++ b/frontend/app/components/balance-donut/template.hbs @@ -1,10 +1,10 @@ -
-
{{@title}}
+
+
{{@title}}
-
+
-
+
{{#if @balance.usedDuration}} {{format-duration @balance.usedDuration false}} {{else}} {{#if @balance.credit}} -
{{@balance.usedDays}} of {{@balance.credit}}
+
{{@balance.usedDays}} of {{@balance.credit}}
{{#if (gte @balance.credit 1)}}
{{round (mult this.value 100)}}%
{{/if}} diff --git a/frontend/app/components/customer-visible-icon/template.hbs b/frontend/app/components/customer-visible-icon/template.hbs index 9925a334..b863c074 100644 --- a/frontend/app/components/customer-visible-icon/template.hbs +++ b/frontend/app/components/customer-visible-icon/template.hbs @@ -1,3 +1,3 @@
-
+
\ No newline at end of file diff --git a/frontend/app/components/date-buttons/template.hbs b/frontend/app/components/date-buttons/template.hbs index 131b5b23..7c02a066 100644 --- a/frontend/app/components/date-buttons/template.hbs +++ b/frontend/app/components/date-buttons/template.hbs @@ -5,4 +5,4 @@ type="button" {{on "click" (fn this.selectDate choice)}} >{{choice}} -{{/each}} +{{/each}} \ No newline at end of file diff --git a/frontend/app/components/date-navigation/template.hbs b/frontend/app/components/date-navigation/template.hbs index c85d3668..7290b24d 100644 --- a/frontend/app/components/date-navigation/template.hbs +++ b/frontend/app/components/date-navigation/template.hbs @@ -1,8 +1,8 @@ -
+
-
+
+
\ No newline at end of file diff --git a/frontend/app/components/duration-since/template.hbs b/frontend/app/components/duration-since/template.hbs index a918fea9..e1d7926a 100644 --- a/frontend/app/components/duration-since/template.hbs +++ b/frontend/app/components/duration-since/template.hbs @@ -1,3 +1,3 @@ - + {{format-duration this.duration}} \ No newline at end of file diff --git a/frontend/app/components/filter-sidebar/filter/template.hbs b/frontend/app/components/filter-sidebar/filter/template.hbs index 3dcc524f..23fc51cc 100644 --- a/frontend/app/components/filter-sidebar/filter/template.hbs +++ b/frontend/app/components/filter-sidebar/filter/template.hbs @@ -58,4 +58,4 @@ {{else}} {{yield}} {{/if}} -
+
\ No newline at end of file diff --git a/frontend/app/components/filter-sidebar/group/template.hbs b/frontend/app/components/filter-sidebar/group/template.hbs index 8e7fa49d..e5d33423 100644 --- a/frontend/app/components/filter-sidebar/group/template.hbs +++ b/frontend/app/components/filter-sidebar/group/template.hbs @@ -1,18 +1,22 @@ -
+
+ {{on "click" (toggle "expanded" this)}} + > {{@label}} - -
-
- {{yield}} -
+ /> + +
+
+ {{yield}}
-
\ No newline at end of file +
+
\ No newline at end of file diff --git a/frontend/app/components/filter-sidebar/template.hbs b/frontend/app/components/filter-sidebar/template.hbs index 95b41f9a..b2304b23 100644 --- a/frontend/app/components/filter-sidebar/template.hbs +++ b/frontend/app/components/filter-sidebar/template.hbs @@ -49,4 +49,4 @@ {{! template-lint-disable}} {{on "click" (fn (mut this.visible) false)}} >
-{{/in-element}} +{{/in-element}} \ No newline at end of file diff --git a/frontend/app/components/magic-link-btn/template.hbs b/frontend/app/components/magic-link-btn/template.hbs index e5c7a016..ba867704 100644 --- a/frontend/app/components/magic-link-btn/template.hbs +++ b/frontend/app/components/magic-link-btn/template.hbs @@ -5,8 +5,11 @@ class="btn btn-default" {{on "click" (toggle "isModalVisible" this)}} > - + {{#if this.isModalVisible}} - + {{/if}} - + \ No newline at end of file diff --git a/frontend/app/components/magic-link-modal/template.hbs b/frontend/app/components/magic-link-modal/template.hbs index 7ee03d58..338f6678 100644 --- a/frontend/app/components/magic-link-modal/template.hbs +++ b/frontend/app/components/magic-link-modal/template.hbs @@ -5,10 +5,7 @@ data-test-magic-link-modal as |modal| > - +
\ No newline at end of file diff --git a/frontend/app/components/no-permission/template.hbs b/frontend/app/components/no-permission/template.hbs index 65d0ace9..4947d840 100644 --- a/frontend/app/components/no-permission/template.hbs +++ b/frontend/app/components/no-permission/template.hbs @@ -6,4 +6,4 @@ Please leave and do not talk about it, ever!

-
+
\ No newline at end of file diff --git a/frontend/app/components/not-identical-warning/template.hbs b/frontend/app/components/not-identical-warning/template.hbs index 03d0052d..c4110e3c 100644 --- a/frontend/app/components/not-identical-warning/template.hbs +++ b/frontend/app/components/not-identical-warning/template.hbs @@ -1,3 +1,3 @@   - + \ No newline at end of file diff --git a/frontend/app/components/optimized-power-select/custom-options/customer-option.hbs b/frontend/app/components/optimized-power-select/custom-options/customer-option.hbs index aa36649b..d33b34af 100644 --- a/frontend/app/components/optimized-power-select/custom-options/customer-option.hbs +++ b/frontend/app/components/optimized-power-select/custom-options/customer-option.hbs @@ -1,5 +1,5 @@
- - - {{@option.project.customer.name}} + + {{@option.project.customer.name}} > {{@option.project.name}} {{@option.name}} @@ -21,4 +20,4 @@ {{#if @option.archived}} {{/if}} -
+
\ No newline at end of file diff --git a/frontend/app/components/optimized-power-select/custom-options/project-option.hbs b/frontend/app/components/optimized-power-select/custom-options/project-option.hbs index 050ed315..6485c9f9 100644 --- a/frontend/app/components/optimized-power-select/custom-options/project-option.hbs +++ b/frontend/app/components/optimized-power-select/custom-options/project-option.hbs @@ -14,4 +14,4 @@ {{#if @option.archived}} {{/if}} -
+
\ No newline at end of file diff --git a/frontend/app/components/optimized-power-select/custom-options/task-option.hbs b/frontend/app/components/optimized-power-select/custom-options/task-option.hbs index ceef6964..c921ad66 100644 --- a/frontend/app/components/optimized-power-select/custom-options/task-option.hbs +++ b/frontend/app/components/optimized-power-select/custom-options/task-option.hbs @@ -14,4 +14,4 @@ {{#if @option.archived}} {{/if}} -
+
\ No newline at end of file diff --git a/frontend/app/components/optimized-power-select/custom-options/user-option.hbs b/frontend/app/components/optimized-power-select/custom-options/user-option.hbs index a5f977ac..428130ae 100644 --- a/frontend/app/components/optimized-power-select/custom-options/user-option.hbs +++ b/frontend/app/components/optimized-power-select/custom-options/user-option.hbs @@ -6,4 +6,4 @@ {{#unless @option.isActive}} {{/unless}} - + \ No newline at end of file diff --git a/frontend/app/components/optimized-power-select/custom-select/task-selection.hbs b/frontend/app/components/optimized-power-select/custom-select/task-selection.hbs index 93476be6..2ac97e21 100644 --- a/frontend/app/components/optimized-power-select/custom-select/task-selection.hbs +++ b/frontend/app/components/optimized-power-select/custom-select/task-selection.hbs @@ -1 +1 @@ -{{@selected.name}} +{{@selected.name}} \ No newline at end of file diff --git a/frontend/app/components/optimized-power-select/custom-select/user-selection.hbs b/frontend/app/components/optimized-power-select/custom-select/user-selection.hbs index 4179cb6f..360ba439 100644 --- a/frontend/app/components/optimized-power-select/custom-select/user-selection.hbs +++ b/frontend/app/components/optimized-power-select/custom-select/user-selection.hbs @@ -1 +1 @@ -{{@selected.longName}} +{{@selected.longName}} \ No newline at end of file diff --git a/frontend/app/components/optimized-power-select/options/template.hbs b/frontend/app/components/optimized-power-select/options/template.hbs index 6b6bce35..8077e2fb 100644 --- a/frontend/app/components/optimized-power-select/options/template.hbs +++ b/frontend/app/components/optimized-power-select/options/template.hbs @@ -1,10 +1,10 @@ + \ No newline at end of file diff --git a/frontend/app/components/optimized-power-select/template.hbs b/frontend/app/components/optimized-power-select/template.hbs index 7761038a..983463ae 100644 --- a/frontend/app/components/optimized-power-select/template.hbs +++ b/frontend/app/components/optimized-power-select/template.hbs @@ -1,4 +1,5 @@ +/> \ No newline at end of file diff --git a/frontend/app/components/optimized-power-select/trigger/template.hbs b/frontend/app/components/optimized-power-select/trigger/template.hbs index 30b2e7b8..b58f54c9 100644 --- a/frontend/app/components/optimized-power-select/trigger/template.hbs +++ b/frontend/app/components/optimized-power-select/trigger/template.hbs @@ -1,4 +1,7 @@ -
+
{{#if @select.selected}} {{#if @selectedItemComponent}} {{component @@ -27,10 +30,9 @@ >× {{/if}} {{else}} - {{component - (ensure-safe-component @placeholderComponent) - placeholder=@placeholder - }} + {{@placeholder}} {{/if}} -
+
\ No newline at end of file diff --git a/frontend/app/components/progress-tooltip/template.hbs b/frontend/app/components/progress-tooltip/template.hbs index ab48d7da..0c948b82 100644 --- a/frontend/app/components/progress-tooltip/template.hbs +++ b/frontend/app/components/progress-tooltip/template.hbs @@ -62,4 +62,4 @@ -{{/if}} +{{/if}} \ No newline at end of file diff --git a/frontend/app/components/record-button/template.hbs b/frontend/app/components/record-button/template.hbs index 2b729ad0..d28c7775 100644 --- a/frontend/app/components/record-button/template.hbs +++ b/frontend/app/components/record-button/template.hbs @@ -1,27 +1,20 @@ -
{{#if this.active}} - +
- +
{{else}} - + {{/if}} -
+ \ No newline at end of file diff --git a/frontend/app/components/report-review-warning/template.hbs b/frontend/app/components/report-review-warning/template.hbs index deb5b2ba..e8a53d91 100644 --- a/frontend/app/components/report-review-warning/template.hbs +++ b/frontend/app/components/report-review-warning/template.hbs @@ -1,56 +1,58 @@ -
- {{#if this.unverifiedReports.hasReports}} - - {{/if}} - {{#if this.rejectedReports.hasReports}} - - {{/if}} -
+{{#if (or this.unverifiedReports.hasReports this.rejectedReports.hasReports)}} +
+ {{#if this.unverifiedReports.hasReports}} + + {{/if}} + {{#if this.rejectedReports.hasReports}} + + {{/if}} +
+{{/if}} \ No newline at end of file diff --git a/frontend/app/components/report-row/template.hbs b/frontend/app/components/report-row/template.hbs index 9f7e84aa..e2e6fca4 100644 --- a/frontend/app/components/report-row/template.hbs +++ b/frontend/app/components/report-row/template.hbs @@ -1,5 +1,16 @@ {{#let (changeset @report this.ReportValidations) as |cs|}} -
+
{{t.customer}}
{{t.project}}
{{t.task}}
-
+
-
+
{{#if cs.task.project.remainingEffortTracking}} -
+
-
+
{{#if this.editable}} {{/if}}
-{{/let}} +{{/let}} \ No newline at end of file diff --git a/frontend/app/components/scroll-container.hbs b/frontend/app/components/scroll-container.hbs index 411d0916..67ad5e35 100644 --- a/frontend/app/components/scroll-container.hbs +++ b/frontend/app/components/scroll-container.hbs @@ -3,4 +3,4 @@ data-simplebar-auto-hide="false" class="scroll-container" ...attributes ->{{yield}}
+>{{yield}}
\ No newline at end of file diff --git a/frontend/app/components/sort-header/template.hbs b/frontend/app/components/sort-header/template.hbs index 9f2f0e11..5065a721 100644 --- a/frontend/app/components/sort-header/template.hbs +++ b/frontend/app/components/sort-header/template.hbs @@ -6,4 +6,4 @@ {{else}} {{/if}} - + \ No newline at end of file diff --git a/frontend/app/components/statistic-list/bar/template.hbs b/frontend/app/components/statistic-list/bar/template.hbs index c9d48c40..f8ff45a1 100644 --- a/frontend/app/components/statistic-list/bar/template.hbs +++ b/frontend/app/components/statistic-list/bar/template.hbs @@ -2,7 +2,7 @@
{{#if (and @remaining (lte @remaining 1))}} @@ -20,4 +20,4 @@ {{style --goal=(concat (min "0.99" @goal))}} >
{{/if}} -
+
\ No newline at end of file diff --git a/frontend/app/components/statistic-list/column/template.hbs b/frontend/app/components/statistic-list/column/template.hbs index 7140b964..136558d5 100644 --- a/frontend/app/components/statistic-list/column/template.hbs +++ b/frontend/app/components/statistic-list/column/template.hbs @@ -6,4 +6,4 @@ {{else}} {{@value}} {{/if}} - + \ No newline at end of file diff --git a/frontend/app/components/statistic-list/template.hbs b/frontend/app/components/statistic-list/template.hbs index e877b66e..ee7625da 100644 --- a/frontend/app/components/statistic-list/template.hbs +++ b/frontend/app/components/statistic-list/template.hbs @@ -108,4 +108,4 @@ {{/if}} - + \ No newline at end of file diff --git a/frontend/app/components/sy-calendar/template.hbs b/frontend/app/components/sy-calendar/template.hbs index 3494ec2f..bfa52b55 100644 --- a/frontend/app/components/sy-calendar/template.hbs +++ b/frontend/app/components/sy-calendar/template.hbs @@ -42,4 +42,4 @@ - + \ No newline at end of file diff --git a/frontend/app/components/sy-checkbox/template.hbs b/frontend/app/components/sy-checkbox/template.hbs index 714af776..6358ee95 100644 --- a/frontend/app/components/sy-checkbox/template.hbs +++ b/frontend/app/components/sy-checkbox/template.hbs @@ -1,13 +1,14 @@
-
+ \ No newline at end of file diff --git a/frontend/app/components/sy-checkmark/template.hbs b/frontend/app/components/sy-checkmark/template.hbs index d3bb5ade..16ba475e 100644 --- a/frontend/app/components/sy-checkmark/template.hbs +++ b/frontend/app/components/sy-checkmark/template.hbs @@ -1 +1,5 @@ - + \ No newline at end of file diff --git a/frontend/app/components/sy-datepicker-btn/template.hbs b/frontend/app/components/sy-datepicker-btn/template.hbs index f22d6c03..78cbf5cd 100644 --- a/frontend/app/components/sy-datepicker-btn/template.hbs +++ b/frontend/app/components/sy-datepicker-btn/template.hbs @@ -1,8 +1,6 @@ - - - + + + - + \ No newline at end of file diff --git a/frontend/app/components/sy-datepicker/template.hbs b/frontend/app/components/sy-datepicker/template.hbs index 8511ab23..aa9ce05d 100644 --- a/frontend/app/components/sy-datepicker/template.hbs +++ b/frontend/app/components/sy-datepicker/template.hbs @@ -42,4 +42,4 @@ @onSelect={{fn this.updateSelect DropDown}} /> - + \ No newline at end of file diff --git a/frontend/app/components/sy-durationpicker-day/template.hbs b/frontend/app/components/sy-durationpicker-day/template.hbs index df54bb4e..bb030f6b 100644 --- a/frontend/app/components/sy-durationpicker-day/template.hbs +++ b/frontend/app/components/sy-durationpicker-day/template.hbs @@ -3,7 +3,7 @@ aria-label="day picker" name="duration-day" type="text" - class="duration-day form-control" + class="duration-day form-control rounded" disabled={{@disabled}} pattern={{this.pattern}} value={{this.displayValue}} @@ -14,4 +14,4 @@ {{on "change" this.change}} {{on "keyup" this.handleKeyPress}} {{on "focusout" (optional @onFocusOut)}} -/> +/> \ No newline at end of file diff --git a/frontend/app/components/sy-durationpicker/template.hbs b/frontend/app/components/sy-durationpicker/template.hbs index 9ab9c1a7..de2838f8 100644 --- a/frontend/app/components/sy-durationpicker/template.hbs +++ b/frontend/app/components/sy-durationpicker/template.hbs @@ -43,4 +43,4 @@ {{on "keyup" this.handleKeyPress}} {{on "focusout" (optional @onFocusOut)}} /> -{{/if}} +{{/if}} \ No newline at end of file diff --git a/frontend/app/components/sy-modal-target/template.hbs b/frontend/app/components/sy-modal-target/template.hbs index 5843e1dd..ac4482ca 100644 --- a/frontend/app/components/sy-modal-target/template.hbs +++ b/frontend/app/components/sy-modal-target/template.hbs @@ -1 +1 @@ -
+
\ No newline at end of file diff --git a/frontend/app/components/sy-modal/body/template.hbs b/frontend/app/components/sy-modal/body/template.hbs index 1ca19b41..a0e30df5 100644 --- a/frontend/app/components/sy-modal/body/template.hbs +++ b/frontend/app/components/sy-modal/body/template.hbs @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/frontend/app/components/sy-modal/footer/template.hbs b/frontend/app/components/sy-modal/footer/template.hbs index 9c9c24ff..868df63e 100644 --- a/frontend/app/components/sy-modal/footer/template.hbs +++ b/frontend/app/components/sy-modal/footer/template.hbs @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/frontend/app/components/sy-modal/header/template.hbs b/frontend/app/components/sy-modal/header/template.hbs index f3a441ac..92398f8f 100644 --- a/frontend/app/components/sy-modal/header/template.hbs +++ b/frontend/app/components/sy-modal/header/template.hbs @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/frontend/app/components/sy-modal/overlay/template.hbs b/frontend/app/components/sy-modal/overlay/template.hbs index bdb98a62..2ecdf0b0 100644 --- a/frontend/app/components/sy-modal/overlay/template.hbs +++ b/frontend/app/components/sy-modal/overlay/template.hbs @@ -1,8 +1,8 @@ +
\ No newline at end of file diff --git a/frontend/app/components/sy-modal/template.hbs b/frontend/app/components/sy-modal/template.hbs index 8fb598fb..9d347885 100644 --- a/frontend/app/components/sy-modal/template.hbs +++ b/frontend/app/components/sy-modal/template.hbs @@ -1,7 +1,7 @@ {{#if @visible}} - {{#in-element this.syModals insertBefore=null}} + {{#in-element this.syModals insertBefore=null}} - \ No newline at end of file diff --git a/frontend/app/components/sy-topnav/template.hbs b/frontend/app/components/sy-topnav/template.hbs index 848ce2bc..2a76b05d 100644 --- a/frontend/app/components/sy-topnav/template.hbs +++ b/frontend/app/components/sy-topnav/template.hbs @@ -1,75 +1,105 @@ - + + + + +
\ No newline at end of file diff --git a/frontend/app/components/task-selection/template.hbs b/frontend/app/components/task-selection/template.hbs index caffd465..2fe6eafa 100644 --- a/frontend/app/components/task-selection/template.hbs +++ b/frontend/app/components/task-selection/template.hbs @@ -51,4 +51,4 @@ clear=this.clear reset=this.reset ) -}} +}} \ No newline at end of file diff --git a/frontend/app/components/timed-clock/template.hbs b/frontend/app/components/timed-clock/template.hbs index f7afa675..79c93bdc 100644 --- a/frontend/app/components/timed-clock/template.hbs +++ b/frontend/app/components/timed-clock/template.hbs @@ -1,13 +1,19 @@ - + - + \ No newline at end of file diff --git a/frontend/app/components/tracking-bar/template.hbs b/frontend/app/components/tracking-bar/template.hbs index b0a3d3f7..b0769766 100644 --- a/frontend/app/components/tracking-bar/template.hbs +++ b/frontend/app/components/tracking-bar/template.hbs @@ -1,4 +1,4 @@ -
+
-
+
@@ -21,19 +25,22 @@ {{#if this.tracking.activity.task.project.customerVisible}} {{/if}}
-
+
-
+
\ No newline at end of file diff --git a/frontend/app/components/user-selection/template.hbs b/frontend/app/components/user-selection/template.hbs index 7f9e2e31..3e075d47 100644 --- a/frontend/app/components/user-selection/template.hbs +++ b/frontend/app/components/user-selection/template.hbs @@ -18,4 +18,4 @@ ) ) ) -}} +}} \ No newline at end of file diff --git a/frontend/app/components/weekly-overview-benchmark/template.hbs b/frontend/app/components/weekly-overview-benchmark/template.hbs index ff8c2026..c2c603e5 100644 --- a/frontend/app/components/weekly-overview-benchmark/template.hbs +++ b/frontend/app/components/weekly-overview-benchmark/template.hbs @@ -1,6 +1,16 @@ -
+
{{#if @showLabel}} - {{@hours}}h + {{@hours}}h {{/if}} -
+
\ No newline at end of file diff --git a/frontend/app/components/weekly-overview-day/template.hbs b/frontend/app/components/weekly-overview-day/template.hbs index 9eac3279..8b503530 100644 --- a/frontend/app/components/weekly-overview-day/template.hbs +++ b/frontend/app/components/weekly-overview-day/template.hbs @@ -1,18 +1,23 @@ -
+
+
-
-
- {{moment-format @day 'DD'}} - {{moment-format @day 'dd'}} + {{moment-format @day "DD"}} + {{moment-format @day "dd"}}
-
+
\ No newline at end of file diff --git a/frontend/app/components/weekly-overview/template.hbs b/frontend/app/components/weekly-overview/template.hbs index f0977b55..ba7fdb62 100644 --- a/frontend/app/components/weekly-overview/template.hbs +++ b/frontend/app/components/weekly-overview/template.hbs @@ -1,17 +1,26 @@ -
-
- - - - - - - - - - - - +
+
+ + + + + + + + + + + + {{yield}}
-
+
\ No newline at end of file diff --git a/frontend/app/components/welcome-modal/template.hbs b/frontend/app/components/welcome-modal/template.hbs index f469dff8..34e45593 100644 --- a/frontend/app/components/welcome-modal/template.hbs +++ b/frontend/app/components/welcome-modal/template.hbs @@ -35,4 +35,4 @@ Sure - + \ No newline at end of file diff --git a/frontend/app/components/worktime-balance-chart/component.js b/frontend/app/components/worktime-balance-chart/component.js index 5c61b941..c1b13bb1 100644 --- a/frontend/app/components/worktime-balance-chart/component.js +++ b/frontend/app/components/worktime-balance-chart/component.js @@ -31,12 +31,12 @@ export default class WorktimeBalanceChart extends Component { layout: { padding: 10 }, elements: { line: { - borderColor: "rgb(91, 142, 219)", + borderColor: "#2e4b98", backgroundColor: "transparent", borderWidth: 2, }, point: { - borderColor: "rgb(91, 142, 219)", + borderColor: "#2e4b98", backgroundColor: "rgb(255, 255, 255)", hoverBackgroundColor: "rgb(0,0,0)", borderWidth: 2, diff --git a/frontend/app/components/worktime-balance-chart/template.hbs b/frontend/app/components/worktime-balance-chart/template.hbs index 965e139e..6aa411cb 100644 --- a/frontend/app/components/worktime-balance-chart/template.hbs +++ b/frontend/app/components/worktime-balance-chart/template.hbs @@ -1 +1 @@ - + \ No newline at end of file diff --git a/frontend/app/helpers/balance-highlight-class.js b/frontend/app/helpers/balance-highlight-class.js index c3ac5444..5f33ab79 100644 --- a/frontend/app/helpers/balance-highlight-class.js +++ b/frontend/app/helpers/balance-highlight-class.js @@ -21,9 +21,9 @@ export function balanceHighlightClass([balance]) { const minutes = moment.isDuration(balance) ? balance.asMinutes() : 0; if (minutes > 0) { - return "color-success"; + return "text-adfinis-green"; } else if (minutes < 0) { - return "color-danger"; + return "text-danger"; } return ""; diff --git a/frontend/app/index.html b/frontend/app/index.html index 9d5e0817..41af4ec2 100644 --- a/frontend/app/index.html +++ b/frontend/app/index.html @@ -1,22 +1,37 @@ - - + + - + Timed - - - - - + + + + + {{content-for "head"}} - - + + + {{content-for "head-footer"}} - + {{content-for "body"}} diff --git a/frontend/app/index/activities/edit/template.hbs b/frontend/app/index/activities/edit/template.hbs index 971b2be8..e8621fe6 100644 --- a/frontend/app/index/activities/edit/template.hbs +++ b/frontend/app/index/activities/edit/template.hbs @@ -1,14 +1,15 @@
-
+
-
+
{{t.customer}}
{{t.project}}
- {{!-- template-lint-disable no-at-ember-render-modifiers --}} + {{! template-lint-disable no-at-ember-render-modifiers }}
{{t.task}}
-