Skip to content

Commit b662f8c

Browse files
committed
refactor: update styles to css variables
1 parent caea96a commit b662f8c

File tree

15 files changed

+49
-81
lines changed

15 files changed

+49
-81
lines changed

src/components/Assessment/Assessment.scss

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,34 @@
1-
@import "~@edx/brand/paragon/variables";
2-
@import "~@openedx/paragon/scss/core/core";
3-
@import "~@edx/brand/paragon/overrides";
4-
51
.assessment-card {
62
max-width: 320px !important;
73
height: fit-content;
84
max-height: 100%;
95
position: sticky !important;
10-
top: map-get($spacers, 1) * -1;
6+
top: calc( var(--pgn-spacing-spacer-1) * -1);
117

128
.assessment-header {
139
box-shadow: 0 0 0.25rem rgba(0, 0, 0, 0.3) !important;
1410
display: flex;
1511
justify-content: center;
16-
padding: map-get($spacers, 3);
12+
padding: var(--pgn-spacing-spacer-3);
1713
}
1814

1915
.assessment-body {
2016
overflow-y: hide;
21-
padding: map-get($spacers, 3);
17+
padding: var(--pgn-spacing-spacer-3);
2218
}
2319

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

3026
button.pgn__stateful-btn.pgn__stateful-btn-state-pending {
3127
opacity: .4 !important;
3228
}
3329
}
3430

35-
@include media-breakpoint-down(sm) {
31+
@media (--pgn-size-breakpoint-max-width-sm) {
3632
.assessment-card {
3733
margin-left: 0 !important;
3834
width: 100% !important;

src/components/CriterionContainer/CriterionContainer.scss

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
1-
@import "~@edx/brand/paragon/variables";
2-
@import "~@openedx/paragon/scss/core/core";
3-
@import "~@edx/brand/paragon/overrides";
4-
51
.criteria-label {
62
width: 100%;
73
.criteria-title {
84
display: inline-block;
95
max-width: calc(100% - 44px);
10-
color: $primary-500;
6+
color: var(--pgn-color-primary-500);
117
font-weight: bold;
128
vertical-align: top;
139
}
1410
.esg-help-icon {
15-
margin-top: (map-get($spacers, 1\.5) * -1);
16-
margin-right: (map-get($spacers, 2\.5) * -1);
11+
margin-top: calc( var(--pgn-spacing-spacer-1-5) * -1);
12+
margin-right: calc( var(--pgn-spacing-spacer-2-5) * -1);
1713
vertical-align: top;
1814
}
1915
}

src/components/FilePreview/components/FileRenderer/FileCard/FileCard.scss

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
@import "@openedx/paragon/scss/core/core";
2-
31
.file-card {
4-
margin: map-get($spacers, 1) 0;
2+
margin: var(--pgn-spacing-spacer-1) 0;
53

64
.file-card-title {
75
text-overflow: ellipsis;
@@ -26,8 +24,8 @@
2624
white-space: pre-wrap;
2725
}
2826

29-
@include media-breakpoint-down(sm) {
27+
@media (--pgn-size-breakpoint-max-width-sm) {
3028
.file-card-title {
31-
width: calc(map-get($container-max-widths, "sm")/2);
29+
width: calc(var(--pgn-size-container-max-width-sm)/2);
3230
}
33-
}
31+
}

src/components/FileUpload/styles.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
vertical-align: middle;
66
overflow: hidden;
77
white-space: nowrap;
8-
}
8+
}

src/components/ModalContainer.scss

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
@import '@edx/brand/paragon/variables.scss';
2-
@import '@openedx/paragon/scss/core/core.scss';
3-
@import '@edx/brand/paragon/overrides.scss';
4-
51
.ora-modal-body {
6-
min-height: calc(100vh - 20px - 64px - (map-get($spacers, 2) * 8));
2+
min-height: calc(100vh - 20px - 64px - calc(var(--pgn-spacing-spacer-3) * 8));
73
height: 100%;
84
}
95

106
.exam-timer {
11-
max-width: $max-width-lg;
7+
max-width: var(--pgn-size-container-max-width-lg);
128
margin: auto;
139
button {
1410
display: none;

src/components/ProgressBar/index.scss

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
@import '@openedx/paragon/scss/core/core';
2-
31
.ora-progress-nav-group {
4-
max-width: $max-width-lg;
2+
max-width: var(--pgn-size-container-max-width-lg);
53
display: flex;
64
flex-direction: row;
75
justify-content: space-between;
86
margin: auto;
97
.ora-progress-divider {
108
position: absolute;
11-
max-width: $max-width-lg;
9+
max-width: var(--pgn-size-container-max-width-lg);
1210
width: 100%;
1311
}
1412
.ora-progress-nav {
@@ -48,21 +46,21 @@
4846
width: 100%;
4947
&.is-active {
5048
border: none;
51-
background-color: $light;
49+
background-color: var(--pgn-color-light-base);
5250
}
5351
}
5452
.nav-icon {
55-
margin-left: map-get($spacers, 3);
53+
margin-left: var(--pgn-spacing-spacer-3);
5654
}
5755
}
5856

59-
@include media-breakpoint-down(md) {
57+
@media (--pgn-size-breakpoint-max-width-md) {
6058
.navbar-expand-lg .ora-progress-nav-group {
6159
@include navbar-collapse-definition;
6260
}
6361
}
6462

65-
@include media-breakpoint-down(sm) {
63+
@media (--pgn-size-breakpoint-max-width-sm) {
6664
.navbar-expand-md .ora-progress-nav-group {
6765
@include navbar-collapse-definition;
6866
}

src/components/Prompt/index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
.prompt > pre {
22
text-wrap: wrap;
3-
}
3+
}

src/components/Rubric/Rubric.scss

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
@import "~@edx/brand/paragon/variables";
2-
@import "~@openedx/paragon/scss/core/core";
3-
@import "~@edx/brand/paragon/overrides";
4-
51
.popover.overlay-help-popover {
62
z-index: 4000;
7-
margin-right: map-get($spacers, 1) !important;
3+
margin-right: var(--pgn-spacing-spacer-1) !important;
84
.help-popover-option {
9-
margin-bottom: map-get($spacers, 1);
5+
margin-bottom: var(--pgn-spacing-spacer-1);
106
}
117
}
128

@@ -15,35 +11,35 @@
1511
width: 320px !important;
1612
height: fit-content;
1713
max-height: 100%;
18-
margin-left: map-get($spacers, 3);
14+
margin-left: var(--pgn-spacing-spacer-3);
1915
position: sticky !important;
20-
top: map-get($spacers, 1) * -1;
16+
top: calc(var(--pgn-spacing-spacer-1) * -1);
2117

2218
.rubric-header {
2319
box-shadow: 0 0 0.25rem rgba(0, 0, 0, 0.3) !important;
2420
display: flex;
2521
justify-content: center;
26-
padding: map-get($spacers, 3);
22+
padding: var(--pgn-spacing-spacer-3);
2723
}
2824

2925
.rubric-body {
3026
overflow-y: hide;
31-
padding: map-get($spacers, 3);
27+
padding: var(--pgn-spacing-spacer-3);
3228
}
3329

3430
.rubric-footer {
3531
box-shadow: 0 0 0.25rem rgba(0, 0, 0, 0.3) !important;
3632
display: flex;
3733
justify-content: center;
38-
padding: map-get($spacers, 3);
34+
padding: var(--pgn-spacing-spacer-3);
3935
}
4036

4137
button.pgn__stateful-btn.pgn__stateful-btn-state-pending {
4238
opacity: .4 !important;
4339
}
4440
}
4541

46-
@include media-breakpoint-down(sm) {
42+
@media (--pgn-size-breakpoint-max-width-sm) {
4743
.rubric-card {
4844
margin-left: 0 !important;
4945
}

src/components/TextResponse/index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
font-size: inherit;
88
line-height: inherit;
99
margin-bottom: 0;
10-
}
10+
}

src/index.scss

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
@import "@edx/brand/paragon/fonts.scss";
2-
@import "@edx/brand/paragon/variables.scss";
3-
@import "@openedx/paragon/scss/core/core.scss";
4-
@import "@edx/brand/paragon/overrides.scss";
1+
@use "@openedx/paragon/styles/css/core/custom-media-breakpoints" as paragonCustomMediaBreakpoints;
2+
53

64
#root {
75
display: flex;
@@ -26,23 +24,23 @@
2624
}
2725

2826
.gap-0 {
29-
gap: map-get($spacers, 0);
27+
gap: var(--pgn-spacing-spacer-0);
3028
}
3129

3230
.gap-1 {
33-
gap: map-get($spacers, 1);
31+
gap: var(--pgn-spacing-spacer-1);
3432
}
3533

3634
.gap-2 {
37-
gap: map-get($spacers, 2);
35+
gap: var(--pgn-spacing-spacer-2);
3836
}
3937

4038
.gap-3 {
41-
gap: map-get($spacers, 3);
39+
gap: var(--pgn-spacing-spacer-3);
4240
}
4341

4442
.gap-4 {
45-
gap: map-get($spacers, 4);
43+
gap: var(--pgn-spacing-spacer-4);
4644
}
4745
.ora-icon svg {
4846
display: inline-block !important;
@@ -53,4 +51,4 @@
5351
top: 50%;
5452
left: 50%;
5553
scale: 3;
56-
}
54+
}

src/views/AssessmentView/BaseAssessmentView/BaseAssessmentView.scss

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
@import "@openedx/paragon/scss/core/core";
2-
31
.assessment-content-layout {
42
& > div.content-body {
53
height: 100%;
@@ -12,15 +10,15 @@
1210
height: 100%;
1311

1412
.content-wrapper {
15-
max-width: $max-width-lg;
13+
max-width: var(--pgn-size-container-max-width-lg);
1614
}
1715

1816
.assessment-col {
1917
min-width: 300px;
2018
}
2119
}
2220

23-
@include media-breakpoint-down(sm) {
21+
@media (--pgn-size-breakpoint-max-width-sm) {
2422
.assessment-content-layout {
2523
.content-wrapper {
2624
width: 100%;

src/views/GradeView/index.scss

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
@import "@openedx/paragon/scss/core/core";
2-
31
.grade-view-body {
4-
max-width: $max-width-lg;
2+
max-width: var(--pgn-size-container-max-width-lg);
53
flex-wrap: nowrap !important;
64
gap: 1em;
75
}
86

9-
@include media-breakpoint-down(md) {
7+
@media (--pgn-size-breakpoint-max-width-md) {
108
.grade-view-body {
119
flex-wrap: wrap !important;
1210
gap: 0;

src/views/SubmissionView/index.scss

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
@import "@openedx/paragon/scss/core/core";
2-
31
.assessment-content-layout {
42
& > div.content-body {
53
height: 100%;
@@ -12,15 +10,15 @@
1210
height: 100%;
1311

1412
.content-wrapper {
15-
max-width: $max-width-lg;
13+
max-width: var(--pgn-size-container-max-width-lg);
1614
}
1715
}
1816

1917
.ora-tinymce .tox-tinymce {
20-
background-color: $white;
18+
background-color: var(--pgn-color-white);
2119
}
2220

23-
@include media-breakpoint-down(sm) {
21+
@media (--pgn-size-breakpoint-max-width-sm) {
2422
.assessment-content-layout {
2523
.content-wrapper {
2624
width: 100%;

src/views/XBlockStudioView/index.scss

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
@import "@openedx/paragon/scss/core/core";
2-
31
#ora-xblock-studio-view {
42
max-width: 1024px;
53
display: flex;
64
flex-direction: column;
7-
gap: map-get($spacers, 3);
5+
gap: var(--pgn-spacing-spacer-3);
86

9-
@include media-breakpoint-down(md) {
7+
@media (--pgn-size-breakpoint-max-width-md) {
108
padding-left: 40px;
119
padding-right: 40px;
1210
}

src/views/XBlockView/index.scss

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
@import "@openedx/paragon/scss/core/core";
2-
31
#ora-xblock-view {
42
max-width: 1024px;
5-
@include media-breakpoint-down(md) {
3+
@media (--pgn-size-breakpoint-max-width-md) {
64
padding-left: 40px;
75
padding-right: 40px;
86
}

0 commit comments

Comments
 (0)