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

feat(sumac): add css support and cdn compatibility #1569

Closed
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
8,640 changes: 4,710 additions & 3,930 deletions package-lock.json

Large diffs are not rendered by default.

24 changes: 13 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -21,7 +21,8 @@
"start": "fedx-scripts webpack-dev-server --progress",
"dev": "PUBLIC_PATH=/learning/ MFE_CONFIG_API_URL='http://localhost:8000/api/mfe_config/v1' fedx-scripts webpack-dev-server --progress --host apps.local.openedx.io",
"test": "fedx-scripts jest --coverage --passWithNoTests",
"types": "tsc --noEmit"
"types": "tsc --noEmit",
"replace-variables": "paragon replace-variables -p src -t usage"
},
"author": "edX",
"license": "AGPL-3.0",
@@ -35,20 +36,21 @@
"dependencies": {
"@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
"@edx/browserslist-config": "1.2.0",
"@edx/frontend-component-header": "^5.8.0",
"@edx/frontend-lib-learning-assistant": "^2.2.4",
"@edx/frontend-lib-special-exams": "^3.1.3",
"@edx/frontend-platform": "^8.0.0",
"@edx/frontend-component-footer": "github:edunext/frontend-component-footer#edunext/css-variables-14.0.0",
"@edx/frontend-component-header": "github:edunext/frontend-component-header-edunext#edunext/css-variables-5.8.0",
"@edx/frontend-lib-learning-assistant": "github:edunext/frontend-lib-learning-assistant#edunext/css-variables-2.13.0",
"@edx/frontend-lib-special-exams": "github:edunext/frontend-lib-special-exams#edunext/css-variables-3.1.3",
"@edx/frontend-platform": "github:eduNEXT/frontend-platform#edunext/css-variables-8.1.2",
"@edx/openedx-atlas": "^0.6.0",
"@edx/react-unit-test-utils": "3.0.0",
"@edx/react-unit-test-utils": "github:edunext/react-unit-test-utils#edunext/css-variables-3.0.0",
"@fortawesome/free-brands-svg-icons": "5.15.4",
"@fortawesome/free-regular-svg-icons": "5.15.4",
"@fortawesome/free-solid-svg-icons": "5.15.4",
"@fortawesome/react-fontawesome": "^0.1.4",
"@openedx/frontend-build": "14.1.2",
"@openedx/frontend-plugin-framework": "^1.2.1",
"@openedx/frontend-slot-footer": "^1.0.2",
"@openedx/paragon": "^22.3.0",
"@openedx/frontend-plugin-framework": "github:edunext/frontend-plugin-framework#edunext/css-variables-1.3.0",
"@openedx/frontend-slot-footer": "github:edunext/frontend-slot-footer#edunext/css-variables-1.0.2",
"@openedx/paragon": "^23.0.0-alpha.7",
"@popperjs/core": "2.11.8",
"@reduxjs/toolkit": "1.8.1",
"buffer": "^6.0.3",
@@ -72,8 +74,8 @@
"react-share": "4.4.1",
"redux": "4.1.2",
"reselect": "4.1.8",
"sass": "^1.79.3",
"sass-loader": "^16.0.2",
"sass": "1.72.0",
"sass-loader": "14.1.1",
"source-map-loader": "^5.0.0",
"truncate-html": "1.0.4"
},
24 changes: 12 additions & 12 deletions src/course-home/courseware-search/courseware-search.scss
Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@
left: 0;
right: 0;
bottom: 0;
border-top: 1px solid $light-300;
z-index: $zindex-modal; // Bootstrap's z-index layer for Modals.
border-top: 1px solid var(--pgn-color-light-300);
z-index: var(--pgn-elevation-modal-zindex); // Bootstrap's z-index layer for Modals.

&__close {
position: absolute !important; // For some reason it gets overridden
@@ -35,7 +35,7 @@

&__results-summary {
font-size: .9rem;
color: $gray-500;
color: var(--pgn-color-gray-500);
padding: 1rem 0 .5rem;
}

@@ -50,7 +50,7 @@
margin-top: 1.5rem;

&__empty {
color: $gray-500;
color: var(--pgn-color-gray-500);
padding: 6rem 0;
text-align: center;
}
@@ -64,17 +64,17 @@

&:hover {
text-decoration: none;
background: $light-300;
background: var(--pgn-color-light-300);
}

&:not(:first-child) {
border-top: 1px solid $light-300;
border-top: 1px solid var(--pgn-color-light-300);
}
}

&__icon {
padding: 0.375rem 0 0 0.375rem;
color: $gray-300;
color: var(--pgn-color-gray-300);
}

&__info {
@@ -87,7 +87,7 @@
align-items: center;
line-height: 2.5;
font-size: 0.875rem;
color: $black;
color: var(--pgn-color-black);

> span {
display: block;
@@ -101,7 +101,7 @@
font-variant-numeric: lining-nums tabular-nums;
min-width: 1.25rem;
line-height: 1rem;
background: $light-300;
background: var(--pgn-color-light-300);
border-radius: 99rem;
font-style: normal;
margin-left: 0.375rem;
@@ -113,7 +113,7 @@
&__breadcrumbs {
display: flex;
gap: 1.25rem;
color: $gray-500;
color: var(--pgn-color-gray-500);
overflow: hidden;
list-style: none;
padding: 0;
@@ -144,14 +144,14 @@
}

.courseware-search-results-tabs {
border-bottom-color: $gray-400 !important;
border-bottom-color: var(--pgn-color-gray-400) !important;

&.nav-tabs .nav-link.active {
border-bottom-width: 4px !important;
}
}

@media (min-width: map-get($grid-breakpoints, 'md')) {
@media (--pgn-size-breakpoint-min-width-md) {
.courseware-search__content {
padding-top: 8rem;
}
15 changes: 7 additions & 8 deletions src/course-home/outline-tab/widgets/FlagButton.scss
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
@import "~@edx/brand/paragon/variables";
@import "~@openedx/paragon/scss/core/core";
@import "~@edx/brand/paragon/overrides";

.flag-button {
background-color: $white;
border: 1px solid $light-400;
background-color: var(--pgn-color-white);
border: 1px solid var(--pgn-color-light-400);
border-radius: .2rem;
box-shadow: 0 0 0 2px $light-400;
box-shadow: 0 0 0 2px var(--pgn-color-light-400);

&:hover {
border: 1px solid $primary-300;
box-shadow: 0 0 0 2px $white;
border: 1px solid var(--pgn-color-primary-300);
box-shadow: 0 0 0 2px var(--pgn-color-white);
}
}

.flag-button-selected {
border: 1px solid $primary-300;
box-shadow: 0 0 0 2px $primary-300;
border: 1px solid var(--pgn-color-primary-300);
box-shadow: 0 0 0 2px var(--pgn-color-primary-300);
pointer-events: none;
}

8 changes: 4 additions & 4 deletions src/course-home/outline-tab/widgets/ProctoringInfoPanel.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
.outline-sidebar-proctoring-panel {
border: 1px solid $dark-500;
border-top: 5px solid $brand-600;
border: 1px solid var(--pgn-color-dark-500);
border-top: 5px solid var(--pgn-color-brand-600);
}
.proctoring-onboarding-success {
border-top: 5px solid $primary-500;
border-top: 5px solid var(--pgn-color-primary-500);
}
.proctoring-onboarding-submitted {
border-top: 5px solid $dark-500;
border-top: 5px solid var(--pgn-color-dark-500);
}
Original file line number Diff line number Diff line change
@@ -7,18 +7,18 @@

.donut-chart-label {
font: {
family: $font-family-sans-serif;
family: var(--pgn-typography-font-family-sans-serif);
size: .2rem;
weight: $font-weight-normal;
weight: var(--pgn-typography-font-weight-normal);
}
text-anchor: middle;
}

.donut-chart-number {
font: {
family: $font-family-monospace;
family: var(--pgn-typography-font-family-monospace);
size: .5rem;
weight: $font-weight-bold;
weight: var(--pgn-typography-font-weight-bold);
}
line-height: 1rem;
text-anchor: middle;
@@ -29,7 +29,7 @@
}

.donut-chart-text {
fill: $primary-500;
fill: var(--pgn-color-primary-500);
-moz-transform: translateY(0.25em);
-ms-transform: translateY(0.25em);
-webkit-transform: translateY(0.25em);
@@ -56,7 +56,7 @@

.donut-ring, .donut-segment, .donut-hole {
&.complete-stroke {
stroke: $info-500;
stroke: var(--pgn-color-info-500);
}

&.divider-stroke {
@@ -65,10 +65,10 @@
}

&.incomplete-stroke {
stroke: $light-300;
stroke: var(--pgn-color-light-300);
}

&.locked-stroke {
stroke: $primary-500;
stroke: var(--pgn-color-primary-500);
}
}
20 changes: 10 additions & 10 deletions src/course-home/progress-tab/grades/course-grade/GradeBar.scss
Original file line number Diff line number Diff line change
@@ -4,24 +4,24 @@
}

.grade-bar__base {
fill: $light-300;
fill: var(--pgn-color-light-300);
}

.grade-bar__divider {
fill: $primary-500;
fill: var(--pgn-color-primary-500);
width: 1px;
}

.grade-bar--passing {
fill: $primary-500;
fill: var(--pgn-color-primary-500);
}

.grade-bar--current-passing {
fill: $success-500;
fill: var(--pgn-color-success-500);
}

.grade-bar--current-non-passing {
fill: $accent-b;
fill: var(--pgn-color-accent-b);
}
}

@@ -31,22 +31,22 @@

#minimum-grade-tooltip {
.arrow::after {
border-bottom-color: $primary-500;
border-bottom-color: var(--pgn-color-primary-500);
}
}

#passing-grade-tooltip {
background: $success-500;
background: var(--pgn-color-success-500);

.arrow::after {
border-top-color: $success-500;
border-top-color: var(--pgn-color-success-500);
}
}

#non-passing-grade-tooltip {
background: $accent-b;
background: var(--pgn-color-accent-b);

.arrow::after {
border-top-color: $accent-b;
border-top-color: var(--pgn-color-accent-b);
}
}
4 changes: 2 additions & 2 deletions src/course-tabs/course-tabs-navigation.scss
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@
.nav a,
.nav button {
&:hover {
background-color: $light-400;
background-color: var(--pgn-color-light-400);
}
}

.nav a {
&:not(.active):hover {
background-color: $light-400;
background-color: var(--pgn-color-light-400);
border-bottom: none;
}
}
1 change: 0 additions & 1 deletion src/courseware/course/celebration/CelebrationModal.scss
Original file line number Diff line number Diff line change
@@ -22,7 +22,6 @@
justify-content: center;

button {
@extend .btn-primary;
font-size: 1.2rem;
width: 50%;
}
Loading

Unchanged files with check annotations Beta

<li>arccsch(4x+y)</li>
</ul>
</td>
<td dir="auto" />

Check failure on line 344 in src/courseware/course/content-tools/calculator/Calculator.jsx

GitHub Actions / tests (20)

A control must be associated with a text label
</tr>
<tr>
<th scope="row">