Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] feat: support design tokens and paragon 23 #279

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
5,325 changes: 2,400 additions & 2,925 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 @@ -45,7 +45,7 @@
"@fortawesome/free-regular-svg-icons": "5.15.4",
"@fortawesome/free-solid-svg-icons": "5.15.4",
"@fortawesome/react-fontawesome": "0.2.2",
"@openedx/paragon": "^21.13.1",
"@openedx/paragon": "^23.3.1",
"@reduxjs/toolkit": "^1.9.7",
"@tanstack/react-query": "^4.29.25",
"@tanstack/react-query-devtools": "^4.35.3",
Expand Down Expand Up @@ -89,10 +89,10 @@
},
"overrides": {
"@edx/frontend-lib-special-exams": {
"@openedx/paragon": "21.13.1"
"@openedx/paragon": "^23.3.0"
},
"@edx/frontend-platform": {
"@openedx/paragon": "21.13.1"
"@openedx/paragon": "^23.3.0"
}
}
}
14 changes: 5 additions & 9 deletions src/components/Assessment/Assessment.scss
Original file line number Diff line number Diff line change
@@ -1,38 +1,34 @@
@import "~@edx/brand/paragon/variables";
@import "~@openedx/paragon/scss/core/core";
@import "~@edx/brand/paragon/overrides";

.assessment-card {
max-width: 320px !important;
height: fit-content;
max-height: 100%;
position: sticky !important;
top: map-get($spacers, 1) * -1;
top: calc( var(--pgn-spacing-spacer-1) * -1);

.assessment-header {
box-shadow: 0 0 0.25rem rgba(0, 0, 0, 0.3) !important;
display: flex;
justify-content: center;
padding: map-get($spacers, 3);
padding: var(--pgn-spacing-spacer-3);
}

.assessment-body {
overflow-y: hide;
padding: map-get($spacers, 3);
padding: var(--pgn-spacing-spacer-3);
}

.assessment-footer {
box-shadow: 0 0 0.25rem rgba(0, 0, 0, 0.3) !important;
justify-content: center;
padding: map-get($spacers, 3);
padding: var(--pgn-spacing-spacer-3);
}

button.pgn__stateful-btn.pgn__stateful-btn-state-pending {
opacity: .4 !important;
}
}

@include media-breakpoint-down(sm) {
@media (--pgn-size-breakpoint-max-width-sm) {
.assessment-card {
margin-left: 0 !important;
width: 100% !important;
Expand Down
10 changes: 3 additions & 7 deletions src/components/CriterionContainer/CriterionContainer.scss
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
@import "~@edx/brand/paragon/variables";
@import "~@openedx/paragon/scss/core/core";
@import "~@edx/brand/paragon/overrides";

.criteria-label {
width: 100%;
.criteria-title {
display: inline-block;
max-width: calc(100% - 44px);
color: $primary-500;
color: var(--pgn-color-primary-500);
font-weight: bold;
vertical-align: top;
}
.esg-help-icon {
margin-top: (map-get($spacers, 1\.5) * -1);
margin-right: (map-get($spacers, 2\.5) * -1);
margin-top: calc( var(--pgn-spacing-spacer-1-5) * -1);
margin-right: calc( var(--pgn-spacing-spacer-2-5) * -1);
vertical-align: top;
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
@import "@openedx/paragon/scss/core/core";

.file-card {
margin: map-get($spacers, 1) 0;
margin: var(--pgn-spacing-spacer-1) 0;

.file-card-title {
text-overflow: ellipsis;
Expand All @@ -26,8 +24,8 @@
white-space: pre-wrap;
}

@include media-breakpoint-down(sm) {
@media (--pgn-size-breakpoint-max-width-sm) {
.file-card-title {
width: calc(map-get($container-max-widths, "sm")/2);
width: calc(var(--pgn-size-container-max-width-sm)/2);
}
}
}
2 changes: 1 addition & 1 deletion src/components/FileUpload/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
vertical-align: middle;
overflow: hidden;
white-space: nowrap;
}
}
8 changes: 2 additions & 6 deletions src/components/ModalContainer.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
@import '@edx/brand/paragon/variables.scss';
@import '@openedx/paragon/scss/core/core.scss';
@import '@edx/brand/paragon/overrides.scss';

.ora-modal-body {
min-height: calc(100vh - 20px - 64px - (map-get($spacers, 2) * 8));
min-height: calc(100vh - 20px - 64px - calc(var(--pgn-spacing-spacer-3) * 8));
height: 100%;
}

.exam-timer {
max-width: $max-width-lg;
max-width: var(--pgn-size-container-max-width-lg);
margin: auto;
button {
display: none;
Expand Down
14 changes: 6 additions & 8 deletions src/components/ProgressBar/index.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
@import '@openedx/paragon/scss/core/core';

.ora-progress-nav-group {
max-width: $max-width-lg;
max-width: var(--pgn-size-container-max-width-lg);
display: flex;
flex-direction: row;
justify-content: space-between;
margin: auto;
.ora-progress-divider {
position: absolute;
max-width: $max-width-lg;
max-width: var(--pgn-size-container-max-width-lg);
width: 100%;
}
.ora-progress-nav {
Expand Down Expand Up @@ -48,21 +46,21 @@
width: 100%;
&.is-active {
border: none;
background-color: $light;
background-color: var(--pgn-color-light-base);
}
}
.nav-icon {
margin-left: map-get($spacers, 3);
margin-left: var(--pgn-spacing-spacer-3);
}
}

@include media-breakpoint-down(md) {
@media (--pgn-size-breakpoint-max-width-md) {
.navbar-expand-lg .ora-progress-nav-group {
@include navbar-collapse-definition;
}
}

@include media-breakpoint-down(sm) {
@media (--pgn-size-breakpoint-max-width-sm) {
.navbar-expand-md .ora-progress-nav-group {
@include navbar-collapse-definition;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Prompt/index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.prompt > pre {
text-wrap: wrap;
}
}
20 changes: 8 additions & 12 deletions src/components/Rubric/Rubric.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
@import "~@edx/brand/paragon/variables";
@import "~@openedx/paragon/scss/core/core";
@import "~@edx/brand/paragon/overrides";

.popover.overlay-help-popover {
z-index: 4000;
margin-right: map-get($spacers, 1) !important;
margin-right: var(--pgn-spacing-spacer-1) !important;
.help-popover-option {
margin-bottom: map-get($spacers, 1);
margin-bottom: var(--pgn-spacing-spacer-1);
}
}

Expand All @@ -15,35 +11,35 @@
width: 320px !important;
height: fit-content;
max-height: 100%;
margin-left: map-get($spacers, 3);
margin-left: var(--pgn-spacing-spacer-3);
position: sticky !important;
top: map-get($spacers, 1) * -1;
top: calc(var(--pgn-spacing-spacer-1) * -1);

.rubric-header {
box-shadow: 0 0 0.25rem rgba(0, 0, 0, 0.3) !important;
display: flex;
justify-content: center;
padding: map-get($spacers, 3);
padding: var(--pgn-spacing-spacer-3);
}

.rubric-body {
overflow-y: hide;
padding: map-get($spacers, 3);
padding: var(--pgn-spacing-spacer-3);
}

.rubric-footer {
box-shadow: 0 0 0.25rem rgba(0, 0, 0, 0.3) !important;
display: flex;
justify-content: center;
padding: map-get($spacers, 3);
padding: var(--pgn-spacing-spacer-3);
}

button.pgn__stateful-btn.pgn__stateful-btn-state-pending {
opacity: .4 !important;
}
}

@include media-breakpoint-down(sm) {
@media (--pgn-size-breakpoint-max-width-sm) {
.rubric-card {
margin-left: 0 !important;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/TextResponse/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
font-size: inherit;
line-height: inherit;
margin-bottom: 0;
}
}
18 changes: 8 additions & 10 deletions src/index.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
@import "@edx/brand/paragon/fonts.scss";
@import "@edx/brand/paragon/variables.scss";
@import "@openedx/paragon/scss/core/core.scss";
@import "@edx/brand/paragon/overrides.scss";
@use "@openedx/paragon/styles/css/core/custom-media-breakpoints" as paragonCustomMediaBreakpoints;


#root {
display: flex;
Expand All @@ -26,23 +24,23 @@
}

.gap-0 {
gap: map-get($spacers, 0);
gap: var(--pgn-spacing-spacer-0);
}

.gap-1 {
gap: map-get($spacers, 1);
gap: var(--pgn-spacing-spacer-1);
}

.gap-2 {
gap: map-get($spacers, 2);
gap: var(--pgn-spacing-spacer-2);
}

.gap-3 {
gap: map-get($spacers, 3);
gap: var(--pgn-spacing-spacer-3);
}

.gap-4 {
gap: map-get($spacers, 4);
gap: var(--pgn-spacing-spacer-4);
}
.ora-icon svg {
display: inline-block !important;
Expand All @@ -53,4 +51,4 @@
top: 50%;
left: 50%;
scale: 3;
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import "@openedx/paragon/scss/core/core";

.assessment-content-layout {
& > div.content-body {
height: 100%;
Expand All @@ -12,15 +10,15 @@
height: 100%;

.content-wrapper {
max-width: $max-width-lg;
max-width: var(--pgn-size-container-max-width-lg);
}

.assessment-col {
min-width: 300px;
}
}

@include media-breakpoint-down(sm) {
@media (--pgn-size-breakpoint-max-width-sm) {
.assessment-content-layout {
.content-wrapper {
width: 100%;
Expand Down
6 changes: 2 additions & 4 deletions src/views/GradeView/index.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
@import "@openedx/paragon/scss/core/core";

.grade-view-body {
max-width: $max-width-lg;
max-width: var(--pgn-size-container-max-width-lg);
flex-wrap: nowrap !important;
gap: 1em;
}

@include media-breakpoint-down(md) {
@media (--pgn-size-breakpoint-max-width-md) {
.grade-view-body {
flex-wrap: wrap !important;
gap: 0;
Expand Down
8 changes: 3 additions & 5 deletions src/views/SubmissionView/index.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import "@openedx/paragon/scss/core/core";

.assessment-content-layout {
& > div.content-body {
height: 100%;
Expand All @@ -12,15 +10,15 @@
height: 100%;

.content-wrapper {
max-width: $max-width-lg;
max-width: var(--pgn-size-container-max-width-lg);
}
}

.ora-tinymce .tox-tinymce {
background-color: $white;
background-color: var(--pgn-color-white);
}

@include media-breakpoint-down(sm) {
@media (--pgn-size-breakpoint-max-width-sm) {
.assessment-content-layout {
.content-wrapper {
width: 100%;
Expand Down
6 changes: 2 additions & 4 deletions src/views/XBlockStudioView/index.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
@import "@openedx/paragon/scss/core/core";

#ora-xblock-studio-view {
max-width: 1024px;
display: flex;
flex-direction: column;
gap: map-get($spacers, 3);
gap: var(--pgn-spacing-spacer-3);

@include media-breakpoint-down(md) {
@media (--pgn-size-breakpoint-max-width-md) {
padding-left: 40px;
padding-right: 40px;
}
Expand Down
4 changes: 1 addition & 3 deletions src/views/XBlockView/index.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
@import "@openedx/paragon/scss/core/core";

#ora-xblock-view {
max-width: 1024px;
@include media-breakpoint-down(md) {
@media (--pgn-size-breakpoint-max-width-md) {
padding-left: 40px;
padding-right: 40px;
}
Expand Down
Loading