Skip to content

Commit c55faaa

Browse files
authored
Merge pull request #4316 from runningonsideprojects/run-stop-icon-refactor
Run and Stop Toolbar Button Color Refactor
2 parents f3d77eb + db94426 commit c55faaa

5 files changed

Lines changed: 192 additions & 164 deletions

File tree

‎client/images/play.svg‎

Lines changed: 2 additions & 4 deletions
Loading

‎client/images/stop.svg‎

Lines changed: 3 additions & 4 deletions
Loading

‎client/modules/IDE/components/Header/Toolbar.jsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ const Toolbar = (props) => {
3636
const showVisibilityDropdown = project?.owner && userIsOwner;
3737

3838
const playButtonClass = classNames({
39-
'toolbar__play-button': true,
40-
'toolbar__play-button--selected': isPlaying
39+
'toolbar-start-stop-button play': true,
40+
'toolbar-start-stop-button--selected play': isPlaying
4141
});
4242
const stopButtonClass = classNames({
43-
'toolbar__stop-button': true,
44-
'toolbar__stop-button--selected': !isPlaying
43+
'toolbar-start-stop-button stop': true,
44+
'toolbar-start-stop-button--selected stop': !isPlaying
4545
});
4646
const preferencesButtonClass = classNames({
4747
'toolbar__preferences-button': true,

‎client/styles/abstracts/_variables.scss‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,13 @@ $themes: (
181181
toast-background-color: $medium-dark,
182182
toast-text-color: $lightest,
183183
toolbar-button-background-color: $medium-light,
184-
toolbar-button-color: $dark
184+
toolbar-button-color: $dark,
185+
toolbar-start-stop-button-background-color: #dbdbdb,
186+
toolbar-start-stop-button-hover-background-color: #ed225e,
187+
toolbar-start-stop-button-hover-outline-color: $p5js-pink,
188+
toolbar-start-stop-button-outline-color: #dbdbdb,
189+
toolbar-start-stop-icon-color: $p5-light-black,
190+
toolbar-start-stop-active-icon-color: #ffffff
185191
),
186192
dark: (
187193
activeline-background-color: $p5-dark-activeline,
@@ -299,7 +305,13 @@ $themes: (
299305
toast-background-color: $medium-light,
300306
toast-text-color: $dark,
301307
toolbar-button-background-color: $medium-dark,
302-
toolbar-button-color: $lightest
308+
toolbar-button-color: $lightest,
309+
toolbar-start-stop-button-background-color: #dedede,
310+
toolbar-start-stop-button-hover-background-color: #ed225e,
311+
toolbar-start-stop-button-hover-outline-color: $p5js-pink,
312+
toolbar-start-stop-button-outline-color: #dedede,
313+
toolbar-start-stop-icon-color: $p5-light-black,
314+
toolbar-start-stop-active-icon-color: #ffffff
303315
),
304316
contrast: (
305317
activeline-background-color: $p5-contrast-activeline,
@@ -414,6 +426,12 @@ $themes: (
414426
toast-background-color: $medium-light,
415427
toast-text-color: $darker,
416428
toolbar-button-background-color: $medium-light,
417-
toolbar-button-color: $dark
429+
toolbar-button-color: $dark,
430+
toolbar-start-stop-button-background-color: $darker,
431+
toolbar-start-stop-button-hover-background-color: $p5-contrast-yellow,
432+
toolbar-start-stop-button-hover-outline-color: $yellow,
433+
toolbar-start-stop-button-outline-color: #ffffff,
434+
toolbar-start-stop-icon-color: #ffffff,
435+
toolbar-start-stop-active-icon-color: #000000
418436
)
419437
);

0 commit comments

Comments
 (0)