Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

Commit f4c91b3

Browse files
author
Robert Messerle
committed
removes alternate comments, replaces conflicting mixins with hard-coded css
1 parent e1a98cc commit f4c91b3

File tree

2 files changed

+19
-11
lines changed

2 files changed

+19
-11
lines changed

src/components/list/list.scss

+16-9
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ md-list {
3131
padding: $list-padding-top $list-padding-right $list-padding-bottom $list-padding-left;
3232

3333
.md-subheader {
34-
@include md-body-2();
35-
/* @alternate */ line-height: $list-header-line-height;
34+
font-size: $body-font-size-base;
35+
font-weight: 500;
36+
letter-spacing: 0.010em;
37+
line-height: $list-header-line-height;
3638
}
3739
}
3840

@@ -178,20 +180,25 @@ md-list-item.md-3-line > .md-no-style {
178180
}
179181

180182
h3 {
181-
@include md-subhead();
183+
font-size: $subhead-font-size-base;
184+
font-weight: 400;
185+
letter-spacing: 0.010em;
182186
margin: $list-h3-margin;
183-
/* @alternate */ line-height: $list-header-line-height;
187+
line-height: $list-header-line-height;
184188
}
185189
h4 {
186-
@include md-body-2();
190+
font-size: $body-font-size-base;
191+
letter-spacing: 0.010em;
187192
margin: $list-h4-margin;
188-
/* @alternate */ font-weight: $list-h4-font-weight;
189-
/* @alternate */ line-height: $list-header-line-height;
193+
font-weight: $list-h4-font-weight;
194+
line-height: $list-header-line-height;
190195
}
191196
p {
192-
@include md-body-2();
197+
font-size: $body-font-size-base;
198+
font-weight: 500;
199+
letter-spacing: 0.010em;
193200
margin: $list-p-margin;
194-
/* @alternate */ line-height: $list-p-line-height;
201+
line-height: $list-p-line-height;
195202
}
196203
}
197204
}

src/components/toolbar/toolbar.scss

+3-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,9 @@ md-toolbar {
6464
}
6565

6666
.md-toolbar-tools {
67-
@include md-title();
68-
/* @alternate */ font-weight: 400;
67+
font-size: $title-font-size-base;
68+
letter-spacing: 0.005em;
69+
font-weight: 400;
6970
display: flex;
7071
align-items: center;
7172
flex-direction: row;

0 commit comments

Comments
 (0)