diff --git a/customer/app/src/app/components/month-calendar-day/month-calendar-day.component.html b/customer/app/src/app/components/month-calendar-day/month-calendar-day.component.html index 1e1eb59..a648935 100644 --- a/customer/app/src/app/components/month-calendar-day/month-calendar-day.component.html +++ b/customer/app/src/app/components/month-calendar-day/month-calendar-day.component.html @@ -1,15 +1,21 @@ -
- {{getDateOfDay()}} - {{getDayOfWeekName()}} - -
-

No events

- - - + +
+
+
{{getMonthOfDay()}}.{{getDateOfDay()}}
+
{{getMonthOfDay()}}.
+
{{getDateOfDay()}}
+
+ {{getDayOfWeekName()}} +
+
-
+
+ + + +
diff --git a/customer/app/src/app/components/month-calendar-day/month-calendar-day.component.scss b/customer/app/src/app/components/month-calendar-day/month-calendar-day.component.scss index efc100a..e69de29 100644 --- a/customer/app/src/app/components/month-calendar-day/month-calendar-day.component.scss +++ b/customer/app/src/app/components/month-calendar-day/month-calendar-day.component.scss @@ -1,20 +0,0 @@ -@media (max-width:575px) { - .display-4 { - font-size: 1.5rem; - } - .day h5 { - background-color: #f8f9fa; - padding: 3px 5px 5px; - margin: -8px -8px 8px -8px; - } - .date { - padding-left: 16px; - } -} - -@media (min-width: 576px) { - .day { - min-height: 14.2857vw; - } -} - diff --git a/customer/app/src/app/components/month-calendar-day/month-calendar-day.component.ts b/customer/app/src/app/components/month-calendar-day/month-calendar-day.component.ts index d13b43f..3d7e887 100644 --- a/customer/app/src/app/components/month-calendar-day/month-calendar-day.component.ts +++ b/customer/app/src/app/components/month-calendar-day/month-calendar-day.component.ts @@ -33,17 +33,21 @@ export class MonthCalendarDayComponent implements OnInit { return this.oMoment.format('DD'); } + getMonthOfDay(){ + return this.oMoment.format('MMM'); + } + hasEvents(){ return this.day.active && this.day.events && this.day.events.length; } @HostBinding('class') get styleClass(){ - let styleClass = "day col-sm p-2 border border-left-0 border-top-0 text-truncate"; - if ( !this.day.active ){ - styleClass += " d-none d-sm-inline-block bg-light text-muted"; - } else { - styleClass += " bg-primary text-light" - } + let styleClass = "day text-truncate"; + // if ( !this.day.active ){ + // styleClass += " d-none d-md-block bg-light text-muted"; + // } else { + // styleClass += " bg-light " + // } return styleClass; } diff --git a/customer/app/src/app/components/month-calendar/month-calendar.component.html b/customer/app/src/app/components/month-calendar/month-calendar.component.html index a2cbac9..70c205a 100644 --- a/customer/app/src/app/components/month-calendar/month-calendar.component.html +++ b/customer/app/src/app/components/month-calendar/month-calendar.component.html @@ -1,14 +1,17 @@ -

Naptár

-
-
{{dayOfWeek.name}}
-
-
+
+
+
+ {{dayOfWeek.name}} + {{dayOfWeek.shortName}} +
+
+
+
-
+
-
diff --git a/customer/app/src/app/components/month-calendar/month-calendar.component.scss b/customer/app/src/app/components/month-calendar/month-calendar.component.scss index b3d75dc..8c32fd6 100644 --- a/customer/app/src/app/components/month-calendar/month-calendar.component.scss +++ b/customer/app/src/app/components/month-calendar/month-calendar.component.scss @@ -1,22 +1,11 @@ -@media (max-width:575px) { - .display-4 { - font-size: 1.5rem; - } - .day h5 { - background-color: #f8f9fa; - padding: 3px 5px 5px; - margin: -8px -8px 8px -8px; - } - .date { - padding-left: 4px; - } -} +@import "node_modules/bootstrap/scss/functions"; +@import "node_modules/bootstrap/scss/variables"; +@import "node_modules/bootstrap/scss/mixins"; -@media (min-width: 576px) { + + +@include media-breakpoint-up(md) { .day { - min-height: 14.2857vw; + min-height: 20vh; } } -.name-of-day-of-week{ - text-transform: capitalize; -} diff --git a/customer/app/src/app/components/month-calendar/month-calendar.component.ts b/customer/app/src/app/components/month-calendar/month-calendar.component.ts index 0bc8b03..9479331 100644 --- a/customer/app/src/app/components/month-calendar/month-calendar.component.ts +++ b/customer/app/src/app/components/month-calendar/month-calendar.component.ts @@ -37,6 +37,7 @@ export class MonthCalendarComponent implements OnInit, OnChanges { const date = moment.unix(this.eventsAvailableResponse.dates[i].date); const dayOfWeek = { name: date.format("dddd"), + shortName: date.format("ddd"), }; this.daysOfWeek.push(dayOfWeek); } @@ -46,6 +47,7 @@ export class MonthCalendarComponent implements OnInit, OnChanges { let momWeekDay = startOfWeek.clone().add(i,'d'); const dayOfWeek = { name: momWeekDay.format("dddd"), + shortName: momWeekDay.format("ddd"), }; this.daysOfWeek.push(dayOfWeek); } @@ -72,6 +74,7 @@ export interface Day { export interface DayOfWeek { name: string; + shortName: string; } export function dateToMoment(date: number) { diff --git a/customer/app/src/app/layout/guest-layout/guest-layout.component.scss b/customer/app/src/app/layout/guest-layout/guest-layout.component.scss index fba55dc..e69de29 100644 --- a/customer/app/src/app/layout/guest-layout/guest-layout.component.scss +++ b/customer/app/src/app/layout/guest-layout/guest-layout.component.scss @@ -1,4 +0,0 @@ -div{ - background: url("/assets/images/cutlercross-background.jpg"); - background-repeat: repeat-y; -} diff --git a/customer/app/src/assets/fonts/RobotoMono-VariableFont_wght.ttf b/customer/app/src/assets/fonts/RobotoMono-VariableFont_wght.ttf new file mode 100644 index 0000000..d2b4746 Binary files /dev/null and b/customer/app/src/assets/fonts/RobotoMono-VariableFont_wght.ttf differ diff --git a/customer/app/src/assets/fonts/dcc_sharp_distress_black_by_dccanim.otf b/customer/app/src/assets/fonts/dcc_sharp_distress_black_by_dccanim.otf new file mode 100644 index 0000000..1af593e Binary files /dev/null and b/customer/app/src/assets/fonts/dcc_sharp_distress_black_by_dccanim.otf differ diff --git a/customer/app/src/styles.scss b/customer/app/src/styles.scss index 49fa03c..7d83db5 100644 --- a/customer/app/src/styles.scss +++ b/customer/app/src/styles.scss @@ -7,15 +7,24 @@ $font-size-md: 1.25rem; $font-size-lg: 2.5rem; $font-size-xl: 6.25rem; +// font weight +$font-weight-normal: 400; +$font-weight-medium: 500; +$font-weight-semi-bold: 600; +$font-weight-bold: 700; + $primary: #E3000E ; $secondary: #D2D2D2 ; $light: #FFFFFF ; $dark: #3A3A39 ; +// bootstrap font override +$font-family-sans-serif: Roboto, system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" ; + // regular style toast @import '~ngx-toastr/toastr'; @import "styles/bootstrap-custom"; - +@import "styles/fonts"; html{ height: 100%; } @@ -23,5 +32,7 @@ html{ body{ min-height: 100%; height: 100%; + background: url("/assets/images/cutlercross-background.jpg"); + background-repeat: repeat-y; } diff --git a/customer/app/src/styles/fonts.scss b/customer/app/src/styles/fonts.scss new file mode 100644 index 0000000..98cce17 --- /dev/null +++ b/customer/app/src/styles/fonts.scss @@ -0,0 +1,51 @@ + +@font-face { + font-family: "Roboto"; + src: url("/assets/fonts/RobotoMono-VariableFont_wght.ttf") format("truetype"); + //font-weight: $font-weight-normal; + //font-style: normal; +} + +@font-face { + font-family: "dcc"; + src: url("/assets/fonts/dcc_sharp_distress_black_by_dccanim.otf") format("truetype"); + //font-weight: $font-weight-normal; + //font-style: normal; +} + + +.app-font-size-xs{ + font-size: $font-size-xs !important; +} + +.app-font-size-sm{ + font-size: $font-size-sm !important; +} + +.app-font-size-md{ + font-size: $font-size-md !important; +} + +.app-font-size-lg{ + font-size: $font-size-lg !important; +} + +.app-font-size-xl{ + font-size: $font-size-xl !important; +} + +.app-font-weight-normal { + font-weight: $font-weight-normal; +} + +.app-font-weight-medium { + font-weight: $font-weight-medium; +} + +.app-font-weight-semi-bold { + font-weight: $font-weight-semi-bold; +} + +.app-font-weight-bold { + font-weight: $font-weight-bold; +}