feat: add condense

thingsym · thingsym · commit 52dbe5ec47e6 · 2022-01-12T20:15:18.000+09:00
diff --git a/dart-sass/_flexbox-grid-mixins.scss b/dart-sass/_flexbox-grid-mixins.scss
@@ -73,7 +73,7 @@ $flexbox-grid-mixins-stack: margin-bottom !default;
 	@content;
 }
 
-@mixin grid-col($col: null, $grid-columns: 12, $col-offset: null, $gutter: null, $gap: null, $row-gap: null, $column-gap: null, $align-self: null, $flex-grow: 0, $flex-shrink: 1, $flex-basis: auto, $order: null, $shorthand: true, $last-child: false, $width: null, $max-width: null, $min-width: null, $height: null, $max-height: null, $min-height: null)
+@mixin grid-col($col: null, $grid-columns: 12, $col-offset: null, $gutter: null, $gap: null, $row-gap: null, $column-gap: null, $align-self: null, $flex-grow: 0, $flex-shrink: 1, $flex-basis: auto, $order: null, $shorthand: true, $condense: false, $last-child: false, $width: null, $max-width: null, $min-width: null, $height: null, $max-height: null, $min-height: null)
 {
 	@if $flexbox-grid-mixins-box-sizing == 'border-box' or $flexbox-grid-mixins-box-sizing == 'content-box' {
 		box-sizing: $flexbox-grid-mixins-box-sizing;
@@ -215,13 +215,15 @@ $flexbox-grid-mixins-stack: margin-bottom !default;
 			}
 		}
 
-		@if $flexbox-grid-mixins-stack == margin-top {
-			margin-top: $gutter;
-		} @else if $flexbox-grid-mixins-stack == margin-bottom {
-			margin-bottom: $gutter;
-		} @else if $flexbox-grid-mixins-stack == margin-both {
-			margin-top: math.div($gutter, 2);
-			margin-bottom: math.div($gutter, 2);
+		@if $condense == false {
+			@if $flexbox-grid-mixins-stack == margin-top {
+				margin-top: $gutter;
+			} @else if $flexbox-grid-mixins-stack == margin-bottom {
+				margin-bottom: $gutter;
+			} @else if $flexbox-grid-mixins-stack == margin-both {
+				margin-top: math.div($gutter, 2);
+				margin-bottom: math.div($gutter, 2);
+			}
 		}
 	}
 
diff --git a/sass/_flexbox-grid-mixins.scss b/sass/_flexbox-grid-mixins.scss
@@ -69,7 +69,7 @@ $flexbox-grid-mixins-stack: margin-bottom !default;
 	@content;
 }
 
-@mixin grid-col($col: null, $grid-columns: 12, $col-offset: null, $gutter: null, $gap: null, $row-gap: null, $column-gap: null, $align-self: null, $flex-grow: 0, $flex-shrink: 1, $flex-basis: auto, $order: null, $shorthand: true, $last-child: false, $width: null, $max-width: null, $min-width: null, $height: null, $max-height: null, $min-height: null)
+@mixin grid-col($col: null, $grid-columns: 12, $col-offset: null, $gutter: null, $gap: null, $row-gap: null, $column-gap: null, $align-self: null, $flex-grow: 0, $flex-shrink: 1, $flex-basis: auto, $order: null, $shorthand: true, $condense: false, $last-child: false, $width: null, $max-width: null, $min-width: null, $height: null, $max-height: null, $min-height: null)
 {
 	@if $flexbox-grid-mixins-box-sizing == 'border-box' or $flexbox-grid-mixins-box-sizing == 'content-box' {
 		box-sizing: $flexbox-grid-mixins-box-sizing;
@@ -211,13 +211,15 @@ $flexbox-grid-mixins-stack: margin-bottom !default;
 			}
 		}
 
-		@if $flexbox-grid-mixins-stack == margin-top {
-			margin-top: $gutter;
-		} @else if $flexbox-grid-mixins-stack == margin-bottom {
-			margin-bottom: $gutter;
-		} @else if $flexbox-grid-mixins-stack == margin-both {
-			margin-top: $gutter / 2;
-			margin-bottom: $gutter / 2;
+		@if $condense == false {
+			@if $flexbox-grid-mixins-stack == margin-top {
+				margin-top: $gutter;
+			} @else if $flexbox-grid-mixins-stack == margin-bottom {
+				margin-bottom: $gutter;
+			} @else if $flexbox-grid-mixins-stack == margin-both {
+				margin-top: $gutter / 2;
+				margin-bottom: $gutter / 2;
+			}
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ $flexbox-grid-mixins-stack: margin-bottom !default;`
`73`	`73`	`@content;`
`74`	`74`	`}`
`75`	`75`
`76`		`-@mixin grid-col($col: null, $grid-columns: 12, $col-offset: null, $gutter: null, $gap: null, $row-gap: null, $column-gap: null, $align-self: null, $flex-grow: 0, $flex-shrink: 1, $flex-basis: auto, $order: null, $shorthand: true, $last-child: false, $width: null, $max-width: null, $min-width: null, $height: null, $max-height: null, $min-height: null)`
	`76`	`+@mixin grid-col($col: null, $grid-columns: 12, $col-offset: null, $gutter: null, $gap: null, $row-gap: null, $column-gap: null, $align-self: null, $flex-grow: 0, $flex-shrink: 1, $flex-basis: auto, $order: null, $shorthand: true, $condense: false, $last-child: false, $width: null, $max-width: null, $min-width: null, $height: null, $max-height: null, $min-height: null)`
`77`	`77`	`{`
`78`	`78`	`@if $flexbox-grid-mixins-box-sizing == 'border-box' or $flexbox-grid-mixins-box-sizing == 'content-box' {`
`79`	`79`	`box-sizing: $flexbox-grid-mixins-box-sizing;`
`@@ -215,13 +215,15 @@ $flexbox-grid-mixins-stack: margin-bottom !default;`
`215`	`215`	`}`
`216`	`216`	`}`
`217`	`217`
`218`		`- @if $flexbox-grid-mixins-stack == margin-top {`
`219`		`- margin-top: $gutter;`
`220`		`- } @else if $flexbox-grid-mixins-stack == margin-bottom {`
`221`		`- margin-bottom: $gutter;`
`222`		`- } @else if $flexbox-grid-mixins-stack == margin-both {`
`223`		`- margin-top: math.div($gutter, 2);`
`224`		`- margin-bottom: math.div($gutter, 2);`
	`218`	`+ @if $condense == false {`
	`219`	`+ @if $flexbox-grid-mixins-stack == margin-top {`
	`220`	`+ margin-top: $gutter;`
	`221`	`+ } @else if $flexbox-grid-mixins-stack == margin-bottom {`
	`222`	`+ margin-bottom: $gutter;`
	`223`	`+ } @else if $flexbox-grid-mixins-stack == margin-both {`
	`224`	`+ margin-top: math.div($gutter, 2);`
	`225`	`+ margin-bottom: math.div($gutter, 2);`
	`226`	`+ }`
`225`	`227`	`}`
`226`	`228`	`}`
`227`	`229`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ $flexbox-grid-mixins-stack: margin-bottom !default;`
`69`	`69`	`@content;`
`70`	`70`	`}`
`71`	`71`
`72`		`-@mixin grid-col($col: null, $grid-columns: 12, $col-offset: null, $gutter: null, $gap: null, $row-gap: null, $column-gap: null, $align-self: null, $flex-grow: 0, $flex-shrink: 1, $flex-basis: auto, $order: null, $shorthand: true, $last-child: false, $width: null, $max-width: null, $min-width: null, $height: null, $max-height: null, $min-height: null)`
	`72`	`+@mixin grid-col($col: null, $grid-columns: 12, $col-offset: null, $gutter: null, $gap: null, $row-gap: null, $column-gap: null, $align-self: null, $flex-grow: 0, $flex-shrink: 1, $flex-basis: auto, $order: null, $shorthand: true, $condense: false, $last-child: false, $width: null, $max-width: null, $min-width: null, $height: null, $max-height: null, $min-height: null)`
`73`	`73`	`{`
`74`	`74`	`@if $flexbox-grid-mixins-box-sizing == 'border-box' or $flexbox-grid-mixins-box-sizing == 'content-box' {`
`75`	`75`	`box-sizing: $flexbox-grid-mixins-box-sizing;`
`@@ -211,13 +211,15 @@ $flexbox-grid-mixins-stack: margin-bottom !default;`
`211`	`211`	`}`
`212`	`212`	`}`
`213`	`213`
`214`		`- @if $flexbox-grid-mixins-stack == margin-top {`
`215`		`- margin-top: $gutter;`
`216`		`- } @else if $flexbox-grid-mixins-stack == margin-bottom {`
`217`		`- margin-bottom: $gutter;`
`218`		`- } @else if $flexbox-grid-mixins-stack == margin-both {`
`219`		`- margin-top: $gutter / 2;`
`220`		`- margin-bottom: $gutter / 2;`
	`214`	`+ @if $condense == false {`
	`215`	`+ @if $flexbox-grid-mixins-stack == margin-top {`
	`216`	`+ margin-top: $gutter;`
	`217`	`+ } @else if $flexbox-grid-mixins-stack == margin-bottom {`
	`218`	`+ margin-bottom: $gutter;`
	`219`	`+ } @else if $flexbox-grid-mixins-stack == margin-both {`
	`220`	`+ margin-top: $gutter / 2;`
	`221`	`+ margin-bottom: $gutter / 2;`
	`222`	`+ }`
`221`	`223`	`}`
`222`	`224`	`}`
`223`	`225`