diff --git a/src/app/schedules/schedules.component.html b/src/app/schedules/schedules.component.html index 0d7be50..e61bbee 100644 --- a/src/app/schedules/schedules.component.html +++ b/src/app/schedules/schedules.component.html @@ -18,7 +18,7 @@ {{ preceedingDay }} - + {{ selectedMonthDay }} @@ -39,6 +39,13 @@
+
+
Shop Events
+ +
+
@@ -52,7 +59,7 @@
{{ preceedingDay }} - + {{ selectedMonthDay }} diff --git a/src/app/schedules/schedules.component.scss b/src/app/schedules/schedules.component.scss index 7f1541a..a24e464 100644 --- a/src/app/schedules/schedules.component.scss +++ b/src/app/schedules/schedules.component.scss @@ -3,15 +3,24 @@ margin-left: auto; display: flex; align-items: stretch; + + @media screen and (max-width: 1023px) { + width: 100%; + height: 100%; + } } .calendar-holder { - width: 65%; + width: calc(100% - 400px); margin-right: auto; position: relative; height: calc(100vh - 70px); overflow: auto; + @media screen and (max-width: 1023px) { + display: none; + } + .widget-heading-holder { width: 100%; } @@ -54,14 +63,22 @@ } .schedule-list-holder { - width: 30%; + width: 350px; background-color: white; height: calc(100vh - 70px); overflow: auto; + @media screen and (max-width: 1023px) { + width: 100%; + height: 100%; + } &:hover { &::-webkit-scrollbar { display: block; + + @media screen and (max-width: 1023px) { + display: none; + } } } @@ -82,6 +99,29 @@ &::-webkit-scrollbar-thumb:hover { background-color: rgba(black, 0.5); } + + .widget-heading-holder { + display: none; + + @media screen and (max-width: 1023px) { + display: flex; + flex-direction: row; + align-items: center; + width: 100%; + padding: 20px 5%; + margin: 0; + justify-content: space-between; + background-color: #efefef; + + header { + margin-bottom: 0; + } + + button { + background-color: var(--brand-blue); + } + } + } } .calendar { @@ -189,11 +229,15 @@ .mini-calendar { background-color: white; - width: 90%; + width: 280px; margin: 30px auto 20px; padding-bottom: 20px; border-bottom: 1px solid #cecece; + @media screen and (max-width: 1023px) { + margin: 20px auto; + } + .month { padding: 5px 0 20px; display: flex; @@ -224,10 +268,10 @@ .days { display: flex; - width: 100%; + width: 280px; span { - width: calc(100% / 7); + width: 40px; text-align: center; font-size: 12px; color: var(--grey); @@ -237,25 +281,42 @@ .dates { display: flex; - width: 100%; + width: 280px; flex-wrap: wrap; + pointer-events: none; + + @media screen and (max-width: 1023px) { + pointer-events: all; + } span { display: block; cursor: pointer; font-size: 12px; - width: calc(100% / 7); + width: 40px; color: var(--dark-grey); font-weight: 400; position: relative; - padding: 10px 0; text-align: center; + transition: background-color 0.3s, color 0.3s; + border-radius: 50%; + height: 40px; + display: flex; + align-items: center; + justify-content: center; &.current-date { border: 2px solid var(--brand-blue); border-radius: 50%; } + &.active { + @media screen and (max-width: 1023px) { + background-color: var(--brand-blue); + color: white; + } + } + &.non-current-date { color: #cecece; } @@ -541,10 +602,21 @@ width: 100%; justify-content: space-between; + @media screen and (max-width: 1023px) { + justify-content: center; + } + button:last-child { background-color: white; color: var(--brand-blue); border: 1px solid var(--brand-blue); } + + button { + @media screen and (max-width: 1023px) { + margin: 0 10px; + padding: 0 15px; + } + } } } diff --git a/src/app/schedules/schedules.component.ts b/src/app/schedules/schedules.component.ts index d59acc7..84aff34 100644 --- a/src/app/schedules/schedules.component.ts +++ b/src/app/schedules/schedules.component.ts @@ -46,8 +46,8 @@ export class SchedulesComponent implements OnInit { this.selectedDatesForSchedule = dates; } - selectDay(selectedMonthDay: number) { - this.selectedDate = selectedMonthDay; + toggleDates(date: number) { + this.selectedDatesForSchedule.includes(date)? this.selectedDatesForSchedule.splice(this.selectedDatesForSchedule.indexOf(date), 1): this.selectedDatesForSchedule.push(date); } renderCalendar() { diff --git a/src/app/widgets-holder/widgets-holder.component.html b/src/app/widgets-holder/widgets-holder.component.html index 84720c2..bf01d5e 100644 --- a/src/app/widgets-holder/widgets-holder.component.html +++ b/src/app/widgets-holder/widgets-holder.component.html @@ -39,6 +39,9 @@
  • +
  • + +
  • diff --git a/src/app/widgets-holder/widgets-holder.component.scss b/src/app/widgets-holder/widgets-holder.component.scss index e89ca81..d1629b1 100644 --- a/src/app/widgets-holder/widgets-holder.component.scss +++ b/src/app/widgets-holder/widgets-holder.component.scss @@ -189,8 +189,17 @@ } } - &:nth-child(5) { + &:nth-child(5), &:nth-child(6) { + @media screen and (max-width: 1023px) { + display: none; + } + } + &:nth-child(7) { display: none; + + @media screen and (max-width: 1023px) { + display: block; + } } &::before { diff --git a/src/app/widgets-holder/widgets-holder.component.ts b/src/app/widgets-holder/widgets-holder.component.ts index b05a8c7..4642403 100644 --- a/src/app/widgets-holder/widgets-holder.component.ts +++ b/src/app/widgets-holder/widgets-holder.component.ts @@ -6,7 +6,7 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./widgets-holder.component.scss'] }) export class WidgetsHolderComponent implements OnInit { - selected_nav: string = 'items'; + selected_nav: string = 'settings'; constructor() { }