0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Commit Graph

13787 Commits

Author SHA1 Message Date
Mark Otto
7303977c52 grunt 2015-12-07 23:31:06 -08:00
Mark Otto
515ff1aacb rewrite list-inline to use margin and simpler styles 2015-12-07 23:31:02 -08:00
Mark Otto
d3c87d32fa Merge branch 'patch-11' of https://github.com/bassjobsen/bootstrap into bassjobsen-patch-11 2015-12-07 23:28:31 -08:00
Chris Rebert
e7edf10473 .page => .page-item 2015-12-07 22:37:17 -08:00
Chris Rebert
0c1df9912f Refactor pagination code to remove unnecessary ancestor requirements in selectors 2015-12-07 22:37:17 -08:00
Chris Rebert
5f35ce2095 .page>{a,span => .page-link} 2015-12-07 22:37:17 -08:00
Chris Rebert
a878c4f0c6 .pagination>{li => .page} 2015-12-07 22:37:17 -08:00
Mark Otto
7eadfbc9b2 ignore that 2015-12-07 22:31:16 -08:00
Mark Otto
1e9f0ab99e grunt 2015-12-07 22:11:27 -08:00
Mark Otto
7f8a05d3ef Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-12-07 22:10:38 -08:00
Mark Otto
3d45bd6106 fixes #18293: clean up sticky stuff 2015-12-07 22:05:37 -08:00
Mark Otto
0186ab5fff Merge pull request #18325 from twbs/tooltip-a-nowrap
Prevent anchors in tooltip example from splitting across lines
2015-12-07 21:58:35 -08:00
Mark Otto
5a6a128728 fixes #18330 2015-12-07 21:57:06 -08:00
Mark Otto
e5b6922258 Merge pull request #18356 from lesleh/card-mixin
Card mixin
2015-12-07 21:55:26 -08:00
Mark Otto
bd5d25da44 fixes #18281 2015-12-07 21:51:04 -08:00
Mark Otto
c9eb483ca9 fixes #18320: pull in suit base reset for button focus styles in FF and IE 2015-12-07 21:47:40 -08:00
Mark Otto
d36686afee spacing 2015-12-07 21:46:03 -08:00
Mark Otto
78d3a083a0 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-12-07 21:35:15 -08:00
Mark Otto
8f80b80c17 grunt 2015-12-07 21:35:05 -08:00
Mark Otto
4520b0f5d0 proper fix for #18439 w/ clippy placement and hover 2015-12-07 21:35:00 -08:00
Chris Rebert
5e3a20889f Merge pull request #18455 from twbs/fix-18424
Use $input-border-width for both .form-control and .btn borders
2015-12-07 20:48:56 -08:00
Chris Rebert
9dacdce42c Use $input-btn-border-width for both .form-control and .btn borders; fixes #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-07 20:41:51 -08:00
Chris Rebert
ed0e6be863 Merge pull request #18460 from twbs/migration-stateful-btn
Add entry about stateful buttons to v4 migration guide
2015-12-07 17:02:48 -08:00
Chris Rebert
e117083694 Add entry about stateful buttons to v4 migration guide
Refs #18459, #17178
[skip sauce]
2015-12-07 16:48:22 -08:00
Chris Rebert
5d4fd87bfa Consolidate duplicate "Buttons" section in v4 migration docs
[skip sauce]
2015-12-07 16:30:12 -08:00
Mark Otto
afbaf43505 grunt 2015-12-07 10:08:39 -08:00
Mark Otto
a22d2fb5a5 fixes #17433: improve borders on .list-group-flush to remove dupe borders when appropro 2015-12-07 10:05:53 -08:00
Mark Otto
ef5b6a224e Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-12-07 09:25:28 -08:00
Mark Otto
a78b835143 grunt 2015-12-07 09:24:54 -08:00
Chris Rebert
2f176821c3 Merge pull request #18453 from twbs/wkbug-151933
Add Wall of Browser Bugs entry related to #16028
2015-12-07 01:17:20 -08:00
Chris Rebert
6e8c7c9b2d Add Wall of Browser Bugs entry related to #16028
https://bugs.webkit.org/show_bug.cgi?id=151933

[skip sauce]
2015-12-07 01:09:56 -08:00
Chris Rebert
37955def29 Merge pull request #18452 from twbs/font-weight-utils
Tweak naming and docs of font utility classes
2015-12-07 00:14:51 -08:00
Chris Rebert
d1a0af8b24 Tweak naming and docs of font utility classes
* `.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-07 00:08:54 -08:00
Mark Otto
eae036b755 Merge pull request #18451 from twbs/navbar-form-migrate
Add .navbar-form entry to v4 migration docs
2015-12-06 23:50:32 -08:00
Mark Otto
3c4bf98af6 links and clarification in navbar docs 2015-12-06 22:47:23 -08:00
Mark Otto
e61eae4f9d stub out some more of the navbar docs to include navbar-nav options and navbar-brand options 2015-12-06 22:34:06 -08:00
Chris Rebert
28bbf42e26 Fix .font-italic utility class definition
Erratum from 26da610bd0
Refs #18001
2015-12-06 17:37:55 -08:00
Chris Rebert
7739ea8d85 Add .navbar-form entry to v4 migration docs; refs #18087
[skip sauce]
2015-12-06 17:32:24 -08:00
Chris Rebert
da87424a79 Remove .navbar-form from example pages; refs #18087
[skip sauce]
2015-12-06 17:30:26 -08:00
Mark Otto
dd2c784c92 fix up navbar examples with proper coloring 2015-12-06 17:09:49 -08:00
Mark Otto
21b15d450d fixes #18087: .navbar-form is no more 2015-12-06 16:59:33 -08:00
Mark Otto
49674a8eba fixes #18425 by using vars for 1px borders 2015-12-06 16:45:40 -08:00
Mark Otto
5a2318b68c fixes #18436 2015-12-06 16:41:38 -08:00
Mark Otto
26da610bd0 fixes #18433: add three new font utils 2015-12-06 16:39:55 -08:00
Mark Otto
db0f2df59c Merge pull request #18426 from twbs/label-reboot-comment-grammar
Fix grammar of comment for <label> in Reboot
2015-12-06 16:29:56 -08:00
Mark Otto
239befe16b Merge branch 'list-inline-padding' into v4-dev 2015-12-06 16:29:35 -08:00
Mark Otto
873a9409a3 Merge pull request #18450 from twbs/more-font-weight-vars
Add 3 more font-weight variables
2015-12-06 16:24:31 -08:00
Chris Rebert
0759d76bd2 Add 3 more font-weight variables
Refs #14368

[skip sauce]
[skip validator]
2015-12-06 12:32:49 -08:00
Chris Rebert
451265bb76 Grunt: Factor out new docs-github task
Ports #18445 to v4.

[skip sauce]
[skip validator]
2015-12-06 12:11:10 -08:00
Chris Rebert
193b8306f0 Fix grammar in "Custom forms" docs
[ci skip]
2015-12-06 12:08:01 -08:00