Skip to content
This repository was archived by the owner on Dec 11, 2021. It is now read-only.

Commit bf6c02a

Browse files
committed
Typography: Eliminated need of a mixin for p
Typography: Eliminated need of mixin for p Typography: Shorthand margins Typography: Eliminated need of mixin for p
1 parent 14a3d8f commit bf6c02a

File tree

4 files changed

+9
-15
lines changed

4 files changed

+9
-15
lines changed

.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,3 @@ external/
1010
icons/svg-min/
1111
.sass-cache/
1212
dist/
13-
.DS_Store
14-
demos/.DS_Store

scss/atoms/typography/_mixins.scss

-7
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,3 @@
99
line-height: 1;
1010
text-transform: map-get($style,capitalization);
1111
}
12-
13-
@mixin paragraph($style) {
14-
text-align: map-get($style,textAlignment);
15-
margin: em(map-get($style,margin)) 0;
16-
line-height: 1.5;
17-
font-size: em(map-get($style,fontSize));
18-
}

scss/atoms/typography/_typography.scss

+6-4
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,21 @@ h6 {
4545
}
4646

4747
p {
48-
@include paragraph($p);
48+
text-align: map-get($p,textAlignment);
49+
margin: em(map-get($p,marginTopBottom)) em(map-get($p,marginLeftRight));
50+
line-height: 1.5;
51+
font-size: em(map-get($p,fontSize));
4952
}
5053

5154
ul, ol {
52-
margin-top: 0;
53-
margin-bottom: 10px;
55+
margin: 0 0 10px;
5456
}
5557

5658
ul ul,
5759
ol ul,
5860
ul ol,
5961
ol ol {
60-
margin-bottom: 0;
62+
margin: 0;
6163
}
6264

6365
/*

scss/variables/typography.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,10 @@ chassis.typography = {
154154
p: {
155155
name: "P style",
156156
value: {
157-
margin: "25px",
157+
marginTopBottom: "25px",
158+
marginLeftRight: "0px",
158159
fontSize: "16px",
159-
textAlignment: "justify"
160+
textAlignment: "left"
160161
}
161162
}
162163

0 commit comments

Comments
 (0)