2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00

Merge branch 'master' into v4

This commit is contained in:
Mark Otto
2015-06-18 23:56:43 -07:00
80 changed files with 2784 additions and 1569 deletions
+1 -1
View File
@@ -7,7 +7,7 @@ While we don't officially support any third party plugins or add-ons, we do offe
## Box-sizing
Some third-party software, including Google Maps and Google Custom Search Engine, conflict with Bootstrap due to `* { box-sizing: border-box; }`, a rule which makes it so `padding` does not affect the final computed width of an element. These widgets expect the box model to be `content-box` instead. Learn more about [box model and sizing at CSS Tricks](http://css-tricks.com/box-sizing/).
Some third-party software, including Google Maps and Google Custom Search Engine, conflict with Bootstrap due to `* { box-sizing: border-box; }`, a rule which makes it so `padding` does not affect the final computed width of an element. These widgets expect the box model to be `content-box` instead. Learn more about [box model and sizing at CSS Tricks](https://css-tricks.com/box-sizing/).
You can deal with this conflict by overriding the box model back to `content-box` just for the third-party widget's section of the page: