Skip to content

Commit 5bba15f

Browse files
committed
fix: import typography
1 parent da04cd8 commit 5bba15f

File tree

3 files changed

+19
-34
lines changed

3 files changed

+19
-34
lines changed

sass/components/_cards.scss

-17
Original file line numberDiff line numberDiff line change
@@ -176,28 +176,11 @@
176176

177177
.card-action {
178178
padding: 0 1.6rem;
179-
// position: relative;
180-
// border-top: 1px solid var(--md-sys-color-outline-variant);
181-
// background-color: inherit;
182179

183180
&:last-child {
184181
border-radius: 0 0 2px 2px;
185182
}
186183
// Replaced card links with buttons (Accessibility, @see https://github.com/materializecss/materialize/issues/565)
187-
/*a {
188-
padding: 16px 24px;
189-
display: inline-block;
190-
}
191-
192-
a:not(.btn):not(.btn-large):not(.btn-floating) {
193-
color: var(--md-sys-color-primary);
194-
transition: color .3s ease;
195-
196-
&:hover {
197-
background-color: rgba(var(--md-sys-color-primary-numeric), 0.06);
198-
}
199-
}*/
200-
201184
a {
202185
@include btn(
203186
var(--btn-height),

sass/components/_global.scss

+18-17
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use './_variables' as vars;
1+
@use './_variables' as *;
22

33
html {
44
box-sizing: border-box;
@@ -18,11 +18,11 @@ input,
1818
optgroup,
1919
select,
2020
textarea {
21-
font-family: vars.$font-stack;
21+
font-family: $font-stack;
2222
}
2323

2424
a {
25-
color: vars.$link-color;
25+
color: $link-color;
2626
text-decoration: none;
2727
-webkit-tap-highlight-color: transparent; // Gets rid of tap active state
2828
}
@@ -180,61 +180,61 @@ ul.staggered-list li { opacity: 0; }
180180
Media Query Classes
181181
**********************/
182182
.hide-on-small-only, .hide-on-small-and-down {
183-
@media #{vars.$small-and-down} { display: none !important; }
183+
@media #{$small-and-down} { display: none !important; }
184184
}
185185

186186
.hide-on-med-and-down {
187-
@media #{vars.$medium-and-down} { display: none !important; }
187+
@media #{$medium-and-down} { display: none !important; }
188188
}
189189

190190
.hide-on-med-and-up {
191-
@media #{vars.$medium-and-up} { display: none !important; }
191+
@media #{$medium-and-up} { display: none !important; }
192192
}
193193

194194
.hide-on-med-only {
195-
@media only screen and (min-width: vars.$small-screen-up) and (max-width: vars.$medium-screen) {
195+
@media only screen and (min-width: $small-screen-up) and (max-width: $medium-screen) {
196196
display: none !important;
197197
}
198198
}
199199

200200
.hide-on-large-only {
201-
@media #{vars.$large-and-up} { display: none !important; }
201+
@media #{$large-and-up} { display: none !important; }
202202
}
203203

204204
.hide-on-extra-large-only {
205-
@media #{vars.$extra-large-and-up} { display: none !important; }
205+
@media #{$extra-large-and-up} { display: none !important; }
206206
}
207207

208208
.show-on-extra-large {
209-
@media #{vars.$extra-large-and-up} { display: block !important; }
209+
@media #{$extra-large-and-up} { display: block !important; }
210210
}
211211

212212
.show-on-large {
213-
@media #{vars.$large-and-up} { display: block !important; }
213+
@media #{$large-and-up} { display: block !important; }
214214
}
215215

216216
.show-on-medium {
217-
@media only screen and (min-width: vars.$small-screen-up) and (max-width: vars.$medium-screen) {
217+
@media only screen and (min-width: $small-screen-up) and (max-width: $medium-screen) {
218218
display: block !important;
219219
}
220220
}
221221

222222
.show-on-small {
223-
@media #{vars.$small-and-down} { display: block !important; }
223+
@media #{$small-and-down} { display: block !important; }
224224
}
225225

226226
.show-on-medium-and-up {
227-
@media #{vars.$medium-and-up} { display: block !important; }
227+
@media #{$medium-and-up} { display: block !important; }
228228
}
229229

230230
.show-on-medium-and-down {
231-
@media #{vars.$medium-and-down} { display: block !important; }
231+
@media #{$medium-and-down} { display: block !important; }
232232
}
233233

234234

235235
// Center text on mobile
236236
.center-on-small-only {
237-
@media #{vars.$small-and-down} { text-align: center; }
237+
@media #{$small-and-down} { text-align: center; }
238238
}
239239

240240
// Footer
@@ -258,6 +258,7 @@ ul.staggered-list li { opacity: 0; }
258258
padding: 10px 0px;
259259
}
260260
}
261+
261262
.page-footer ul {
262263
padding-left: 0;
263264
list-style-type: none;
@@ -315,7 +316,7 @@ td, th {
315316
}
316317

317318
// Responsive Table
318-
@media #{vars.$medium-and-down} {
319+
@media #{$medium-and-down} {
319320

320321
table.responsive-table {
321322
width: 100%;

sass/materialize.scss

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
// components
1414
@forward "components/global";
15+
@forward "components/typography";
1516
@forward "components/buttons";
1617
@forward "components/collection";
1718
@forward "components/badges";

0 commit comments

Comments
 (0)