Skip to content

Commit 33375a5

Browse files
feat!: add design tokens support (#777)
BREAKING CHANGE: Pre-design-tokens theming is no longer supported. Co-authored-by: Diana Olarte <[email protected]>
1 parent ac471e2 commit 33375a5

File tree

7 files changed

+4848
-2091
lines changed

7 files changed

+4848
-2091
lines changed

.env

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,5 @@ USER_INFO_COOKIE_NAME=''
2222
SUPPORT_URL=''
2323
LEARNER_FEEDBACK_URL=''
2424
STAFF_FEEDBACK_URL=''
25+
# Fallback in local style files
26+
PARAGON_THEME_URLS={}

.env.development

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@ USER_INFO_COOKIE_NAME='edx-user-info'
2323
SUPPORT_URL='https://support.edx.org'
2424
LEARNER_FEEDBACK_URL=''
2525
STAFF_FEEDBACK_URL=''
26+
# Fallback in local style files
27+
PARAGON_THEME_URLS={}

package-lock.json

Lines changed: 4811 additions & 2050 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"@edx/frontend-component-header": "^6.2.0",
3535
"@edx/frontend-platform": "^8.3.3",
3636
"@edx/openedx-atlas": "^0.6.0",
37-
"@openedx/paragon": "^22.16.0",
37+
"@openedx/paragon": "^23.4.5",
3838
"@reduxjs/toolkit": "1.9.7",
3939
"@tinymce/tinymce-react": "5.1.1",
4040
"babel-polyfill": "6.26.0",
Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,16 @@
1-
@import "~@edx/brand/paragon/fonts.scss";
2-
@import "~@edx/brand/paragon/variables.scss";
3-
@import "~@openedx/paragon/scss/core/core.scss";
4-
@import "~@edx/brand/paragon/overrides.scss";
5-
6-
$fa-font-path: "~font-awesome/fonts";
7-
@import "~font-awesome/scss/font-awesome";
8-
91
.course-tabs-navigation {
102
border-bottom: solid 1px #eaeaea;
113

124
.nav a,
135
.nav button {
146
&:hover {
15-
background-color: $light-400;
7+
background-color: var(--pgn-color-light-400);
168
}
179
}
1810

1911
.nav a {
2012
&:not(.active):hover {
21-
background-color: $light-400;
13+
background-color: var(--pgn-color-light-400);
2214
border-bottom: none;
2315
}
2416
}
@@ -30,7 +22,7 @@ $fa-font-path: "~font-awesome/fonts";
3022
.nav-link {
3123
border-bottom: 4px solid transparent;
3224
border-top: 4px solid transparent;
33-
color: $gray-700;
25+
color: var(--pgn-color-gray-700);
3426

3527
// temporary until we can remove .btn class from dropdowns
3628
border-left: 0;
@@ -40,9 +32,9 @@ $fa-font-path: "~font-awesome/fonts";
4032
&:hover,
4133
&:focus,
4234
&.active {
43-
font-weight: $font-weight-normal;
44-
color: $primary-500;
45-
border-bottom-color: $primary-500;
35+
font-weight: var(--pgn-typography-font-weight-normal);
36+
color: var(--pgn-color-primary-500);
37+
border-bottom-color: var(--pgn-color-primary-500);
4638
}
4739
}
4840
}

src/discussions/post-comments/comments/CommentsView.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ const CommentsView = ({ threadType }) => {
9292
variant="plain"
9393
block="true"
9494
className="card mb-4 px-0 border-0 py-10px mt-2 font-style font-weight-500
95-
line-height-24 text-primary-500"
95+
line-height-24 text-primary-500 bg-white"
9696
onClick={handleAddResponse}
9797
data-testid="add-response"
9898
>

src/index.scss

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
@import "~@edx/brand/paragon/fonts.scss";
2-
@import "~@edx/brand/paragon/variables.scss";
3-
@import "~@openedx/paragon/scss/core/core.scss";
4-
@import "~@edx/brand/paragon/overrides.scss";
1+
@use "@openedx/paragon/styles/css/core/custom-media-breakpoints" as paragonCustomMediaBreakpoints;
2+
53

64
@import "~@edx/frontend-component-footer/dist/footer";
75
@import "~@edx/frontend-component-header/dist/index";
86

9-
$fa-font-path: "~font-awesome/fonts";
10-
@import "~font-awesome/scss/font-awesome";
117

128
body,
139
#main
@@ -28,6 +24,10 @@ body,
2824
font-size: 16px !important;
2925
}
3026

27+
.btn-plain {
28+
background-color: var(--pgn-color-card-bg-base) !important;
29+
}
30+
3131
#post,
3232
#comment,
3333
#reply,
@@ -41,23 +41,23 @@ body,
4141
}
4242

4343
.text-staff-color {
44-
color: $warning-700;
44+
color: var(--pgn-color-warning-700);
4545
}
4646

4747
.outline-staff-color {
48-
outline: $warning-700 solid 2px;
48+
outline: var(--pgn-color-warning-700) solid 2px;
4949
}
5050

5151
.text-TA-color {
52-
color: $success-700;
52+
color: var(--pgn-color-success-700);
5353
}
5454

5555
.outline-TA-color {
56-
outline: $success-700 solid 2px;
56+
outline: var(--pgn-color-success-700) solid 2px;
5757
}
5858

5959
.outline-anonymous {
60-
outline: $light-400 solid 2px;
60+
outline: var(--pgn-color-light-400) solid 2px;
6161
}
6262

6363
.font-size-8 {
@@ -173,7 +173,7 @@ body,
173173
}
174174

175175
.learner > a:hover {
176-
background-color: $light-300;
176+
background-color: var(--pgn-color-light-300);
177177
}
178178

179179
.py-10px {
@@ -252,12 +252,12 @@ header {
252252
}
253253

254254
.border-light-400-2 {
255-
border: 2px solid $light-400 !important;
255+
border: 2px solid var(--pgn-color-light-400) !important;
256256
border-width: 2px !important;
257257
}
258258

259259
.border-primary-500-2 {
260-
border: 2px solid $primary-500 !important;
260+
border: 2px solid var(--pgn-color-primary-500) !important;
261261
border-width: 2px !important;
262262
}
263263

@@ -383,8 +383,8 @@ header {
383383
}
384384

385385
.btn-icon.btn-icon-primary:hover {
386-
background-color: $light-300 !important;
387-
color: $primary-500 !important
386+
background-color: var(--pgn-color-light-300) !important;
387+
color: var(--pgn-color-primary-500) !important
388388
}
389389

390390

@@ -427,38 +427,38 @@ header {
427427
}
428428

429429
.hover-button:hover {
430-
background-color: $light-300 !important;
430+
background-color: var(--pgn-color-light-300) !important;
431431
height: 36px !important;
432432
border: none !important;
433433
}
434434

435435
.btn-tertiary:hover {
436-
background-color: $light-300 !important;
436+
background-color: var(--pgn-color-light-300) !important;
437437
}
438438

439439
.nav-button-group {
440440
.nav-link {
441441
&:hover {
442-
background-color: $light-300 !important;
442+
background-color: var(--pgn-color-light-300) !important;
443443
}
444444
}
445445

446446
.nav-link.active,
447447
.show>.nav-link {
448-
background-color: $primary-500 !important;
448+
background-color: var(--pgn-color-primary-500) !important;
449449
}
450450
}
451451

452452
.course-tabs-navigation {
453453
.nav a {
454454
&:hover {
455-
background-color: $light-300 !important;;
455+
background-color: var(--pgn-color-light-300) !important;;
456456
}
457457
}
458458
}
459459

460460
.btn-tertiary:disabled {
461-
color: $gray-700 !important;
461+
color: var(--pgn-color-gray-700) !important;
462462
background-color: transparent !important;
463463
}
464464

@@ -535,14 +535,14 @@ code {
535535
.post-preview,
536536
.discussion-comments {
537537
blockquote {
538-
border-left: 2px solid $gray-200;
538+
border-left: 2px solid var(--pgn-color-gray-200);
539539
margin-left: 1.5rem;
540540
padding-left: 1rem;
541541
}
542542
}
543543

544544
.add-comment-btn {
545-
border: 1px solid $light-300 !important;
545+
border: 1px solid var(--pgn-color-light-300) !important;
546546
}
547547

548548
.icon-size-24 {
@@ -588,7 +588,7 @@ code {
588588
}
589589

590590
th, td {
591-
border: 1px dashed $gray-200;
591+
border: 1px dashed var(--pgn-color-gray-200);
592592
padding: 0.4rem;
593593
white-space: nowrap;
594594
}

0 commit comments

Comments
 (0)