Skip to content

Commit 909c1a9

Browse files
BlariBlari
committed
Fix calendars
1 parent 6f34083 commit 909c1a9

27 files changed

+273
-209
lines changed

‎src/app/styles/breadcrumb.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'colors';
1+
@import "colors";
22

33
$breadcrumb-title-color: $grey;
44
$breadcrumb-active-title-color: $blue;

‎src/app/styles/calendar.scss

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
@mixin calendar {
2+
.cal-month-view {
3+
background: transparent;
4+
}
5+
6+
mwl-calendar-month-view .cal-month-view .cal-cell-row, mwl-calendar-month-view .cal-month-view .cal-cell-row mwl-calendar-month-cell, mwl-calendar-month-view .cal-month-view .cal-cell-row mwl-calendar-month-cell .cal-cell-top {
7+
min-height: 17px;
8+
}
9+
10+
span.cal-day-number {
11+
margin: 0 !important;
12+
font-family: Fira Sans, sans-serif !important;
13+
font-weight: $fw-normal !important;
14+
font-size: 12px !important;
15+
line-height: 14px !important;
16+
text-align: center !important;
17+
opacity: 1 !important;
18+
cursor: pointer;
19+
}
20+
21+
.cal-month-view .cal-day-cell.cal-weekend .cal-day-number {
22+
color: $dark-grey;
23+
}
24+
25+
.cal-month-view .cal-days .cal-cell-row {
26+
border: none;
27+
align-items: flex-end;
28+
justify-content: space-between;
29+
30+
&:hover {
31+
background-color: transparent;
32+
}
33+
}
34+
35+
.cal-month-view .cal-day-cell:not(:last-child) {
36+
border: none;
37+
display: flex;
38+
flex-direction: column-reverse;
39+
}
40+
41+
div.cal-cell-row.cal-header {
42+
color: $white-gray;
43+
margin-bottom: -10px;
44+
45+
&:hover {
46+
background-color: transparent;
47+
}
48+
}
49+
50+
.cal-month-view .cal-cell-row .cal-cell:hover, .cal-month-view .cal-cell.cal-has-events.cal-open {
51+
background-color: #8B9BFF;
52+
}
53+
54+
.cal-month-view .cal-day-cell {
55+
border: none;
56+
display: flex;
57+
align-items: center;
58+
flex-direction: column-reverse;
59+
margin-bottom: 12px;
60+
}
61+
62+
.cal-month-view .cal-days {
63+
border: none;
64+
}
65+
66+
.cal-month-view .cal-day-cell.cal-today {
67+
background-color: #8B9BFF;
68+
border-radius: 50%;
69+
color: $white;
70+
min-width: 20px;
71+
min-height: 20px;
72+
max-width: 20px;
73+
max-height: 20px;
74+
}
75+
76+
div.cal-cell-top {
77+
display: flex;
78+
align-items: center;
79+
}
80+
81+
span.cal-day-badge {
82+
display: none !important;
83+
}
84+
85+
.cal-month-view div.cal-event {
86+
width: 4px;
87+
height: 4px;
88+
margin: 0;
89+
}
90+
91+
.cal-month-view .cal-cell {
92+
flex: 0;
93+
}
94+
}
95+
96+
@mixin calendar-dark {
97+
.cal-month-view .cal-day-cell.cal-weekend .cal-day-number {
98+
color: $white;
99+
}
100+
}

‎src/app/styles/colors.scss

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
11
$yellow: #ffc260;
2-
$blue: #536dfe;
3-
$light-blue: #798dfe;
4-
$white-blue: #b1bcff;
5-
$blue-white: #f3f5ff;
2+
$blue: #536DFE;
3+
$light-blue: #798DFE;
4+
$white-blue: #B1BCFF;
5+
$blue-white: #F3F5FF;
66
$pink: #ff4081;
77
$dark-pink: #ff0f60;
8-
$green: #31c2a0;
9-
$violet: #9013fe;
8+
$green: #31C2A0;
9+
$violet: #9013FE;
1010
$white: white;
11-
$dark-grey: #4a4a4a;
12-
$light-grey: #b9b9b9;
13-
$grey: #6e6e6e;
11+
$dark-grey: #4A4A4A;
12+
$light-grey: #B9B9B9;
13+
$grey: #6E6E6E;
1414
$sky: #c0caff;
15-
$default: #e0e0e0;
15+
$default: #E0E0E0;
16+
1617

1718
$white-35: rgba(255, 255, 255, 0.35);
1819
$white-50: rgba(255, 255, 255, 0.5);
1920
$white-70: rgba(255, 255, 255, 0.7);
20-
$white-80: #ffffff80;
21+
$white-80: #FFFFFF80;
2122

2223
$white-gray: rgba(224, 224, 224, 0.5);
2324

2425
$gray-08: rgba(110, 110, 110, 0.8);
25-
$gray-80: #d8d8d880;
26+
$gray-80: #D8D8D880;
2627
$gray-06: rgba(110, 110, 110, 0.6);
2728
$gray-70: rgba(155, 155, 155, 0.7);
2829

@@ -42,8 +43,8 @@ $green-20: rgba(60, 212, 160, 0.2);
4243
$yellow-20: rgba(255, 194, 96, 0.25);
4344
$violet-20: rgba(144, 19, 254, 0.2);
4445

45-
$shadow-white: #e8eafc;
46-
$shadow-grey: #b2b2b21a;
47-
$shadow-dark-grey: #9a9a9a1a;
46+
$shadow-white: #E8EAFC;
47+
$shadow-grey: #B2B2B21A;
48+
$shadow-dark-grey: #9A9A9A1A;
4849

49-
$background-color: #f6f7ff;
50+
$background-color: #F6F7FF;

‎src/app/styles/font.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ $fw-normal: 500;
33
$fw-bold: 600;
44
$fw-extra-bold: 700;
55

6+
67
$fs-xs: 11.2px;
78
$fs-small: 14px;
89
$fs-normal: 16px;

‎src/app/styles/footer.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
background-color: $header-button-background-color-hover;
1313
}
1414

15-
&:not([class*='mat-elevation-z']) {
15+
&:not([class*=mat-elevation-z]) {
1616
box-shadow: inherit;
1717
}
1818
}

‎src/app/styles/full-calendar.scss

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
@mixin full-calendar {
2+
td.fc-day.fc-today {
3+
background-color: $blue;
4+
opacity: 0.2;
5+
}
6+
7+
th.fc-day-header.fc-widget-header {
8+
font-weight: $fw-normal;
9+
}
10+
}

‎src/app/styles/header.scss

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ $header-button-font-color: $white;
77
$header-button-box-shadow: none;
88
$header-title-font-color: $white;
99

10-
$header-background-dark-theme: #31313c;
11-
$header-title-color-dark-theme: #889aff;
10+
$header-background-dark-theme: #31313C;
11+
$header-title-color-dark-theme: #889AFF;
12+
1213

1314
@mixin header() {
1415
.header {
@@ -20,7 +21,7 @@ $header-title-color-dark-theme: #889aff;
2021
background-color: $header-button-background-color-hover;
2122
}
2223

23-
&:not([class*='mat-elevation-z']) {
24+
&:not([class*=mat-elevation-z]) {
2425
box-shadow: inherit;
2526
}
2627
}
@@ -43,7 +44,7 @@ $header-title-color-dark-theme: #889aff;
4344
background-color: $header-button-background-color-hover;
4445
}
4546

46-
&:not([class*='mat-elevation-z']) {
47+
&:not([class*=mat-elevation-z]) {
4748
box-shadow: inherit;
4849
}
4950
}

‎src/app/styles/mat-button-toggle.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'colors';
1+
@import "colors";
22

33
@mixin mat-toggle() {
44
.mat-button-toggle-checked.mat-button-toggle-appearance-standard {

‎src/app/styles/mat-button.scss

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,27 @@
1-
@import 'colors';
1+
@import "colors";
22

3-
$raised-button-shadow: 0 3px 11px 0 $shadow-white, 0 3px 3px -2px $shadow-grey,
4-
0 1px 8px 0 $shadow-dark-grey;
3+
$raised-button-shadow: 0 3px 11px 0 $shadow-white, 0 3px 3px -2px $shadow-grey, 0 1px 8px 0 $shadow-dark-grey;
54

65
@mixin mat-button() {
7-
.mat-flat-button,
8-
.mat-raised-button,
9-
.mat-fab,
10-
.mat-mini-fab {
6+
.mat-flat-button, .mat-raised-button, .mat-fab, .mat-mini-fab {
117
color: $dark-grey;
128
background-color: $default;
139
letter-spacing: 0.02857em;
1410
text-transform: uppercase;
1511
box-shadow: none;
1612
}
1713

18-
.mat-mini-fab:not([class*='mat-elevation-z']) {
14+
.mat-mini-fab:not([class*=mat-elevation-z]) {
1915
box-shadow: none;
2016
}
2117

22-
.mat-raised-button:not([class*='mat-elevation-z']) {
18+
.mat-raised-button:not([class*=mat-elevation-z]) {
2319
box-shadow: $raised-button-shadow;
2420
}
2521
}
2622

2723
@mixin mat-button-dark() {
28-
.mat-raised-button:not([class*='mat-elevation-z']) {
24+
.mat-raised-button:not([class*=mat-elevation-z]) {
2925
box-shadow: none;
3026
}
3127
}

‎src/app/styles/mat-card.scss

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
@import 'colors';
1+
@import "colors";
22

33
$card-font-color: $dark-grey;
44
$card-title-font-color: $grey;
55
$card-padding: 24px;
66
$card-title-font-size: $fs-medium;
77
$card-title-font-weight: $fw-lighter;
8-
$card-shadow: 0 3px 11px 0 $shadow-white, 0 3px 3px -2px $shadow-grey,
9-
0 1px 8px 0 $shadow-dark-grey;
8+
$card-shadow: 0 3px 11px 0 $shadow-white, 0 3px 3px -2px $shadow-grey, 0 1px 8px 0 $shadow-dark-grey;
109

11-
$card-background-dark-theme: #23232d;
10+
$card-background-dark-theme: #23232D;
1211

1312
@mixin mat-card() {
1413
.mat-card {
@@ -17,12 +16,12 @@ $card-background-dark-theme: #23232d;
1716
box-shadow: $card-shadow;
1817
padding: $card-padding;
1918

20-
&:not([class*='mat-elevation-z']) {
19+
&:not([class*=mat-elevation-z]) {
2120
box-shadow: $card-shadow;
2221
}
2322

2423
.mat-card-title {
25-
& > p {
24+
&>p {
2625
font-size: $card-title-font-size;
2726
font-weight: $card-title-font-weight;
2827
color: $card-title-font-color;
@@ -40,7 +39,7 @@ $card-background-dark-theme: #23232d;
4039
color: $white;
4140
}
4241

43-
&:not([class*='mat-elevation-z']) {
42+
&:not([class*=mat-elevation-z]) {
4443
box-shadow: none;
4544
}
4645

@@ -52,19 +51,19 @@ $card-background-dark-theme: #23232d;
5251

5352
.mat-card-subtitle {
5453
& p {
55-
color: #d6d6d6;
54+
color: #D6D6D6;
5655
}
5756
}
5857

5958
.mat-card-content {
6059
& p {
61-
color: #d6d6d6;
60+
color: #D6D6D6;
6261
}
6362
}
6463

6564
.mat-card-footer {
6665
& p {
67-
color: #d6d6d6;
66+
color: #D6D6D6;
6867
}
6968
}
7069
}

0 commit comments

Comments
 (0)