summaryrefslogtreecommitdiff
path: root/bower_components/bootstrap/less/scaffolding.less
diff options
context:
space:
mode:
Diffstat (limited to 'bower_components/bootstrap/less/scaffolding.less')
-rw-r--r--bower_components/bootstrap/less/scaffolding.less19
1 files changed, 17 insertions, 2 deletions
diff --git a/bower_components/bootstrap/less/scaffolding.less b/bower_components/bootstrap/less/scaffolding.less
index 976b4e3c..fe29f2d6 100644
--- a/bower_components/bootstrap/less/scaffolding.less
+++ b/bower_components/bootstrap/less/scaffolding.less
@@ -4,8 +4,13 @@
// Reset the box-sizing
-
-*,
+//
+// Heads up! This reset may cause conflicts with some third-party widgets.
+// For recommendations on resolving such conflicts, see
+// http://getbootstrap.com/getting-started/#third-box-sizing
+* {
+ .box-sizing(border-box);
+}
*:before,
*:after {
.box-sizing(border-box);
@@ -56,6 +61,16 @@ a {
}
+// Figures
+//
+// We reset this here because previously Normalize had no `figure` margins. This
+// ensures we don't break anyone's use of the element.
+
+figure {
+ margin: 0;
+}
+
+
// Images
img {