Skip to content

Commit 7bd3755

Browse files
committed
Fixes #1255, make sidebar expand/contract buttonmore notceable, also adjust toolbar button colors to be WCAG AA
1 parent d768df0 commit 7bd3755

File tree

2 files changed

+30
-14
lines changed

2 files changed

+30
-14
lines changed

client/styles/abstracts/_variables.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ $themes: (
4949
button-secondary-background-color: $medium-light,
5050
button-color: $black,
5151
button-border-color: $middle-light,
52-
toolbar-button-color: $p5js-pink,
52+
toolbar-button-color: $dark,
5353
toolbar-button-background-color: $medium-light,
5454
button-background-hover-color: $p5js-pink,
5555
button-background-active-color: $p5js-active-pink,
@@ -124,7 +124,7 @@ $themes: (
124124
button-secondary-background-color: $medium-dark,
125125
button-color: $light,
126126
button-border-color: $middle-dark,
127-
toolbar-button-color: $p5js-pink,
127+
toolbar-button-color: $lightest,
128128
toolbar-button-background-color: $medium-dark,
129129
button-background-hover-color: $p5js-pink,
130130
button-background-active-color: $p5js-active-pink,

client/styles/components/_sidebar.scss

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -179,29 +179,45 @@
179179
}
180180
}
181181

182-
.sidebar__expand {
182+
.sidebar__expand,
183+
.sidebar__contract {
183184
@include icon();
184185
position: absolute;
185-
top: #{7 / $base-font-size}rem;
186-
left: #{1 / $base-font-size}rem;
187-
height: #{14 / $base-font-size}rem;
186+
top: #{2 / $base-font-size}rem;
187+
left: #{0 / $base-font-size}rem;
188+
height: #{25 / $base-font-size}rem;
189+
width: #{49 / $base-font-size}rem;
190+
border-radius: 2px;
188191
& svg {
189-
height: #{14 / $base-font-size}rem;
192+
height: #{25 / $base-font-size}rem;
193+
}
194+
@include themify() {
195+
background-color: getThemifyVariable("toolbar-button-background-color");
196+
& polygon {
197+
fill: getThemifyVariable("toolbar-button-color");
198+
}
199+
&:hover {
200+
background-color: getThemifyVariable("button-background-hover-color");
201+
& polygon {
202+
fill: getThemifyVariable("button-hover-color");
203+
}
204+
}
190205
}
206+
}
207+
208+
.sidebar__expand {
191209
display: none;
210+
&:hover {
211+
cursor: e-resize;
212+
}
192213
.sidebar--contracted & {
193214
display: inline-block;
194215
}
195216
}
196217

197218
.sidebar__contract {
198-
@include icon();
199-
position: absolute;
200-
top: #{7 / $base-font-size}rem;
201-
left: #{1 / $base-font-size}rem;
202-
height: #{14 / $base-font-size}rem;
203-
& svg {
204-
height: #{14 / $base-font-size}rem;
219+
&:hover {
220+
cursor: w-resize;
205221
}
206222
.sidebar--contracted & {
207223
display: none;

0 commit comments

Comments
 (0)