Skip to content

Commit 1e5696b

Browse files
committed
Working on calendar rendering
1 parent bc79f29 commit 1e5696b

File tree

5 files changed

+98
-624
lines changed

5 files changed

+98
-624
lines changed

web/static/css/widgets/_calendar.sass

Lines changed: 30 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.CalendarWidget
22
$backgroundColor: #254763
3-
$borderColor: #667E91
3+
$borderColor: #e1e1e1
44
$borderSize: 1px
55

66
+widget
@@ -24,14 +24,15 @@
2424
background: none
2525
border: none
2626
font-size: 140%
27-
color: $halfWhite
27+
color: $thirdWhite
2828
outline: none
2929
padding: 0 10px
3030
&:hover
3131
color: $white
3232
.Focus
3333
font-size: 120%
3434
color: $white
35+
cursor: pointer
3536
.Prev
3637
float: left
3738
.Next
@@ -61,22 +62,14 @@
6162
left: 0
6263
.Day
6364
background: white
64-
border: $borderSize solid $borderColor
65-
&.isCurrentMonth
66-
background: lighten($backgroundColor, 69%)
65+
border-left: $borderSize solid $borderColor
66+
border-top: $borderSize solid $borderColor
67+
&:first-child
68+
border-left: none
6769
&.isCurrentWeek
68-
background: lighten($backgroundColor, 61%)
70+
background: lighten($backgroundColor, 69%)
6971
&.isCurrentDay
7072
background: lighten($backgroundColor, 50%)
71-
.isCurrentWeek
72-
.BackgroundCells
73-
.Day
74-
border-top: $borderSize*2 solid darken($borderColor, 10%)
75-
border-bottom: $borderSize*2 solid darken($borderColor, 10%)
76-
&:first-child
77-
border-left: $borderSize*2 solid darken($borderColor, 10%)
78-
&:last-child
79-
border-right: $borderSize*2 solid darken($borderColor, 10%)
8073

8174
.LabelCells
8275
display: flex
@@ -87,20 +80,25 @@
8780
bottom: 0
8881
left: 0
8982
.Labels
90-
padding: 5px
83+
padding: 2px
9184
text-align: left
9285
.CalendarWeek
9386
color: $halfBlack
9487
.Date
9588
float: right
89+
padding: 1px 7px
90+
&.isCurrentDay
91+
background: $backgroundColor
92+
color: $white
93+
border-radius: 20px
9694
.Day-1
9795
font-weight: bold
9896

9997
.WeekEvents
10098
display: flex
10199
flex-direction: column
102100
position: absolute
103-
top: 20px
101+
top: 22px
104102
right: 0
105103
bottom: 0
106104
left: 0
@@ -111,29 +109,25 @@
111109

112110
.Event
113111
background: $backgroundColor
114-
color: $white
112+
color: $black
115113
margin: 1px 2px
116-
padding: 1px 5px
114+
padding: 1px 8px
117115
overflow: hidden
118116
text-overflow: ellipsis
119117
white-space: nowrap
118+
text-align: left
119+
border-color: darken($backgroundColor, 15%)
120+
border-style: solid
121+
border-left-width: 0
122+
border-right-width: 0
123+
border-top-width: 1px
124+
border-bottom-width: 1px
120125

121126
&.isStarted
122-
border-top-left-radius: 5px
123-
border-bottom-left-radius: 5px
127+
border-top-left-radius: 8px
128+
border-bottom-left-radius: 8px
129+
border-left-width: 1px
124130
&.isEnded
125-
border-top-right-radius: 5px
126-
border-bottom-right-radius: 5px
127-
&.isUnconfirmed
128-
$unconfirmedBorderSize: 2px
129-
padding: 1px-$unconfirmedBorderSize 5px-$unconfirmedBorderSize
130-
border-top-style: solid
131-
border-top-width: $unconfirmedBorderSize
132-
border-bottom-style: solid
133-
border-bottom-width: $unconfirmedBorderSize
134-
&.isStarted
135-
border-left-style: solid
136-
border-left-width: $unconfirmedBorderSize
137-
&.isEnded
138-
border-right-style: solid
139-
border-right-width: $unconfirmedBorderSize
131+
border-top-right-radius: 8px
132+
border-bottom-right-radius: 8px
133+
border-right-width: 1px

0 commit comments

Comments
 (0)