Skip to content
Merged
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
3c52a28
feat: add design tokens support (#1758)
dcoa May 12, 2025
d775096
Merge remote-tracking branch 'upstream/master' into sync-master-to-de…
brian-smith-tcril May 19, 2025
07a9e7b
Merge pull request #2003 from brian-smith-tcril/sync-master-to-design…
brian-smith-tcril May 20, 2025
6bb3697
fix: don't import scss vars from brand package (#2026)
brian-smith-tcril May 22, 2025
906e7c0
Merge branch '5-19' into master-to-master-design-tokens-sync
brian-smith-tcril Jun 14, 2025
d950a48
Merge branch '5-20' into master-to-master-design-tokens-sync
brian-smith-tcril Jun 14, 2025
c42f00c
Merge branch '5-21' into master-to-master-design-tokens-sync
brian-smith-tcril Jun 14, 2025
4bf5abc
Merge branch '5-22' into master-to-master-design-tokens-sync
brian-smith-tcril Jun 14, 2025
01b6613
Merge branch '5-23' into master-to-master-design-tokens-sync
brian-smith-tcril Jun 14, 2025
4e8ae17
Merge branch '5-25' into master-to-master-design-tokens-sync
brian-smith-tcril Jun 14, 2025
4ecfb6f
Merge branch '5-26' into master-to-master-design-tokens-sync
brian-smith-tcril Jun 14, 2025
2cfd5f3
Merge branch '5-27' into master-to-master-design-tokens-sync
brian-smith-tcril Jun 14, 2025
4cdaaad
Merge branch '5-28' into master-to-master-design-tokens-sync
brian-smith-tcril Jun 14, 2025
8d043c4
fix: replace new scss var use with css var
brian-smith-tcril Jun 14, 2025
9efb868
Merge branch '5-29' into master-to-master-design-tokens-sync
brian-smith-tcril Jun 14, 2025
a831b5b
fix: use `Truncate.Deprecated`
brian-smith-tcril Jun 14, 2025
76c4ebd
Merge branch '5-30' into master-to-master-design-tokens-sync
brian-smith-tcril Jun 14, 2025
f48fde7
Merge branch '6-1' into master-to-master-design-tokens-sync
brian-smith-tcril Jun 14, 2025
bd77da7
Merge branch '6-2' into master-to-master-design-tokens-sync
brian-smith-tcril Jun 14, 2025
2cd6110
Merge branch '6-3' into master-to-master-design-tokens-sync
brian-smith-tcril Jun 14, 2025
ee79275
Merge branch '6-4' into master-to-master-design-tokens-sync
brian-smith-tcril Jun 15, 2025
9199d8f
fix: replace new scss var use with css vars
brian-smith-tcril Jun 15, 2025
efc0d7e
Merge branch '6-5' into master-to-master-design-tokens-sync
brian-smith-tcril Jun 15, 2025
4889486
Merge branch '6-8' into master-to-master-design-tokens-sync
brian-smith-tcril Jun 15, 2025
363b17f
Merge branch '6-9' into master-to-master-design-tokens-sync
brian-smith-tcril Jun 15, 2025
f6e7fd7
Merge branch '6-10' into master-to-master-design-tokens-sync
brian-smith-tcril Jun 15, 2025
45f3ada
Merge branch '6-11' into master-to-master-design-tokens-sync
brian-smith-tcril Jun 15, 2025
09418e9
Merge branch '6-12' into master-to-master-design-tokens-sync
brian-smith-tcril Jun 15, 2025
1e508bb
Merge branch '6-13' into master-to-master-design-tokens-sync
brian-smith-tcril Jun 15, 2025
6882a90
Merge pull request #2148 from brian-smith-tcril/master-to-master-desi…
brian-smith-tcril Jun 16, 2025
0422f3c
Merge branch 'master' into another-master-design-tokens-sync
brian-smith-tcril Jun 17, 2025
5ef1e51
Merge pull request #2180 from brian-smith-tcril/another-master-design…
brian-smith-tcril Jun 17, 2025
3492e4d
Merge branch 'master' into sync-master-to-tokens
brian-smith-tcril Jun 18, 2025
403dfd8
Merge pull request #2188 from brian-smith-tcril/sync-master-to-tokens
brian-smith-tcril Jun 18, 2025
6e53ef6
Merge branch 'master' into synccc
brian-smith-tcril Jun 18, 2025
657e040
Merge pull request #2190 from brian-smith-tcril/synccc
brian-smith-tcril Jun 18, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,5 @@ ENABLE_CHECKLIST_QUALITY=''
ENABLE_GRADING_METHOD_IN_PROBLEMS=false
# "Multi-level" blocks are unsupported in libraries
LIBRARY_UNSUPPORTED_BLOCKS="conditional,step-builder,problem-builder"
# Fallback in local style files
PARAGON_THEME_URLS={}
2 changes: 2 additions & 0 deletions .env.development
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,5 @@ ENABLE_CHECKLIST_QUALITY=true
ENABLE_GRADING_METHOD_IN_PROBLEMS=false
# "Multi-level" blocks are unsupported in libraries
LIBRARY_UNSUPPORTED_BLOCKS="conditional,step-builder,problem-builder"
# Fallback in local style files
PARAGON_THEME_URLS={}
1 change: 1 addition & 0 deletions .env.test
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,4 @@ ENABLE_CHECKLIST_QUALITY=true
ENABLE_GRADING_METHOD_IN_PROBLEMS=false
# "Multi-level" blocks are unsupported in libraries
LIBRARY_UNSUPPORTED_BLOCKS="conditional,step-builder,problem-builder"
PARAGON_THEME_URLS=
1,721 changes: 1,479 additions & 242 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"@edx/frontend-component-footer": "^14.9.0",
"@edx/frontend-component-header": "^6.2.0",
"@edx/frontend-enterprise-hotjar": "^7.2.0",
"@edx/frontend-platform": "^8.3.1",
"@edx/frontend-platform": "^8.4.0",
"@edx/openedx-atlas": "^0.7.0",
"@openedx-plugins/course-app-calculator": "file:plugins/course-apps/calculator",
"@openedx-plugins/course-app-edxnotes": "file:plugins/course-apps/edxnotes",
Expand All @@ -62,7 +62,7 @@
"@openedx-plugins/course-app-xpert_unit_summary": "file:plugins/course-apps/xpert_unit_summary",
"@openedx/frontend-build": "^14.5.0",
"@openedx/frontend-plugin-framework": "^1.7.0",
"@openedx/paragon": "^22.16.0",
"@openedx/paragon": "^23.5.0",
"@redux-devtools/extension": "^3.3.0",
"@reduxjs/toolkit": "1.9.7",
"@tanstack/react-query": "4.36.1",
Expand Down Expand Up @@ -110,7 +110,7 @@
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.2.0",
"@testing-library/user-event": "^13.2.1",
"@types/lodash": "^4.17.7",
"@types/lodash": "^4.17.17",
"axios-mock-adapter": "1.22.0",
"eslint-import-resolver-webpack": "^0.13.8",
"fetch-mock-jest": "^1.5.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import "~@edx/brand/paragon/variables";
@import "~@openedx/paragon/scss/core/utilities-only";
@import "~@openedx/paragon/styles/scss/core/utilities-only";

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: Create issue to clean this up. TL;DR for the issue - don't use this, directly use css vars.


.summary-radio {
display: flex;
Expand Down
24 changes: 12 additions & 12 deletions src/advanced-settings/scss/AdvancedSettings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
bottom: 0;
width: 100%;
padding: 0 .625rem;
z-index: $zindex-modal;
z-index: var(--pgn-elevation-modal-zindex);
}

.alert-proctoring-error {
Expand Down Expand Up @@ -66,13 +66,13 @@
.setting-sidebar-supplementary {
.setting-sidebar-supplementary-about {
.setting-sidebar-supplementary-about-title {
font: normal $font-weight-bold 1.125rem/1.5rem $font-family-base;
color: $headings-color;
font: normal var(--pgn-typography-font-weight-bold) 1.125rem/1.5rem var(--pgn-typography-font-family-base);
color: var(--pgn-color-headings-base);
margin-bottom: 1.25rem;
}

.setting-sidebar-supplementary-about-descriptions {
font: normal $font-weight-normal .875rem/1.5rem $font-family-base;
font: normal var(--pgn-typography-font-weight-normal) .875rem/1.5rem var(--pgn-typography-font-family-base);
color: $text-color-base;
}
}
Expand All @@ -81,16 +81,16 @@
list-style: none;

.setting-sidebar-supplementary-other-link {
font: normal $font-weight-normal .875rem/1.5rem $font-family-base;
font: normal var(--pgn-typography-font-weight-normal) .875rem/1.5rem var(--pgn-typography-font-family-base);
line-height: 1.5rem;
color: $info-500;
color: var(--pgn-color-info-500);
margin-bottom: .5rem;
}
}

.setting-sidebar-supplementary-other-title {
font: normal $font-weight-bold 1.125rem/1.5rem $font-family-base;
color: $headings-color;
font: normal var(--pgn-typography-font-weight-bold) 1.125rem/1.5rem var(--pgn-typography-font-family-base);
color: var(--pgn-color-headings-base);
margin-bottom: 1.25rem;
}
}
Expand All @@ -102,7 +102,7 @@
display: inline-block;
margin-right: 5px;
margin-bottom: 5px;
color: $danger;
color: var(--pgn-color-danger-base);
}

.modal-error-item-title {
Expand All @@ -113,12 +113,12 @@

.modal-popup-content {
max-width: 200px;
color: $white;
background-color: $black;
color: var(--pgn-color-white);
background-color: var(--pgn-color-black);
filter: drop-shadow(0 2px 4px rgba(0 0 0 / .15));
font-weight: 400;
}

.pgn__modal-popup__arrow::after {
border-top-color: $black;
border-top-color: var(--pgn-color-black);
}
2 changes: 1 addition & 1 deletion src/advanced-settings/scss/_variables.scss
Original file line number Diff line number Diff line change
@@ -1 +1 @@
$text-color-base: $gray-700;
$text-color-base: var(--pgn-color-gray-700);
50 changes: 25 additions & 25 deletions src/assets/scss/_form.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
.form-group-custom {
.pgn__form-label {
font: normal $font-weight-bold .75rem/1.25rem $font-family-base;
color: $gray-500;
font: normal var(--pgn-typography-font-weight-bold) .75rem/1.25rem var(--pgn-typography-font-family-base);
color: var(--pgn-color-gray-500);
margin-bottom: .5rem;
}

.pgn__form-control-description,
.pgn__form-text {
font: normal $font-weight-normal .75rem/1.25rem $font-family-base;
color: $gray-500;
font: normal var(--pgn-typography-font-weight-normal) .75rem/1.25rem var(--pgn-typography-font-family-base);
color: var(--pgn-color-gray-500);
margin-top: .5rem;
}

Expand All @@ -19,12 +19,12 @@

.form-group-custom_isInvalid {
input {
border-color: $form-feedback-invalid-color;
border-color: var(--pgn-color-form-feedback-invalid);
}
}

.feedback-error {
color: $form-feedback-invalid-color;
color: var(--pgn-color-form-feedback-invalid);
}
}

Expand All @@ -34,40 +34,40 @@
.datepicker-custom-control {
display: block;
width: 100%;
font-size: $input-font-size;
font-weight: $input-font-weight;
line-height: $input-line-height;
background: $input-bg;
border-color: $input-border-color;
border-width: $input-border-width;
box-shadow: $input-box-shadow;
border-radius: $input-border-radius;
color: $input-color;
padding: $input-padding-y $input-padding-x;
height: $input-height;
font-size: var(--pgn-typography-form-input-font-size-base);
font-weight: var(--pgn-typography-form-input-font-weight);
line-height: var(--pgn-typography-form-input-line-height-base);
background: var(--pgn-color-form-input-bg-base);
border-color: var(--pgn-color-form-input-border);
border-width: var(--pgn-size-form-input-width-border);
box-shadow: var(--pgn-elevation-form-input-base);
border-radius: var(--pgn-size-form-input-radius-border-base);
color: var(--pgn-color-form-input-base);
padding: var(--pgn-spacing-form-input-padding-y-base) var(--pgn-spacing-form-input-padding-x-base);
height: var(--pgn-size-form-input-height-base);
resize: none;

&:focus,
:focus-visible {
color: $input-focus-color;
background-color: $input-bg;
border-color: $input-focus-border-color;
box-shadow: $input-focus-box-shadow;
color: var(--pgn-color-form-input-focus-base);
background-color: var(--pgn-color-form-input-bg-base);
border-color: var(--pgn-color-form-input-focus-border);
box-shadow: var(--pgn-elevation-form-input-focus);
outline: 0;
}

&::placeholder {
color: $input-placeholder-color;
color: var(--pgn-color-form-input-placeholder);
}
}

.datepicker-custom-control_readonly {
border-color: transparent;
background: $input-disabled-bg;
background: var(--pgn-color-form-input-bg-disabled);
}

.datepicker-custom-control_isInvalid {
border-color: $form-feedback-invalid-color;
border-color: var(--pgn-color-form-feedback-invalid);
}

.datepicker-custom-control-icon {
Expand All @@ -76,7 +76,7 @@
right: 1.188rem;
top: 50%;
transform: translateY(-50%);
color: $black;
color: var(--pgn-color-black);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/assets/scss/_utilities.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.text-black {
color: $black;
color: var(--pgn-color-black);
}

.h-200px {
Expand Down
2 changes: 1 addition & 1 deletion src/assets/scss/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
$text-color-base: $gray-700;
$text-color-base: var(--pgn-color-gray-700);
$text-color-weak: #3E3E3C;
8 changes: 4 additions & 4 deletions src/certificates/scss/Certificates.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

.certificates {
.section-title {
color: $black;
color: var(--pgn-color-black);
}

.sub-header-actions {
Expand All @@ -11,7 +11,7 @@

.certificate-details {
.certificate-details__info {
color: $black;
color: var(--pgn-color-black);
justify-content: space-between;
align-items: baseline;
}
Expand All @@ -22,7 +22,7 @@

.certificate-details__info-paragraph-course-number {
flex: 1;
color: $gray-700;
color: var(--pgn-color-gray-700);
text-align: right;
}
}
Expand Down Expand Up @@ -74,7 +74,7 @@
}
}

@media (max-width: map-get($grid-breakpoints, "xl")) {
@media (--pgn-size-breakpoint-max-width-xl) {
.signatory {
display: flex;
flex-direction: column;
Expand Down
2 changes: 1 addition & 1 deletion src/content-tags-drawer/ContentTagsCollapsible.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

.add-tags-button:not([disabled]):hover {
background-color: transparent;
color: $info-900 !important;
color: var(--pgn-color-info-900) !important;
}

.react-select-add-tags__control {
Expand Down
4 changes: 2 additions & 2 deletions src/content-tags-drawer/ContentTagsDrawer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

.tags-drawer-cancel-button:hover {
background-color: transparent;
color: $gray-300 !important;
color: var(--pgn-color-gray-300) !important;
}

.other-description {
Expand All @@ -25,7 +25,7 @@

.enable-taxonomies-button:not([disabled]):hover {
background-color: transparent;
color: $info-900 !important;
color: var(--pgn-color-info-900) !important;
}
}

Expand Down
7 changes: 4 additions & 3 deletions src/content-tags-drawer/ContentTagsDropDownSelector.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

&:hover {
background-color: transparent;
color: $info-900 !important;
color: var(--pgn-color-info-900) !important;
}
}

Expand All @@ -19,7 +19,8 @@
// In the future, this customizability should be implemented in paragon instead
input.pgn__form-checkbox-input {
&:indeterminate {
@extend :checked; /* stylelint-disable-line scss/at-extend-no-missing-placeholder */
border-color: var(--pgn-color-form-control-indicator-checked-border-base);
background-image: var(--pgn-other-content-form-control-checkbox-indicator-icon-checked-base);
}
}
}
Expand All @@ -34,6 +35,6 @@
}

.dropdown-selector-tag-actions:focus-visible {
outline: solid 2px $info-900;
outline: solid 2px var(--pgn-color-info-900);
border-radius: 4px;
}
4 changes: 2 additions & 2 deletions src/content-tags-drawer/TagsTree.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@

&:hover {
svg {
color: $gray-900;
color: var(--pgn-color-gray-900);
}
}

&:focus-visible {
border: 2px solid;
border-color: $gray-900;
border-color: var(--pgn-color-gray-900);
}
}
}
4 changes: 2 additions & 2 deletions src/course-checklist/ChecklistSection/ChecklistSection.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@

.assignment-list {
display: inline;
padding-inline-start: map-get($spacers, 1);
padding-inline-start: var(--pgn-spacing-spacer-1);
}

//complete checklist item style
.checklist-item-complete {
box-shadow: -5px 0 0 0 $success-500;
box-shadow: -5px 0 0 0 var(--pgn-color-success-500);
}
2 changes: 1 addition & 1 deletion src/course-outline/card-header/CardHeader.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
height: 1.5rem;
margin-right: .25rem;
background: transparent;
color: $black;
color: var(--pgn-color-black);
}

.item-card-button-icon {
Expand Down
2 changes: 1 addition & 1 deletion src/course-outline/card-header/TitleButton.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const TitleButton = ({
className="item-card-header__title-btn"
onClick={onTitleClick}
>
<Truncate lines={1} className={`${namePrefix}-card-title mb-0`}>{title}</Truncate>
<Truncate.Deprecated lines={1} className={`${namePrefix}-card-title mb-0`}>{title}</Truncate.Deprecated>
</Button>
</OverlayTrigger>
);
Expand Down
2 changes: 1 addition & 1 deletion src/course-outline/card-header/TitleLink.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const TitleLink = ({
className="item-card-header__title-btn"
to={titleLink}
>
<Truncate lines={1} className={`${namePrefix}-card-title mb-0`}>{title}</Truncate>
<Truncate.Deprecated lines={1} className={`${namePrefix}-card-title mb-0`}>{title}</Truncate.Deprecated>
</Button>
);

Expand Down
4 changes: 2 additions & 2 deletions src/course-outline/empty-placeholder/EmptyPlaceholder.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
align-items: center;
justify-content: center;
gap: 1.25rem;
border: .0625rem solid $gray-200;
border: .0625rem solid var(--pgn-color-gray-200);
border-radius: .375rem;
box-shadow: inset inset 0 1px .125rem 1px $gray-200;
box-shadow: inset inset 0 1px .125rem 1px var(--pgn-color-gray-200);
padding: 2.5rem;
}
Loading