Skip to content

Commit d4e8b70

Browse files
committed
refactor: Consolidate CSS variable usage
1 parent b4d018f commit d4e8b70

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

app/assets/stylesheets/general/_button.sass

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@
3535
color: var(--button--text--hover)
3636
outline-color: var(--button--background--hover)
3737
&:disabled
38-
@include css4
39-
color: var(--primary-lightest)
40-
border: 1px solid var(--primary-lightest)
41-
@include box-shadow(inset 0 0 0 0 var(--primary-light))
38+
color: #bbb
39+
border: 1px solid #bbb
40+
@include box-shadow(inset 0 0 0 0)
4241
background: transparent
4342
cursor: default
4443

app/assets/stylesheets/general/_status-colors.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
color: darken(#0df, 7%)
77
.acc-status-late_waitlist
88
@include css4
9-
color: var(--primary-darkest)
9+
color: #ac5408
1010
.acc-status-pending
1111
@include css4
1212
color: var(--primary)

app/assets/stylesheets/general/_variables.scss

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@ $variables: (
2929
* Standardized colors
3030
***************************************************************************/
3131
--primary: #f58625,
32-
--primary-light: lighten(#f58625, 5%),
33-
--primary-lighter: lighten(#f58625, 10%),
34-
--primary-lighterer: lighten(#f58625, 15%),
35-
--primary-lightest: lighten(#f58625, 40%),
36-
--primary-darkest: darken(#f58625, 20%),
32+
--primary-light: lighten(#f58625, 12%),
3733
/*
3834
* General colors
3935
***************************************************************************/
@@ -68,15 +64,15 @@ $variables: (
6864
* Links
6965
***************************************************************************/
7066
--link--text: var(--primary),
71-
--link--text--hover: var(--primary-lighter),
67+
--link--text--hover: var(--primary-light),
7268
/*
7369
* Buttons
7470
***************************************************************************/
7571
--button--background: var(--primary),
7672
--button--border: var(--primary),
7773
--button--text: var(--white-pure),
78-
--button--background--hover: var(--primary-lighterer),
79-
--button--border--hover: var(--primary-lighterer),
74+
--button--background--hover: var(--primary-light),
75+
--button--border--hover: var(--primary-light),
8076
--button--text--hover: var(--white-pure),
8177
/*
8278
* Forms

0 commit comments

Comments
 (0)