Skip to content

Commit 16f6246

Browse files
authored
Merge pull request #8687 from jrjohnson/replace-color-variables
Replace sass Color Variables with css Custom Properties
2 parents c60157a + 023bd0c commit 16f6246

File tree

222 files changed

+772
-758
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

222 files changed

+772
-758
lines changed

packages/frontend/app/styles/components/api-version-check.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
@use "../ilios-common/colors" as c;
22
@use "../ilios-common/mixins" as m;
33

4-
.api-version-check-warning {
5-
background-color: rgba(c.$orange, 0.95);
6-
}
7-
84
.api-version-check-container {
95
width: 80%;
106

packages/frontend/app/styles/components/bulk-new-users.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
overflow-y: scroll;
5353

5454
.error {
55-
border: 1px solid c.$crimson;
56-
color: c.$crimson;
55+
border: 1px solid var(--crimson);
56+
color: var(--crimson);
5757
}
5858

5959
table {
@@ -72,13 +72,13 @@
7272

7373
.saving-user-errors,
7474
.saving-authentication-errors {
75-
border: 1px solid c.$crimson;
76-
border-top: 10px solid c.$crimson;
75+
border: 1px solid var(--crimson);
76+
border-top: 10px solid var(--crimson);
7777
margin: 1rem 4rem;
7878
padding: 0 1rem 1rem;
7979

8080
p {
81-
color: c.$crimson;
81+
color: var(--crimson);
8282
}
8383

8484
li {

packages/frontend/app/styles/components/connection-status.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
.connection-status {
55
$height: 2.5rem;
6-
@include m.critical-notice(c.$gold, c.$raisinBlack, $height);
6+
@include m.critical-notice(var(--gold), var(--raisin-black), $height);
77

88
display: none;
99

@@ -20,9 +20,9 @@
2020
height: $height;
2121

2222
button {
23-
background-color: c.$raisinBlack;
23+
background-color: var(--raisin-black);
2424
border: 0;
25-
color: c.$white;
25+
color: var(--white);
2626
display: inline-block;
2727
height: 100%;
2828
}

packages/frontend/app/styles/components/course-director-manager.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
justify-content: flex-end;
88

99
.bigadd {
10-
background-color: c.$fernGreen;
11-
color: c.$white;
10+
background-color: var(--fern-green);
11+
color: var(--white);
1212
margin-right: 0.25rem;
1313
}
1414

1515
.bigcancel {
16-
background-color: c.$crimson;
17-
color: c.$white;
16+
background-color: var(--crimson);
17+
color: var(--white);
1818
}
1919
}
2020

packages/frontend/app/styles/components/course-search-result.scss

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@
66
padding: 0.5rem 0;
77

88
.course-flag {
9-
background: c.$fernGreen;
9+
background: var(--fern-green);
1010
border-radius: 2px;
1111
bottom: 2px;
12-
color: c.$white;
12+
color: var(--white);
1313
display: inline-block;
1414
@include m.font-size("smallest");
1515
padding: 2px 3px 1px;
1616
position: relative;
1717
}
1818

1919
.school-flag {
20-
background: c.$fernGreen;
20+
background: var(--fern-green);
2121
border-radius: 2px;
2222
bottom: 2px;
23-
color: c.$white;
23+
color: var(--white);
2424
display: inline-block;
2525
@include m.font-size("smallest");
2626
padding: 2px 3px 1px;
@@ -32,7 +32,7 @@
3232
padding: 0.25rem 0.75rem 0;
3333

3434
.sessions {
35-
color: c.$davysGrey;
35+
color: var(--davys-grey);
3636
@include m.font-size("small");
3737
}
3838
}
@@ -58,10 +58,10 @@
5858
overflow: hidden;
5959

6060
.global-search-tag {
61-
background: c.$slightWhite;
62-
border: 1px solid c.$davysGrey;
61+
background: var(--slight-white);
62+
border: 1px solid var(--davys-grey);
6363
border-radius: 0.125rem;
64-
color: c.$raisinBlack;
64+
color: var(--raisin-black);
6565
display: inline-block;
6666
@include m.font-size("smallest");
6767
margin-right: 0.375rem;

packages/frontend/app/styles/components/courses/loading.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
.toggle-mycourses .toggle-buttons label {
66
@include cm.loading-text;
77
cursor: default;
8-
background-color: c.$culturedGrey;
8+
background-color: var(--cultured-grey);
99
}
1010
}

packages/frontend/app/styles/components/courses/new.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
@use "../../ilios-common/mixins" as m;
33

44
.courses-new {
5-
background-color: c.$slightWhite;
6-
border: 1px solid c.$culturedGrey;
5+
background-color: var(--slight-white);
6+
border: 1px solid var(--cultured-grey);
77
margin: 0.5rem 0;
88
padding: 1rem;
99

packages/frontend/app/styles/components/curriculum-inventory/new-report.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
@use "../../ilios-common/mixins" as m;
33

44
.curriculum-inventory-new-report {
5-
background-color: c.$slightWhite;
6-
border: 1px solid c.$culturedGrey;
5+
background-color: var(--slight-white);
6+
border: 1px solid var(--cultured-grey);
77
margin: 0.5rem 0;
88
padding: 1rem;
99

packages/frontend/app/styles/components/curriculum-inventory/new-sequence-block.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
@use "../../ilios-common/mixins" as m;
33

44
.curriculum-inventory-new-sequence-block {
5-
background-color: c.$slightWhite;
6-
border: 1px solid c.$culturedGrey;
5+
background-color: var(--slight-white);
6+
border: 1px solid var(--cultured-grey);
77
margin: 0.5rem 0;
88
padding: 1rem;
99

packages/frontend/app/styles/components/curriculum-inventory/report-details.scss

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
@use "../../ilios-common/mixins" as m;
33

44
.curriculum-inventory-report-details {
5-
@include m.detail-container(c.$orange);
5+
@include m.detail-container(var(--orange));
66
margin: 0 0.5rem;
77

88
.title {
99
@include m.detail-container-title;
1010
}
1111

1212
.confirm-finalize {
13-
background-color: c.$lavenderBlush;
13+
background-color: var(--lavender-blush);
1414

1515
.confirm-message {
16-
color: c.$rosewood;
16+
color: var(--rosewood);
1717
font-weight: bold;
1818
padding: 1rem 10%;
1919
text-align: center;
@@ -24,12 +24,12 @@
2424
}
2525

2626
.finalize {
27-
background-color: c.$white;
28-
color: c.$rosewood;
27+
background-color: var(--white);
28+
color: var(--rosewood);
2929

3030
&:hover {
31-
background-color: c.$crimson;
32-
color: c.$white;
31+
background-color: var(--crimson);
32+
color: var(--white);
3333
}
3434
}
3535
}

0 commit comments

Comments
 (0)