Skip to content

Commit 80f93ec

Browse files
refactor: styles refactoring
1 parent 7d899e0 commit 80f93ec

File tree

3 files changed

+41
-38
lines changed

3 files changed

+41
-38
lines changed

example/index.scss

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
@import "@edx/brand/paragon/fonts";
2-
@import "@edx/paragon/styles/scss/core/core";
1+
@import url("https://cdn.jsdelivr.net/npm/@edx/brand-edx.org@alpha/dist/core.min.css");
2+
@import url("https://cdn.jsdelivr.net/npm/@edx/brand-edx.org@alpha/dist/light.min.css");@import "@edx/paragon/styles/scss/core/core";
33
@import "@edx/paragon/styles/css/themes/light/index.css";
4-
@import "@edx/brand/paragon/overrides";
54

65
@import "@edx/frontend-component-header/index";

src/Menu/menu.scss

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
.menu {
22
position: relative;
33
}
4+
45
.menu-content {
56
position: absolute;
67
top: 100%;
78
z-index: 10;
8-
background: #fff;
9+
background: var(--pgn-color-white);
910
min-width: 10rem;
11+
1012
&.pin-left {
1113
left: 0;
1214
}
15+
1316
&.pin-right {
1417
right: 0;
1518
}
1619
}
1720

18-
1921
.menu-dropdown-enter {
2022
opacity: 0;
2123
transform-origin: 75% 0;
2224
transform: scale3d(0.8, 0.8, 1);
2325
}
26+
2427
.menu-dropdown-enter-active {
2528
transform-origin: 75% 0;
2629
transition: all 250ms cubic-bezier(0.4, 0, 0.2, 1);
2730
transform: scale3d(1, 1, 1);
2831
opacity: 1;
2932
}
30-
.menu-dropdown-enter-done {
31-
}
3233

3334
.menu-dropdown-exit {
3435
transform-origin: 75% 0;
3536
transform: scale3d(1, 1, 1);
3637
opacity: 1;
3738
}
39+
3840
.menu-dropdown-exit-active {
3941
transform-origin: 75% 0;
4042
transform: scale3d(0.8, 0.8, 1);
4143
transition: all 250ms cubic-bezier(0.8, 0, 0.6, 1);
4244
opacity: 0;
4345
}
44-
.menu-dropdown-exit-done {
45-
}

src/index.scss

+33-29
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
$spacer: 1rem;
2-
$blue: #007db8;
3-
$white: #fff;
4-
@import "@edx/brand/paragon/fonts.scss";
1+
@import url("https://cdn.jsdelivr.net/npm/@edx/brand-edx.org@alpha/dist/core.min.css");
2+
@import url("https://cdn.jsdelivr.net/npm/@edx/brand-edx.org@alpha/dist/light.min.css");
53
@import "@edx/paragon/styles/scss/core/core";
64
@import "@edx/paragon/styles/css/themes/light/index.css";
7-
@import "@edx/brand/paragon/overrides.scss";
85
@import './Menu/menu.scss';
96

107
.dropdown-item a {
@@ -23,8 +20,9 @@ $white: #fff;
2320
padding: .75rem;
2421
justify-content: center;
2522
align-items:center;
23+
2624
&:hover, &:focus {
27-
background: rgba(0,0,0,.1);
25+
background: rgba(0, 0, 0, .1);
2826
}
2927
}
3028

@@ -38,16 +36,15 @@ $white: #fff;
3836
white-space: nowrap;
3937
overflow: hidden;
4038
text-overflow: ellipsis;
41-
padding-bottom: 0.1rem;
39+
padding-bottom: var(--pgn-spacing-spacer-base);
4240
}
4341
}
4442

45-
.user-dropdown {
46-
.btn {
47-
height: 3rem;
48-
@media (max-width: -1 + map-get($grid-breakpoints, "sm")) {
49-
padding: 0 0.5rem;
50-
}
43+
.user-dropdown .btn {
44+
height: 3rem;
45+
46+
@media (--max-pgn-size-breakpoint-xs) {
47+
padding: 0 .5rem;
5148
}
5249
}
5350
}
@@ -65,68 +62,75 @@ $white: #fff;
6562
text-decoration: none;
6663
cursor: pointer;
6764
}
65+
6866
img {
6967
height: 1.5rem;
7068
}
7169
}
7270

7371

7472
.site-header-desktop {
75-
box-shadow: 0 1px 0 0 rgba(0,0,0,.1);
73+
box-shadow: 0 1px 0 0 rgba(0, 0, 0, .1);
7674
background: var(--pgn-color-white);
75+
7776
.nav-link {
7877
text-decoration: none;
7978
}
79+
8080
.logo {
8181
display: block;
8282
box-sizing: content-box;
8383
position: relative;
8484
top: -.05em;
8585
height: 1.75rem;
86-
padding: 1rem 0;
87-
margin-right: 1rem;
86+
padding: var(--pgn-spacing-spacer-base) 0;
87+
margin-right: var(--pgn-spacing-spacer-base);
88+
8889
img {
8990
display: block;
9091
height: 100%;
9192
}
9293
}
94+
9395
.main-nav {
9496
.nav-link {
95-
padding: 1.125rem 1rem;
97+
padding: 1.125rem var(--pgn-spacing-spacer-base);
9698
text-decoration: none;
9799
font-weight: 500;
98100
letter-spacing: .01em;
99101
}
102+
100103
.nav-link:hover,
101104
.nav-link:focus,
102105
.nav-link.active,
103106
.expanded .nav-link {
104107
background: var(--pgn-color-bg-active);
105108
color: var(--pgn-color-active);
106109
}
110+
107111
.menu {
108112
position: static;
113+
109114
.menu-content {
110115
border-top: solid 2px var(--pgn-color-bg-active);
111116
left: 0;
112117
right: 0;
113-
box-shadow: 0 1px 2px rgba(0,0,0,.25);
118+
box-shadow: var(--pgn-elevation-box-shadow-down-1);
114119
border-bottom-left-radius: 2px;
115120
border-bottom-right-radius: 2px;
116-
padding: 1rem;
121+
padding: var(--pgn-spacing-spacer-base);
117122
}
118123
}
119124
}
125+
120126
.search-input {
121127
border-radius: var(--pgn-size-rounded-pill);
122128
}
123129
}
124130

125-
.content {
126-
b {
127-
color: #00262B !important;
128-
font-weight: 500 !important;
129-
}
131+
.content b {
132+
color: var(--pgn-color-primary-500) !important;
133+
font-weight: 500 !important;
130134
}
131135

132136
.font-size-18 {
@@ -185,15 +189,15 @@ $white: #fff;
185189
position: absolute;
186190
margin-top: 18px;
187191
margin-left: -21px;
188-
border: 2px solid #FFFFFF;
192+
border: 2px solid var(--pgn-color-white);
189193
font-size: 9px !important;
190194
}
191195

192196
.popover {
193197
max-height: calc(100% - 68px);
194198
min-height: 1220px;
195199
filter: none;
196-
box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.15), 0px 2px 8px rgba(0, 0, 0, 0.15);
200+
box-shadow: var(--pgn-elevation-box-shadow-down-2);
197201

198202
&.medium-screen {
199203
min-width: 24.313rem;
@@ -217,7 +221,7 @@ $white: #fff;
217221

218222
.dropdown-toggle {
219223
font-size: 14px;
220-
padding-top: 0px !important;
224+
padding-top: 0 !important;
221225
padding-bottom: 12px !important;
222226

223227
div {
@@ -239,11 +243,11 @@ $white: #fff;
239243
text-overflow: ellipsis;
240244

241245
p {
242-
margin-bottom: 0px;
246+
margin-bottom: 0;
243247
}
244248

245249
b {
246-
color: #00262B;
250+
color: var(--pgn-color-primary-500);
247251
}
248252
}
249253

0 commit comments

Comments
 (0)