0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

34 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
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
Zulfiqar Ali
e7035aee3f _custom.scss should be the first include 2017-01-09 21:03:40 -08:00
Mark Otto
045888fa38 version bump 2017-01-06 08:38:04 -08:00
Nuno Arruda
c767a00d5d Update copyright years to 2017 2017-01-01 12:56:11 +11:00
Mark Otto
4482503237 move custom down so folks can reassign var values and use other vars 2016-12-27 14:16:25 -08:00
Mark Otto
7e5f21c2b4 Rename _animation.scss to _transitions.scss (#21370)
* Rename _animation.scss to _transitions.scss for accuracy

* fix docs reference to file name

* cleanup line breaks
2016-12-19 21:37:09 -08:00
Mark Otto
d9fa3fd797 Rename .tag to .badge to avoid conflicting with WordPress 2016-10-26 18:33:58 -07:00
Mark Otto
8ff7edaab4 version bump to alpha 5 2016-10-19 08:27:41 -07:00
Bardi Harborow
2e69dfa8c1 Fix broken/redirected links, moving to HTTPS where possible. (#20557) 2016-10-03 09:55:59 -07:00
Mark Otto
5495a4b3d3 versions 2016-09-05 12:41:44 -07:00
Mark Otto
24e992a6ff bump versions 2016-07-27 09:31:24 -07:00
Chris Rebert
a90b36918f Add "The Bootstrap Authors" to copyright notices (#19936)
❤️❤️❤️ https://github.com/twbs/bootstrap/graphs/contributors
2016-05-20 09:04:31 -07:00
Ameya Pandilwar
4ed5fa77ff Rename .label class to .tag 2016-02-11 03:54:30 -05:00
Mark Otto
d00eef1dac Merge branch 'provide-custom-scss' of https://github.com/stephaniepurvis/bootstrap into stephaniepurvis-provide-custom-scss 2016-01-17 15:51:49 -08:00
Mark Otto
d5b2dea1a5 Rip out the pager component 2016-01-06 14:47:33 -08:00
Chris Rebert
e9192f6de0 Update copyright years to 2016
[ci skip]
2016-01-01 12:31:38 -08:00
Chris Rebert
7aabd49364 Reorganize utilities into more separate files under a /scss/utilities/ directory
[skip sauce]
[skip validator]
2015-12-23 21:01:17 -07:00
Stephanie Kendall
523c5a3d1a switching position of custom in bootstrap.scss for better efficiency 2015-12-16 09:27:09 -06:00
Mark Otto
5d3144e8fb manually bump versions because npm script wasn't working for me 2015-12-08 09:36:08 -08:00
Stephanie Kendall
aaae40c069 implements a _custom.scss, resolves #17322 2015-12-01 13:44:37 -06:00
Chris Rebert
9d201a8ef2 Move .bg-* utility classes into separate file
[skip sauce]
[skip validator]
2015-10-29 21:37:28 -07:00
Chris Rebert
aff3fce63b bootstrap.scss: Cleanup comments; refs #18036
[skip sauce]
[skip validator]
2015-10-23 15:39:07 -07:00
Xavier Gallardo
750656fc9c Add a license header to bootstrap.scss 2015-09-02 15:08:21 -04:00
Mark Otto
97bcfb9e7f rip badges 2015-08-05 00:48:42 -07:00
Mark Otto
9863eb75d2 move spacing utils to separate file, document them a bit 2015-06-01 01:19:02 -07:00
Mark Otto
585f857e71 rename scaffolding to reboot 2015-04-16 17:12:19 -07:00
Mark Otto
36e4cd0287 Move .img- classes to new _images.scss; move hr to _type.scss 2015-04-16 17:10:47 -07:00
Chris Rebert
1e5ce1e1a9 Temporarily revert "Rename scss/bootstrap.scss -> scss/_bootstrap.scss"
This reverts commit 2916ac43ed.
This reverts commit 3d635f3079.
This reverts commit 61a2120557.

This change broke the Grunt build.
2015-01-18 15:00:58 -08:00
Gleb Mazovetskiy
2916ac43ed Rename scss/bootstrap.scss -> scss/_bootstrap.scss
This is required for Compass compatibility. See
https://github.com/twbs/bootstrap-sass/issues/694

Also updates bower.json and package.json references to the main Sass
file.
2015-01-15 21:20:40 +00:00
Mark Otto
18e08e777b add custom forms, stub out examples for radios and checkboxes 2014-12-24 04:13:23 -08:00
Mark Otto
27df020852 convert to scss 2014-12-02 14:02:35 -08:00