aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
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
2015-12-07fixes #18330Mark Otto1-0/+9
2015-12-07Merge pull request #18356 from lesleh/card-mixinMark Otto3-11/+12
Card mixin
2015-12-07fixes #18281Mark Otto1-1/+1
2015-12-07fixes #18320: pull in suit base reset for button focus styles in FF and IEMark Otto1-0/+9
2015-12-07spacingMark Otto1-1/+1
2015-12-07Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-devMark Otto6-13/+12
2015-12-07gruntMark Otto2-2/+2
2015-12-07proper fix for #18439 w/ clippy placement and hoverMark Otto1-4/+8
2015-12-07Merge pull request #18455 from twbs/fix-18424Chris Rebert6-13/+12
Use $input-border-width for both .form-control and .btn borders
2015-12-07Use $input-btn-border-width for both .form-control and .btn borders; fixes ↵Chris Rebert6-13/+12
#18424 Both widgets need to use the same border width because of input groups. Thus: $btn-border-width => $input-btn-border-width $input-border-width => $input-btn-border-width [skip sauce]
2015-12-07Merge pull request #18460 from twbs/migration-stateful-btnChris Rebert1-0/+2
Add entry about stateful buttons to v4 migration guide
2015-12-07Add entry about stateful buttons to v4 migration guideChris Rebert1-0/+2
Refs #18459, #17178 [skip sauce]
2015-12-08Add an empty line at the end of the fileAlexandr Kondrashov1-1/+1
2015-12-07Consolidate duplicate "Buttons" section in v4 migration docsChris Rebert1-4/+1
[skip sauce]
2015-12-08SVG: base64 > ASCII85 (fix merge)Alexandr Kondrashov1-27/+45
2015-12-08SVG: base64 > ASCII85Alexandr Kondrashov2-17/+7
2015-12-08Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into patch-1Alexandr Kondrashov225-11261/+9176
2015-12-07gruntMark Otto8-12/+28
2015-12-07fixes #17433: improve borders on .list-group-flush to remove dupe borders ↵Mark Otto2-0/+22
when appropro
2015-12-07Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-devMark Otto6-10/+24
2015-12-07gruntMark Otto11-9/+33
2015-12-07Merge pull request #18453 from twbs/wkbug-151933Chris Rebert1-0/+10
Add Wall of Browser Bugs entry related to #16028
2015-12-07Add Wall of Browser Bugs entry related to #16028Chris Rebert1-0/+10
https://bugs.webkit.org/show_bug.cgi?id=151933 [skip sauce]
2015-12-07Merge pull request #18452 from twbs/font-weight-utilsChris Rebert2-7/+7
Tweak naming and docs of font utility classes
2015-12-07Tweak naming and docs of font utility classesChris Rebert2-7/+7
* `.font-normal` is too generic. Rename it to `.font-weight-normal` for clarity. * Rename `.font-bold` to `.font-weight-bold` so as to parallel `.font-weight-normal`. * In docs, gloss "weight" term in relation to fonts for the benefit of non-typographiles. Refs #18433 [skip sauce]
2015-12-06Merge pull request #18451 from twbs/navbar-form-migrateMark Otto1-0/+4
Add .navbar-form entry to v4 migration docs
2015-12-06links and clarification in navbar docsMark Otto1-2/+2
2015-12-06stub out some more of the navbar docs to include navbar-nav options and ↵Mark Otto1-0/+52
navbar-brand options
2015-12-06Fix .font-italic utility class definitionChris Rebert1-2/+2
Erratum from 26da610bd03e7efe9255b2b88f14449972f7d616 Refs #18001
2015-12-06Add .navbar-form entry to v4 migration docs; refs #18087Chris Rebert1-0/+4
[skip sauce]
2015-12-06Remove .navbar-form from example pages; refs #18087Chris Rebert2-2/+2
[skip sauce]
2015-12-06fix up navbar examples with proper coloringMark Otto2-4/+4
2015-12-06fixes #18087: .navbar-form is no moreMark Otto2-7/+4
2015-12-06fixes #18425 by using vars for 1px bordersMark Otto4-8/+9