Skip to content
Merged
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
2 changes: 2 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,5 @@ APP_ID=''
MFE_CONFIG_API_URL=''
SEARCH_CATALOG_URL=''
ENABLE_SKILLS_BUILDER_PROFILE=''
# 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 @@ -30,3 +30,5 @@ APP_ID=''
MFE_CONFIG_API_URL=''
SEARCH_CATALOG_URL='http://localhost:18000/courses'
ENABLE_SKILLS_BUILDER_PROFILE=''
# 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 @@ -25,3 +25,4 @@ LEARNER_RECORD_MFE_BASE_URL='http://localhost:1990'
COLLECT_YEAR_OF_BIRTH=true
APP_ID=''
MFE_CONFIG_API_URL=''
PARAGON_THEME_URLS={}
4,420 changes: 3,602 additions & 818 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@fortawesome/free-regular-svg-icons": "6.7.2",
"@fortawesome/free-solid-svg-icons": "6.7.2",
"@fortawesome/react-fontawesome": "0.2.2",
"@openedx/paragon": "^22.17.0",
"@openedx/paragon": "^23.4.5",
"@pact-foundation/pact": "^11.0.2",
"@redux-devtools/extension": "3.3.0",
"classnames": "2.5.1",
Expand Down
6 changes: 2 additions & 4 deletions src/index.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
@import "~@edx/brand/paragon/fonts";
@import "~@edx/brand/paragon/variables";
@import "~@openedx/paragon/scss/core/core";
@import "~@edx/brand/paragon/overrides";
@use "@openedx/paragon/styles/css/core/custom-media-breakpoints" as paragonCustomMediaBreakpoints;

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

Expand Down
24 changes: 12 additions & 12 deletions src/profile/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
position: absolute;
left: 1.5rem;
top: 5.25rem;
color: $gray-500;
color: var(--pgn-color-gray-500);
line-height: 0.9rem;
font-size: 0.8rem;
font-style: normal;
Expand All @@ -42,24 +42,24 @@

.icon-visibility-off {
height: 1rem;
color: $gray-500;
color: var(--pgn-color-gray-500);
}

.profile-page {
.edit-section-header {
@extend .h6;
font-size: var(--pgn-typography-font-size-h6-base);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Looks like this is another example of openedx/frontend-app-authn#1436 (comment)

Based on openedx/frontend-app-authn#1436 (comment) moving away from @extend in this way is good as-is!

display: block;
font-weight: normal;
letter-spacing: 0;
margin: 0;
}

label.edit-section-header {
margin-bottom: $spacer * .5;
margin-bottom: calc(var(--pgn-spacing-spacer-base) * .5);
}

.profile-avatar-wrap {
@include media-breakpoint-up(md) {
@media (--pgn-size-breakpoint-min-width-md) {
max-width: 12rem;
margin-right: 0;
margin-top: -8rem;
Expand All @@ -77,25 +77,25 @@
align-items: center;
border-radius: 50%;

@include media-breakpoint-up(md) {
@media (--pgn-size-breakpoint-min-width-md) {
background: linear-gradient(to top, rgba(0,0,0,.65) 4rem, rgba(0,0,0,0) 4rem);
align-items: flex-end;
}

.btn {
text-decoration: none;
@include media-breakpoint-up(md) {
@media (--pgn-size-breakpoint-min-width-md) {
margin-bottom: 1.2rem;
}
}

.dropdown {
@include media-breakpoint-up(md) {
@media (--pgn-size-breakpoint-min-width-md) {
margin-bottom: 1.2rem;
}

.btn {
color: $white;
color: var(--pgn-color-white);
background: transparent;
border-color: transparent;
margin: 0;
Expand All @@ -108,7 +108,7 @@
height: 5rem;
position: relative;

@include media-breakpoint-up(md) {
@media (--pgn-size-breakpoint-min-width-md) {
width: 12rem;
height: 12rem;
}
Expand All @@ -128,7 +128,7 @@
border-radius:0;
transition: opacity 200ms ease;

@include media-breakpoint-up(md) {
@media (--pgn-size-breakpoint-min-width-md) {
height: 4rem;
}

Expand All @@ -142,7 +142,7 @@
position: relative;

.certificate-title {
font-family: $font-family-serif;
font-family: var(--pgn-typography-font-family-serif);
font-weight: 400;
}

Expand Down