Skip to content

feat!: add design tokens support #1611

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.

Sign up for GitHub

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

Draft
arbrandes wants to merge 1 commit into
base: frontend-base
Choose a base branch
from
Draft

feat!: add design tokens support #1611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,12 @@
"babel-plugin-formatjs": "10.5.38",
"eslint-plugin-import": "2.31.0",
"jest": "^29.7.0",
"react-test-renderer": "^18.3.1"
"react-test-renderer": "^18.3.1",
"ts-jest": "^29.4.0"
},
"peerDependencies": {
"@openedx/frontend-base": "^1.0.0-alpha.6",
"@openedx/paragon": "^22",
"@openedx/paragon": "^23",
"react": "^18",
"react-dom": "^18",
"react-redux": "^8",
Expand Down
5 changes: 0 additions & 5 deletions src/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
@use "@edx/brand/paragon/fonts";
@use "@edx/brand/paragon/variables";
@use "@openedx/paragon/scss/core/core";
@use "@edx/brand/paragon/overrides";

@use "sass/style";
111 changes: 57 additions & 54 deletions src/sass/_base_component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
@use "@openedx/paragon/scss/core/core" as paragon;

.layout {
display: flex;

@include paragon.media-breakpoint-down('lg') {
@media (--pgn-size-breakpoint-max-width-lg) {
flex-direction: column;
justify-content: center;
align-items: center;
}

@include paragon.media-breakpoint-up('xl') {
@media (--pgn-size-breakpoint-min-width-xl) {
justify-content: space-between;
}
}

.content {
@include paragon.media-breakpoint-up('xl') {
@media (--pgn-size-breakpoint-min-width-xl) {
display: flex;
justify-content: center;
width: 50vw;
Expand Down Expand Up @@ -48,7 +46,7 @@
font-weight: 700;
line-height: 1;

@include paragon.media-breakpoint-down('xl') {
@media (--pgn-size-breakpoint-max-width-xl) {
font-size: 3.75rem;
}

Expand All @@ -61,7 +59,7 @@
margin-bottom: 0.5rem;
font-weight: 700;

@include paragon.media-breakpoint-down('xl') {
@media (-pgn-size-breakpoint-max-width-xl) {
font-size: 1.375rem;
line-height: 1.75rem;
}
Expand All @@ -73,7 +71,7 @@
}

.large-screen-left-container {
@include paragon.media-breakpoint-down('xl') {
@media (-pgn-size-breakpoint-max-width-xl) {
flex: 0 0 25%;
max-width: 25%;
}
Expand All @@ -86,42 +84,46 @@

.small-screen-top-stripe {
height: 0.25rem;
background-image: linear-gradient(102.02deg,
paragon.$brand-700,
paragon.$brand-700 20%,
paragon.$brand 20%,
);
background-image: linear-gradient(
102.02deg,
var(--pgn-color-brand-700),
var(--pgn-color-brand-700) 20%,
var(--pgn-color-brand-base) 20%,
);
background-repeat: no-repeat;
}

@include paragon.media-breakpoint-only('md') {
@media (--pgn-size-breakpoint-min-width-md) and (--pgn-size-breakpoint-max-width-md) {
.medium-screen-top-stripe {
display: flex;
height: 0.5rem;
background-image: linear-gradient(102.02deg,
paragon.$brand-700,
paragon.$brand-700 10%,
paragon.$brand 10%,
paragon.$brand 90%,
paragon.$primary-700 90%,
paragon.$primary-700 100%,
);
background-image: linear-gradient(
102.02deg,
var(--pgn-color-brand-700),
var(--pgn-color-brand-700) 10%,
var(--pgn-color-brand-base) 10%,
var(--pgn-color-brand-base) 90%,
var(--pgn-color-primary-700) 90%,
var(--pgn-color-primary-700) 100%,
);
background-repeat: no-repeat;
}
}

@include paragon.media-breakpoint-only('lg') {
@media (--pgn-size-breakpoint-min-width-lg) and (--pgn-size-breakpoint-max-width-lg){
.medium-screen-top-stripe {
display: flex;
height: 0.5rem;
background-image: linear-gradient(102.02deg,
paragon.$brand-700 10%,
paragon.$brand 10%,
paragon.$brand 65%,
paragon.$primary-700 65%,
paragon.$primary-700 75%,
paragon.$accent-a 75%,
paragon.$accent-a 75%);
background-image: linear-gradient(
102.02deg,
var(--pgn-color-brand-700) 10%,
var(--pgn-color-brand-base) 10%,
var(--pgn-color-brand-base) 65%,
var(--pgn-color-primary-700) 65%,
var(--pgn-color-primary-700) 75%,
var(--pgn-color-accent-a) 75%,
var(--pgn-color-accent-a) 75%
);
background-repeat: no-repeat;
}
}
Expand All @@ -130,44 +132,45 @@
display: none;
}

@include paragon.media-breakpoint-up('xl') {
.extra-large-screen-top-stripe {
display: flex;
height: 0.5rem;
background-image: linear-gradient(102.02deg,
paragon.$brand-700 10%,
paragon.$brand 10%,
paragon.$brand 45%,
paragon.$primary-700 45%,
paragon.$primary-700 55%,
paragon.$accent-a 55%,
paragon.$accent-a 75%,
paragon.$info-200 75%,
);
background-repeat: no-repeat;
}
@media (--pgn-size-breakpoint-min-width-xl) {
.extra-large-screen-top-stripe {
display: flex;
height: 0.5rem;
background-image: linear-gradient(
102.02deg,
var(--pgn-color-brand-700) 10%,
var(--pgn-color-brand-base) 10%,
var(--pgn-color-brand-base) 45%,
var(--pgn-color-primary-700) 45%,
var(--pgn-color-primary-700) 55%,
var(--pgn-color-accent-a) 55%,
var(--pgn-color-accent-a) 75%,
var(--pgn-color-info-200) 75%,
);
background-repeat: no-repeat;
}
}

.large-screen-svg-light,
.large-screen-svg-primary {
fill: paragon.$light-200;
fill: var(--pgn-color-light-200);
overflow: hidden;
position: absolute;
}

.large-screen-svg-primary {
fill: paragon.$primary-400;
fill: var(--pgn-color-primary-400);
}

.medium-screen-svg-light,
.medium-screen-svg-primary {
fill: paragon.$light-200;
fill: var(--pgn-color-light-200);
overflow: inherit;
position: absolute;
}

.medium-screen-svg-primary {
fill: paragon.$primary-400;
fill: var(--pgn-color-primary-400);
}

[dir=rtl] {
Expand All @@ -183,20 +186,20 @@
.small-yellow-line {
width: 80px;
height: 0;
border: 2px solid paragon.$accent-b;
border: 2px solid var(--pgn-color-accent-b);
transform: rotate(102.02deg);
}

.medium-yellow-line {
width: 120px;
height: 0;
border: 3px solid paragon.$accent-b;
border: 3px solid var(--pgn-color-accent-b);
transform: rotate(102.02deg);
}

.large-yellow-line {
width: 240px;
height: 0;
border: 3px solid paragon.$accent-b;
border: 3px solid var(--pgn-color-accent-b);
transform: rotate(102.02deg);
}
4 changes: 1 addition & 3 deletions src/sass/_progressive_profiling_page.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@use "@openedx/paragon/scss/core/core" as paragon;

.pp-page__button-width {
min-width: 6rem;
}
Expand All @@ -15,7 +13,7 @@
margin-bottom: 0.5rem;
font-weight: 700;

@include paragon.media-breakpoint-down('md') {
@media (--pgn-size-breakpoint-max-width-md) {
line-height: 1.5rem;
font-size: 1.125rem;
}
Expand Down
15 changes: 7 additions & 8 deletions src/sass/_registration.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@use "@openedx/paragon/scss/core/core" as paragon;
@use "sass:map";

.register-button {
Expand All @@ -25,22 +24,22 @@
line-height: 1.25rem;
}

.alert-link {
color: paragon.$primary !important;
.alert-link {
color: var(--pgn-color-primary-base) !important;

&:hover {
text-decoration: underline;
color: paragon.$info-700 !important;
color: var(--pgn-color-info-700) !important;
}
}
}

.email-suggestion-alert-warning {
color: paragon.$info-500 !important;
color: var(--pgn-color-info-500) !important;

&:hover {
text-decoration: underline;
color: paragon.$info-700 !important;
color: var(--pgn-color-info-700) !important;
}
}

Expand All @@ -60,7 +59,7 @@
line-height: 24px;
font-size: 12px;
font-weight: normal;
color: paragon.$primary-700;
color: var(--pgn-color-primary-700);
}

.username-suggestion--label {
Expand Down Expand Up @@ -104,7 +103,7 @@
}
}

@media (max-width: map.get(paragon.$grid-breakpoints, "sm")) {
@media (--pgn-size-breakpoint-max-width-sm) {
.username-scroll-suggested--form-field {
width: 15rem;
}
Expand Down
Loading
Loading