aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-06-01 01:19:02 -0700
committerMark Otto <[email protected]>2015-06-01 01:19:02 -0700
commit9863eb75d2c50c1e580232e15c6e87435fe72129 (patch)
treeb5191e53f2a9be3e4ce4350690ee28a84a05d113 /scss
parentc1a84e38c7f4692ec88c13d3951c46f1e59857e8 (diff)
downloadbootstrap-9863eb75d2c50c1e580232e15c6e87435fe72129.tar.xz
bootstrap-9863eb75d2c50c1e580232e15c6e87435fe72129.zip
move spacing utils to separate file, document them a bit
Diffstat (limited to 'scss')
-rw-r--r--scss/_utilities-spacing.scss69
-rw-r--r--scss/_utilities.scss110
-rw-r--r--scss/bootstrap.scss1
3 files changed, 70 insertions, 110 deletions
diff --git a/scss/_utilities-spacing.scss b/scss/_utilities-spacing.scss
new file mode 100644
index 000000000..8d23e526a
--- /dev/null
+++ b/scss/_utilities-spacing.scss
@@ -0,0 +1,69 @@
+//
+// Spacing
+//
+
+.m-a-0 { margin: 0; }
+.m-t-0 { margin-top: 0; }
+.m-r-0 { margin-right: 0; }
+.m-b-0 { margin-bottom: 0; }
+.m-l-0 { margin-left: 0; }
+
+.m-a { margin: $spacer; }
+.m-t { margin-top: $spacer-y; }
+.m-r { margin-right: $spacer-x; }
+.m-b { margin-bottom: $spacer-y; }
+.m-l { margin-left: $spacer-x; }
+.m-x { margin-right: $spacer-x; margin-left: $spacer-x; }
+.m-y { margin-top: $spacer-y; margin-bottom: $spacer-y; }
+
+.m-t-md { margin-top: ($spacer-y * 1.5); }
+.m-r-md { margin-right: ($spacer-y * 1.5); }
+.m-b-md { margin-bottom: ($spacer-y * 1.5); }
+.m-l-md { margin-left: ($spacer-y * 1.5); }
+.m-x-md { margin-right: ($spacer-x * 1.5); margin-left: ($spacer-x * 1.5); }
+.m-y-md { margin-top: ($spacer-y * 1.5); margin-bottom: ($spacer-y * 1.5); }
+
+.m-t-lg { margin-top: ($spacer-y * 3); }
+.m-r-lg { margin-right: ($spacer-y * 3); }
+.m-b-lg { margin-bottom: ($spacer-y * 3); }
+.m-l-lg { margin-left: ($spacer-y * 3); }
+.m-x-lg { margin-right: ($spacer-x * 3); margin-left: ($spacer-x * 3); }
+.m-y-lg { margin-top: ($spacer-y * 3); margin-bottom: ($spacer-y * 3); }
+
+.p-a-0 { padding: 0; }
+.p-t-0 { padding-top: 0; }
+.p-r-0 { padding-right: 0; }
+.p-b-0 { padding-bottom: 0; }
+.p-l-0 { padding-left: 0; }
+
+.p-a { padding: $spacer; }
+.p-t { padding-top: $spacer-y; }
+.p-r { padding-right: $spacer-x; }
+.p-b { padding-bottom: $spacer-y; }
+.p-l { padding-left: $spacer-x; }
+.p-x { padding-right: $spacer-x; padding-left: $spacer-x; }
+.p-y { padding-top: $spacer-y; padding-bottom: $spacer-y; }
+
+.p-t-md { padding-top: ($spacer-y * 1.5); }
+.p-r-md { padding-right: ($spacer-y * 1.5); }
+.p-b-md { padding-bottom: ($spacer-y * 1.5); }
+.p-l-md { padding-left: ($spacer-y * 1.5); }
+.p-x-md { padding-right: ($spacer-x * 1.5); padding-left: ($spacer-x * 1.5); }
+.p-y-md { padding-top: ($spacer-y * 1.5); padding-bottom: ($spacer-y * 1.5); }
+
+.p-t-lg { padding-top: ($spacer-y * 3); }
+.p-r-lg { padding-right: ($spacer-y * 3); }
+.p-b-lg { padding-bottom: ($spacer-y * 3); }
+.p-l-lg { padding-left: ($spacer-y * 3); }
+.p-x-lg { padding-right: ($spacer-x * 3); padding-left: ($spacer-x * 3); }
+.p-y-lg { padding-top: ($spacer-y * 3); padding-bottom: ($spacer-y * 3); }
+
+
+// Positioning
+.pos-f-t {
+ position: fixed;
+ top: 0;
+ right: 0;
+ left: 0;
+ z-index: $zindex-navbar-fixed;
+}
diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 30b2f9b42..d05c34133 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -36,116 +36,6 @@
@include sr-only-focusable();
}
-
-//
-// Spacing
-//
-
-.m-a-0 { margin: 0; }
-.m-t-0 { margin-top: 0; }
-.m-r-0 { margin-right: 0; }
-.m-b-0 { margin-bottom: 0; }
-.m-l-0 { margin-left: 0; }
-
-.m-a { margin: $spacer; }
-.m-t { margin-top: $spacer-y; }
-.m-r { margin-right: $spacer-x; }
-.m-b { margin-bottom: $spacer-y; }
-.m-l { margin-left: $spacer-x; }
-.m-x {
- margin-right: $spacer-x;
- margin-left: $spacer-x;
-}
-.m-y {
- margin-top: $spacer-y;
- margin-bottom: $spacer-y;
-}
-
-.m-t-md { margin-top: ($spacer-y * 1.5); }
-.m-r-md { margin-right: ($spacer-y * 1.5); }
-.m-b-md { margin-bottom: ($spacer-y * 1.5); }
-.m-l-md { margin-left: ($spacer-y * 1.5); }
-.m-x-md {
- margin-right: ($spacer-x * 1.5);
- margin-left: ($spacer-x * 1.5);
-}
-.m-y-md {
- margin-top: ($spacer-y * 1.5);
- margin-bottom: ($spacer-y * 1.5);
-}
-
-.m-t-lg { margin-top: ($spacer-y * 3); }
-.m-r-lg { margin-right: ($spacer-y * 3); }
-.m-b-lg { margin-bottom: ($spacer-y * 3); }
-.m-l-lg { margin-left: ($spacer-y * 3); }
-.m-x-lg {
- margin-right: ($spacer-x * 3);
- margin-left: ($spacer-x * 3);
-}
-.m-y-lg {
- margin-top: ($spacer-y * 3);
- margin-bottom: ($spacer-y * 3);
-}
-
-
-
-.p-a-0 { padding: 0; }
-.p-t-0 { padding-top: 0; }
-.p-r-0 { padding-right: 0; }
-.p-b-0 { padding-bottom: 0; }
-.p-l-0 { padding-left: 0; }
-
-.p-a { padding: $spacer; }
-.p-t { padding-top: $spacer-y; }
-.p-r { padding-right: $spacer-x; }
-.p-b { padding-bottom: $spacer-y; }
-.p-l { padding-left: $spacer-x; }
-.p-x {
- padding-right: $spacer-x;
- padding-left: $spacer-x;
-}
-.p-y {
- padding-top: $spacer-y;
- padding-bottom: $spacer-y;
-}
-
-.p-t-md { padding-top: ($spacer-y * 1.5); }
-.p-r-md { padding-right: ($spacer-y * 1.5); }
-.p-b-md { padding-bottom: ($spacer-y * 1.5); }
-.p-l-md { padding-left: ($spacer-y * 1.5); }
-.p-x-md {
- padding-right: ($spacer-x * 1.5);
- padding-left: ($spacer-x * 1.5);
-}
-.p-y-md {
- padding-top: ($spacer-y * 1.5);
- padding-bottom: ($spacer-y * 1.5);
-}
-
-.p-t-lg { padding-top: ($spacer-y * 3); }
-.p-r-lg { padding-right: ($spacer-y * 3); }
-.p-b-lg { padding-bottom: ($spacer-y * 3); }
-.p-l-lg { padding-left: ($spacer-y * 3); }
-.p-x-lg {
- padding-right: ($spacer-x * 3);
- padding-left: ($spacer-x * 3);
-}
-.p-y-lg {
- padding-top: ($spacer-y * 3);
- padding-bottom: ($spacer-y * 3);
-}
-
-
-
-// Positioning
-.pos-f-t {
- position: fixed;
- top: 0;
- right: 0;
- left: 0;
- z-index: $zindex-navbar-fixed;
-}
-
// Always hide an element with the `hidden` HTML attribute (from PureCSS).
[hidden] {
display: none !important;
diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss
index 24c60d976..5df72fe3b 100644
--- a/scss/bootstrap.scss
+++ b/scss/bootstrap.scss
@@ -46,4 +46,5 @@
// Utility classes
@import "utilities";
+@import "utilities-spacing";
@import "utilities-responsive";