assets/stylesheets/bootstrap/_utilities-spacing.scss in bootstrap-4.0.0.alpha2 vs assets/stylesheets/bootstrap/_utilities-spacing.scss in bootstrap-4.0.0.alpha3

- old
+ new

@@ -1,72 +1,33 @@ -// Margin +// Margin and Padding -.m-a-0 { margin: 0 !important; } -.m-t-0 { margin-top: 0 !important; } -.m-r-0 { margin-right: 0 !important; } -.m-b-0 { margin-bottom: 0 !important; } -.m-l-0 { margin-left: 0 !important; } -.m-x-0 { margin-right: 0 !important; margin-left: 0 !important; } -.m-y-0 { margin-top: 0 !important; margin-bottom: 0 !important; } +.m-x-auto { + margin-right: auto !important; + margin-left: auto !important; +} -.m-a { margin: $spacer !important; } -.m-t { margin-top: $spacer-y !important; } -.m-r { margin-right: $spacer-x !important; } -.m-b { margin-bottom: $spacer-y !important; } -.m-l { margin-left: $spacer-x !important; } -.m-x { margin-right: $spacer-x !important; margin-left: $spacer-x !important; } -.m-y { margin-top: $spacer-y !important; margin-bottom: $spacer-y !important; } -.m-x-auto { margin-right: auto !important; margin-left: auto !important; } +@each $prop, $abbrev in (margin: m, padding: p) { + @each $size, $lengths in $spacers { + $length-x: map-get($lengths, x); + $length-y: map-get($lengths, y); -.m-a-md { margin: ($spacer * 1.5) !important; } -.m-t-md { margin-top: ($spacer-y * 1.5) !important; } -.m-r-md { margin-right: ($spacer-y * 1.5) !important; } -.m-b-md { margin-bottom: ($spacer-y * 1.5) !important; } -.m-l-md { margin-left: ($spacer-y * 1.5) !important; } -.m-x-md { margin-right: ($spacer-x * 1.5) !important; margin-left: ($spacer-x * 1.5) !important; } -.m-y-md { margin-top: ($spacer-y * 1.5) !important; margin-bottom: ($spacer-y * 1.5) !important; } + .#{$abbrev}-a-#{$size} { #{$prop}: $length-y $length-x !important; } // a = All sides + .#{$abbrev}-t-#{$size} { #{$prop}-top: $length-y !important; } + .#{$abbrev}-r-#{$size} { #{$prop}-right: $length-x !important; } + .#{$abbrev}-b-#{$size} { #{$prop}-bottom: $length-y !important; } + .#{$abbrev}-l-#{$size} { #{$prop}-left: $length-x !important; } -.m-a-lg { margin: ($spacer * 3) !important; } -.m-t-lg { margin-top: ($spacer-y * 3) !important; } -.m-r-lg { margin-right: ($spacer-y * 3) !important; } -.m-b-lg { margin-bottom: ($spacer-y * 3) !important; } -.m-l-lg { margin-left: ($spacer-y * 3) !important; } -.m-x-lg { margin-right: ($spacer-x * 3) !important; margin-left: ($spacer-x * 3) !important; } -.m-y-lg { margin-top: ($spacer-y * 3) !important; margin-bottom: ($spacer-y * 3) !important; } - -// Padding - -.p-a-0 { padding: 0 !important; } -.p-t-0 { padding-top: 0 !important; } -.p-r-0 { padding-right: 0 !important; } -.p-b-0 { padding-bottom: 0 !important; } -.p-l-0 { padding-left: 0 !important; } -.p-x-0 { padding-right: 0 !important; padding-left: 0 !important; } -.p-y-0 { padding-top: 0 !important; padding-bottom: 0 !important; } - -.p-a { padding: $spacer !important; } -.p-t { padding-top: $spacer-y !important; } -.p-r { padding-right: $spacer-x !important; } -.p-b { padding-bottom: $spacer-y !important; } -.p-l { padding-left: $spacer-x !important; } -.p-x { padding-right: $spacer-x !important; padding-left: $spacer-x !important; } -.p-y { padding-top: $spacer-y !important; padding-bottom: $spacer-y !important; } - -.p-a-md { padding: ($spacer * 1.5) !important; } -.p-t-md { padding-top: ($spacer-y * 1.5) !important; } -.p-r-md { padding-right: ($spacer-y * 1.5) !important; } -.p-b-md { padding-bottom: ($spacer-y * 1.5) !important; } -.p-l-md { padding-left: ($spacer-y * 1.5) !important; } -.p-x-md { padding-right: ($spacer-x * 1.5) !important; padding-left: ($spacer-x * 1.5) !important; } -.p-y-md { padding-top: ($spacer-y * 1.5) !important; padding-bottom: ($spacer-y * 1.5) !important; } - -.p-a-lg { padding: ($spacer * 3) !important; } -.p-t-lg { padding-top: ($spacer-y * 3) !important; } -.p-r-lg { padding-right: ($spacer-y * 3) !important; } -.p-b-lg { padding-bottom: ($spacer-y * 3) !important; } -.p-l-lg { padding-left: ($spacer-y * 3) !important; } -.p-x-lg { padding-right: ($spacer-x * 3) !important; padding-left: ($spacer-x * 3) !important; } -.p-y-lg { padding-top: ($spacer-y * 3) !important; padding-bottom: ($spacer-y * 3) !important; } + // Axes + .#{$abbrev}-x-#{$size} { + #{$prop}-right: $length-x !important; + #{$prop}-left: $length-x !important; + } + .#{$abbrev}-y-#{$size} { + #{$prop}-top: $length-y !important; + #{$prop}-bottom: $length-y !important; + } + } +} // Positioning .pos-f-t { position: fixed;