aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-12-08Merge pull request #18479 from twbs/v4a2v4.0.0-alpha.2Mark Otto68-92/+92
v4 alpha 2
2015-12-08Merge branch 'v4-dev' into v4a2Mark Otto0-0/+0
2015-12-08missed a grunt i thinkMark Otto7-61/+61
2015-12-08bump more versions in configMark Otto1-2/+2
2015-12-08grunt after version bumpMark Otto7-61/+61
2015-12-08manually bump versions because npm script wasn't working for meMark Otto68-91/+91
2015-12-08Update docs for spacing utilities themselves to account for #18185Chris Rebert1-69/+39
/fyi @mdo There might be prettier/better ways of explaining these, but for the sake of having accurate docs for tomorrow, this should do in a pinch. [skip sauce]
2015-12-08Update examples to account for #18185Chris Rebert8-14/+14
[skip sauce]
2015-12-08Merge pull request #18185 from twbs/fix-18129Chris Rebert3-121/+100
Refactor _utilities-spacing.scss
2015-12-08Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-devMark Otto0-0/+0
2015-12-08Regenerate dist/css/bootstrap.css for diffing purposesChris Rebert1-55/+55
[skip validator] [skip sauce]
2015-12-08Refactor _utilities-spacing.scss; fixes #18129Chris Rebert2-66/+45
2015-12-08gruntMark Otto4-4/+4
2015-12-08Make SCSS Lint happyChris Rebert1-1/+1
[skip sauce] [skip validator]
2015-12-08orderMark Otto1-1/+1
2015-12-08Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-devMark Otto1-1/+1
2015-12-08unfuck that border from rem to pxMark Otto9-24/+26
2015-12-08docs/components/navbar.md: Nitpick phrasingChris Rebert1-1/+1
[ci skip]
2015-12-08fixes #17887: restore hover/focus for cover navMark Otto1-0/+5
2015-12-08Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-devMark Otto6-1/+65
2015-12-08fixes #17776Mark Otto1-1/+1
2015-12-08Merge pull request #17930 from zalog/patch-12Mark Otto1-0/+1
v4 - .c-select shouldn't inherit white text color
2015-12-08Merge pull request #17946 from supergibbs/NuGet_badge_v4Mark Otto1-0/+1
Add NuGet badge
2015-12-08Merge pull request #17952 from supergibbs/NuGet_SupportMark Otto3-0/+62
Add NuGet support
2015-12-08scss/_pagination.scss: Reassert #18257Chris Rebert1-1/+1
[skip sauce]
2015-12-07tweak commentMark Otto1-1/+1
2015-12-07Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-devMark Otto1-1/+5
2015-12-07gruntMark Otto8-6/+66
2015-12-07Add entry for pagination component changes to v4 migration guideChris Rebert1-0/+4
Refs #18110 [skip sauce]
2015-12-07Merge branch 'bassjobsen-patch-6' into v4-devMark Otto2-28/+60
2015-12-07Merge branch 'patch-6' of https://github.com/bassjobsen/bootstrap into ↵Mark Otto2-28/+60
bassjobsen-patch-6
2015-12-07Fix header hierarchy in migration guideChris Rebert1-1/+1
[ci skip]
2015-12-07gruntMark Otto8-98/+64
2015-12-07fix variableMark Otto1-1/+1
2015-12-07Merge pull request #18110 from twbs/pagination-classesMark Otto3-91/+80
Refactor pagination classes to avoid tag selectors & child selectors
2015-12-07gruntMark Otto8-26/+14
2015-12-07rip out the .blockquote-* children classes for margin utilsMark Otto2-12/+4
2015-12-07Merge pull request #18138 from bassjobsen/patch-12Mark Otto2-28/+29
refactor blockqoutes to to avoid tag selectors & child selectors
2015-12-07gruntMark Otto8-14/+16
2015-12-07rewrite list-inline to use margin and simpler stylesMark Otto2-5/+5
2015-12-07Merge branch 'patch-11' of https://github.com/bassjobsen/bootstrap into ↵Mark Otto2-8/+8
bassjobsen-patch-11
2015-12-07.page => .page-itemChris Rebert3-28/+28
2015-12-07Refactor pagination code to remove unnecessary ancestor requirements in ↵Chris Rebert2-42/+40
selectors
2015-12-07.page>{a,span => .page-link}Chris Rebert3-44/+35
2015-12-07.pagination>{li => .page}Chris Rebert3-33/+33
2015-12-07ignore thatMark Otto1-1/+1
2015-12-07gruntMark Otto10-8/+26
2015-12-07Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-devMark Otto1-0/+4
2015-12-07fixes #18293: clean up sticky stuffMark Otto4-40/+36
2015-12-07Merge pull request #18325 from twbs/tooltip-a-nowrapMark Otto1-0/+4
Prevent anchors in tooltip example from splitting across lines