aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-09-01 20:25:25 -0700
committerMark Otto <[email protected]>2015-09-01 20:25:25 -0700
commitb5c93eafb83ee3a28712e4cccf01be8ef4b73c05 (patch)
treef9bc6e700d812ec0c01a08d34782f56f00d26709
parent3221563228fb11e25004aec9eebd2157161d8217 (diff)
parent865911c35dd37ff60c847eda4a6f550ff4b0a8f4 (diff)
downloadbootstrap-b5c93eafb83ee3a28712e4cccf01be8ef4b73c05.tar.xz
bootstrap-b5c93eafb83ee3a28712e4cccf01be8ef4b73c05.zip
Merge pull request #17333 from neilhem/combine-size-mixins
Combine size & square mixins into one
-rw-r--r--scss/mixins/_size.scss6
1 files changed, 1 insertions, 5 deletions
diff --git a/scss/mixins/_size.scss b/scss/mixins/_size.scss
index abbe2463c..b9dd48e8d 100644
--- a/scss/mixins/_size.scss
+++ b/scss/mixins/_size.scss
@@ -1,10 +1,6 @@
// Sizing shortcuts
-@mixin size($width, $height) {
+@mixin size($width, $height: $width) {
width: $width;
height: $height;
}
-
-@mixin square($size) {
- @include size($size, $size);
-}