aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-01-24 11:56:04 -0600
committerMark Otto <[email protected]>2014-01-24 11:56:04 -0600
commit4b2fe3f96f1bc3e4a582a05bb20bf1b2831bb401 (patch)
tree5b4bba2ee6e63960b42f22080af5c1cb64bf29c1 /less
parent64e81324261548a8de8cda5fde4b87d0f7a8f8fb (diff)
parentf1c1469b839d09fbc437de24afef5644b3c80305 (diff)
downloadbootstrap-4b2fe3f96f1bc3e4a582a05bb20bf1b2831bb401.tar.xz
bootstrap-4b2fe3f96f1bc3e4a582a05bb20bf1b2831bb401.zip
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'less')
-rw-r--r--less/scaffolding.less5
1 files changed, 4 insertions, 1 deletions
diff --git a/less/scaffolding.less b/less/scaffolding.less
index c4869139b..2fa0fdec7 100644
--- a/less/scaffolding.less
+++ b/less/scaffolding.less
@@ -4,7 +4,10 @@
// 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);
}