Skip to content

Commit 91a4d90

Browse files
committed
Adjust layout of now button
1 parent f79236f commit 91a4d90

File tree

2 files changed

+31
-19
lines changed

2 files changed

+31
-19
lines changed

desktop/src/app/components/docedit/core/forms/date/date-value.html

+26-18
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,33 @@
44
{{getFormattedDate()}}
55
</div>
66

7-
<input *ngIf="isDatePickerVisible()"
8-
#dateInput
9-
#datePicker="ngbDatepicker"
10-
class="form-control date-picker-input"
11-
[firstDayOfWeek]="1"
12-
placeholder="dd.mm.yyyy"
13-
container="body"
14-
(click)="toggleDatePicker()"
15-
(blur)="onDateInputBlurred()"
16-
(dateSelect)="update()"
17-
(closed)="onDatePickerClosed()"
18-
(keydown)="onKeyDown($event)"
19-
[(ngModel)]="dateStruct"
20-
ngbDatepicker>
7+
<div *ngIf="isDatePickerVisible()" class="input-group">
8+
<input *ngIf="isDatePickerVisible()"
9+
#dateInput
10+
#datePicker="ngbDatepicker"
11+
class="form-control date-picker-input"
12+
[firstDayOfWeek]="1"
13+
placeholder="dd.mm.yyyy"
14+
container="body"
15+
(click)="toggleDatePicker()"
16+
(blur)="onDateInputBlurred()"
17+
(dateSelect)="update()"
18+
(closed)="onDatePickerClosed()"
19+
(keydown)="onKeyDown($event)"
20+
[(ngModel)]="dateStruct"
21+
ngbDatepicker>
2122

22-
<div *ngIf="isNowButtonVisible()"
23-
class="btn btn-outline-primary now-button"
24-
i18n="@@dcoedit.forms.date.now"
25-
(click)="setCurrentDate()">Jetzt</div>
23+
<button *ngIf="isNowButtonVisible()"
24+
class="btn btn-outline-primary now-button"
25+
i18n="@@dcoedit.forms.date.now"
26+
ngbTooltip="Aktuelles Datum verwenden"
27+
i18n-ngbTooltip="@@docedit.forms.date.now.tooltip"
28+
placement="top"
29+
container="body"
30+
(click)="setCurrentDate()">
31+
<span class="mdi mdi-calendar-clock"></span>
32+
</button>
33+
</div>
2634

2735
<time-input *ngIf="isTimePickerVisible()"
2836
[time]="time"

desktop/src/app/components/docedit/core/forms/date/date-value.scss

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@ date-value {
22
display: flex;
33
position: relative;
44

5+
.input-group {
6+
width: 133px;
7+
}
8+
59
.date-picker-input {
610
width: 100px;
7-
margin-right: 12px !important;
811
}
912

1013
.date-label {
@@ -52,6 +55,7 @@ ngb-datepicker {
5255
height: 33px;
5356
line-height: 18px;
5457
font-size: 14px;
58+
z-index: 5 !important;
5559
}
5660

5761
.timezone-selector {

0 commit comments

Comments
 (0)