Skip to content

fix: TT-312 [UI] Calendar the section titles is not responsive #731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 20, 2021
Merged

fix: TT-312 [UI] Calendar the section titles is not responsive #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0ec4f9
fix: TT-312 [UI] Calendar the section titles is not responsive
ridouku Aug 18, 2021
63925d1
fix: TT-312 [UI] Rebase from master
ridouku Aug 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/app/modules/time-entries/components/calendar/calendar.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,14 @@

<div>
<div class="row justify-content-between ">
<div class="col-xs-12 col-sm-5 col-md-5 custom-left-buttons-group">
<div class="col-xs-12 col-sm-4 col-md-5 custom-left-buttons-group">
<div class="btn-group" role="group" aria-label="Move date">
<button
mwlCalendarPreviousView
type="button"
[(view)]="calendarView"
[(viewDate)]="currentDate"
class="btn btn-light btn-block m-0"
class="btn btn-navigation btn-light btn-block m-0"
(click)="handleChangeDateEvent()"
>
Previous
Expand All @@ -83,7 +83,7 @@
[ngClass]="{ active: isToday }"
type="button"
[(viewDate)]="currentDate"
class="btn btn-light btn-block m-0"
class="btn btn-navigation btn-light btn-block m-0"
(click)="handleChangeDateEvent()"
>
Today
Expand All @@ -93,7 +93,7 @@
type="button"
[(view)]="calendarView"
[(viewDate)]="currentDate"
class="btn btn-light btn-block m-0"
class="btn btn-navigation btn-light btn-block m-0"
(click)="handleChangeDateEvent()"
[disabled]="nextDateDisabled"
>
Expand All @@ -102,7 +102,7 @@
</div>
</div>
<div class="col-xs-12 col-sm-2 col-md-2 text-center currentDate">
<p class="font-weight-bold h4">
<p class="font-weight-bold h5">
{{ currentDate | date: 'EEEE' }}
</p>
<P class="h5">
Expand All @@ -114,23 +114,23 @@
<button
[ngClass]="{ active: isVisibleForCurrentView(calendarView, [CALENDAR_VIEW_ENUM.Month]) }"
type="button"
class="btn btn-light btn-block m-0"
class="btn btn-navigation btn-light btn-block m-0"
(click)="changeCalendarView(CALENDAR_VIEW_ENUM.Month)"
>
Month
</button>
<button
[ngClass]="{ active: isVisibleForCurrentView(calendarView, [CALENDAR_VIEW_ENUM.Week]) }"
type="button"
class="btn btn-light btn-block m-0"
class="btn btn-navigation btn-light btn-block m-0"
(click)="changeCalendarView(CALENDAR_VIEW_ENUM.Week)"
>
Week
</button>
<button
[ngClass]="{ active: isVisibleForCurrentView(calendarView, [CALENDAR_VIEW_ENUM.Day]) }"
type="button"
class="btn btn-light btn-block m-0"
class="btn btn-navigation btn-light btn-block m-0"
(click)="changeCalendarView(CALENDAR_VIEW_ENUM.Day)"
>
Day
Expand Down
16 changes: 16 additions & 0 deletions src/app/modules/time-entries/components/calendar/calendar.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ $activity-text-size: $max-lines-activity * $line-height-base;
p {
margin: 0;
}
padding-right: 0px;
}

@media (max-width: 576px) {
Expand All @@ -152,3 +153,18 @@ $activity-text-size: $max-lines-activity * $line-height-base;
text-align: start;
}
}

.btn-navigation{
padding-left: 6px;
padding-right: 6px;
}

@media only screen and (min-width : 576px) and (max-width : 767px) {
.currentDate{
margin-left: 14px;
p {
margin: 0;
}
padding-right: 0px;
}
}