1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Commit graph

9 commits

Author SHA1 Message Date
Mark Otto
e62b121226 Merge branch 'v4-dev' into rip-custom 2017-06-14 20:59:02 -07:00
Mark Otto
5da5a38f0d Move scss functions from top of variables to separate file, then import it into other build files 2017-06-14 20:55:00 -07:00
Mark Otto
aa8c456a16 Remove the confusing _custom.scss file 2017-06-13 22:45:16 -07:00
Mark Otto
ea6390d513 Update _custom.scss imports in other builds (#21825)
- Correctly places the _custom.scss file first in the other two buids.
- Also removes the clearfix mixin from the grid build because flexbox yo.
2017-01-23 23:59:19 -08:00
Mark Otto
4fa7749442 Drop Normalize, port relevant parts to Reboot (#21741)
* Get this party started by removing mention of Normalize.css

* Nuke the old comment, consolidate to a single line and number as appropriate

* Bring over styles for HTML element from Normalize to Reboot

* Move margin override for body element from Normalize to Reboot

* Drop the block reset for HTML5 elements in IE9- from Normalize given we dropped IE9 support

* Building on previous commit, do the same thing for figure, figcaption, and main

* Remove IE9- display from Normalize given our browser support

* Drop IE8 figure margin because we're IE10+

* No need for the h1 overrides because we reset these font and margin styles anyway in _type.scss already

* Drop Safari 6 b and strong normalization because we're Safari 8+

* Remove mark styles for IE9- from Normalize

* Remove old iOS audio fixes from Normalize

* Remove IE9- display for progress from Normalize

* Remove more IE9- rules from Normalize

* One more IE9- display removal for canvas element

* Move pre overrides from Normalize to Reboot

* Move over some link resets to Reboot, drop others

- Move over background-color and text-decoration
- Drop focus outline change given it affects the offset on hover of
focused links

* Move over more code element resets, consolidate with pre overrides, too

* Move over sub and sup wholesale

* Move over img normalization to Reboot

* Move over SVG override too

* - Drop dupe hidden, but add comment for it
- Move over template
- Move over summary

* Remove bulk of @viewport comment

* edit down that code comment

* consolidate html-based normalizations

* update comments

* Consolidate abbr styles

* move over more type elements

* move over hr changes

* move over form controls and more

* move over button resets

* move over firefox button changes

* move over search changes and more

* we nuke all these styles for fieldsets anyway, so outright remove them

* no need for those, we override them

* move over legend, fieldset, progress

* line break

* delete normalize file

* linting

* update comment

* clarify docs mentions of normalize and reboot

* remove normalize excludes from linter

* remove normalize excludes from cli task

* linting

* callout license since we forked part of normalize

* Improve comments, move table background reset to .table class instead of in reboot

* trailing space
2017-01-21 14:14:25 -08:00
Mark Otto
fe0573cdab sure we only need the two mixins, but this ensures folks don't run into missing mixin errors down the line 2016-12-27 14:16:25 -08:00
Mark Otto
424f969d1c Update bootstrap-reboot.scss 2016-12-27 14:16:25 -08:00
Mark Otto
567a0e9cee add custom overrides to other bundles 2016-01-17 15:54:17 -08:00
Mark Otto
8410afe0e1 Create new stylesheets for optional builds and add them to Gruntfile tasks 2015-06-18 10:19:50 -07:00