Skip to content

Commit 9a99616

Browse files
committed
perf: change margin property, remove @mixin, grid-margin and grid-col-margin
1 parent c6af21a commit 9a99616

File tree

2 files changed

+6
-114
lines changed

2 files changed

+6
-114
lines changed

docs/index.html

Lines changed: 0 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -641,92 +641,6 @@ <h3 class="reference"><span class="small">@include</span> <span class="big">grid
641641

642642
<p>* The same initial value as the property of Flexbox</p>
643643

644-
<h3 class="reference"><span class="small">@include</span> <span class="big">grid-margin</span>($margin: null, $margin-top: null, $margin-right: null, $margin-bottom: null, $margin-left: null);</h3>
645-
646-
<p>Generate the margins around grids.</p>
647-
648-
<table>
649-
<tr>
650-
<th>Arguments</th>
651-
<th>Default value</th>
652-
<th>Values</th>
653-
<th>Description</th>
654-
</tr>
655-
<tr>
656-
<td>$margin</td>
657-
<td>null</td>
658-
<td>null | &lt;<a href="http://www.w3.org/TR/CSS21/box.html#value-def-margin-width" target="_blank">margin-width</a>&gt;</td>
659-
<td></td>
660-
</tr>
661-
<tr>
662-
<td>$margin-top</td>
663-
<td>null</td>
664-
<td>null | &lt;<a href="http://www.w3.org/TR/CSS21/box.html#value-def-margin-width" target="_blank">margin-width</a>&gt;</td>
665-
<td></td>
666-
</tr>
667-
<tr>
668-
<td>$margin-right</td>
669-
<td>null</td>
670-
<td>null | &lt;<a href="http://www.w3.org/TR/CSS21/box.html#value-def-margin-width" target="_blank">margin-width</a>&gt;</td>
671-
<td></td>
672-
</tr>
673-
<tr>
674-
<td>$margin-bottom</td>
675-
<td>null</td>
676-
<td>null | &lt;<a href="http://www.w3.org/TR/CSS21/box.html#value-def-margin-width" target="_blank">margin-width</a>&gt;</td>
677-
<td></td>
678-
</tr>
679-
<tr>
680-
<td>$margin-left</td>
681-
<td>null</td>
682-
<td>null | &lt;<a href="http://www.w3.org/TR/CSS21/box.html#value-def-margin-width" target="_blank">margin-width</a>&gt;</td>
683-
<td></td>
684-
</tr>
685-
</table>
686-
687-
<h3 class="reference"><span class="small">@include</span> <span class="big">grid-col-margin</span>($margin: null, $margin-top: null, $margin-right: null, $margin-bottom: null, $margin-left: null);</h3>
688-
689-
<p>Generate the margins around columns. Work as alias grid-margin().</p>
690-
691-
<table>
692-
<tr>
693-
<th>Arguments</th>
694-
<th>Default value</th>
695-
<th>Values</th>
696-
<th>Description</th>
697-
</tr>
698-
<tr>
699-
<td>$margin</td>
700-
<td>null</td>
701-
<td>null | &lt;<a href="http://www.w3.org/TR/CSS21/box.html#value-def-margin-width" target="_blank">margin-width</a>&gt;</td>
702-
<td></td>
703-
</tr>
704-
<tr>
705-
<td>$margin-top</td>
706-
<td>null</td>
707-
<td>null | &lt;<a href="http://www.w3.org/TR/CSS21/box.html#value-def-margin-width" target="_blank">margin-width</a>&gt;</td>
708-
<td></td>
709-
</tr>
710-
<tr>
711-
<td>$margin-right</td>
712-
<td>null</td>
713-
<td>null | &lt;<a href="http://www.w3.org/TR/CSS21/box.html#value-def-margin-width" target="_blank">margin-width</a>&gt;</td>
714-
<td></td>
715-
</tr>
716-
<tr>
717-
<td>$margin-bottom</td>
718-
<td>null</td>
719-
<td>null | &lt;<a href="http://www.w3.org/TR/CSS21/box.html#value-def-margin-width" target="_blank">margin-width</a>&gt;</td>
720-
<td></td>
721-
</tr>
722-
<tr>
723-
<td>$margin-left</td>
724-
<td>null</td>
725-
<td>null | &lt;<a href="http://www.w3.org/TR/CSS21/box.html#value-def-margin-width" target="_blank">margin-width</a>&gt;</td>
726-
<td></td>
727-
</tr>
728-
</table>
729-
730644
<h2 id="Resources">Resources</h2>
731645

732646
<ul>

sass/_flexbox-grid-mixins.scss

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ $flexbox-grid-mixins-box-sizing: border-box !default;
4545

4646
@if $flexbox-grid-mixins-grid-type == skeleton {
4747
@if $gutter {
48-
@include grid-margin($margin: 0 $gutter / 2 * -1);
48+
margin-left: $gutter / 2 * -1;
49+
margin-right: $gutter / 2 * -1;
4950
}
5051
}
5152

@@ -167,40 +168,17 @@ $flexbox-grid-mixins-box-sizing: border-box !default;
167168

168169
@if $gutter and unitless($gutter) == false {
169170
@if $flexbox-grid-mixins-grid-type == skeleton {
170-
@include grid-col-margin($margin: 0 $gutter / 2 $gutter);
171+
margin-left: $gutter / 2;
172+
margin-right: $gutter / 2;
171173
} @else if $flexbox-grid-mixins-grid-type == margin-offset {
172174
@if type-of($last-child) == bool and $last-child == true {
173-
@include grid-col-margin($margin-right: 0);
175+
margin-right: 0;
174176
} @else {
175-
@include grid-col-margin($margin-right: $gutter);
177+
margin-right: $gutter;
176178
}
177179

178180
}
179181
}
180182

181183
@content;
182184
}
183-
184-
@mixin grid-margin($margin: null, $margin-top: null, $margin-right: null, $margin-bottom: null, $margin-left: null)
185-
{
186-
@if $margin != null {
187-
margin: $margin;
188-
}
189-
@if $margin-top != null {
190-
margin-top: $margin-top;
191-
}
192-
@if $margin-bottom != null {
193-
margin-bottom: $margin-bottom;
194-
}
195-
@if $margin-left != null {
196-
margin-left: $margin-left;
197-
}
198-
@if $margin-right != null {
199-
margin-right: $margin-right;
200-
}
201-
}
202-
203-
@mixin grid-col-margin($margin: null, $margin-top: null, $margin-right: null, $margin-bottom: null, $margin-left: null)
204-
{
205-
@include grid-margin($margin, $margin-top, $margin-right, $margin-bottom, $margin-left);
206-
}

0 commit comments

Comments
 (0)