2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-15 11:59:39 +03:00
Commit Graph

6342 Commits

Author SHA1 Message Date
Mark Otto 886bbe9bc0 Merge pull request #18138 from bassjobsen/patch-12
refactor blockqoutes to to avoid tag selectors & child selectors
2015-12-07 23:32:31 -08:00
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
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 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 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 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 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 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 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
Chris Rebert 193b8306f0 Fix grammar in "Custom forms" docs
[ci skip]
2015-12-06 12:08:01 -08:00
Chris Rebert 23a7c6b1a6 Docs: Fix flavor text in input group example that got borked at some point
[skip sauce]
2015-12-06 12:02:54 -08:00
Chris Rebert 4120663c4b Add Wall of Browser Bugs entry for #15990
https://bugzilla.mozilla.org/show_bug.cgi?id=1139853
[skip sauce]
2015-12-06 03:02:40 -08:00
Chris Rebert 2268fda99c Mention Mozilla Firefox meta-bug on Wall of Browser Bugs
https://bugzilla.mozilla.org/show_bug.cgi?id=1230801

[skip sauce]
2015-12-06 02:07:29 -08:00
XhmikosR b7b448a0e7 Run grunt.
[ci skip]
2015-12-05 12:59:13 +02:00
XhmikosR 34a0ce571e Run grunt.
[ci skip]
2015-12-05 11:43:23 +02:00
XhmikosR 4191288873 Update clipboard.js to v1.5.5.
[ci skip]
2015-12-05 11:41:34 +02:00
XhmikosR 58717fa2d8 Update anchor.js to v2.0.0.
[ci skip]
2015-12-05 11:41:34 +02:00
XhmikosR 3afdbe426f Fix docs/search.json.
* only loop through `html_pages`
* skip pages without a title
* stop double escaping the title; use Jekyll's `jsonify` filter to output valid JSON
* remove `date` since we don't use it

[skip sauce]
2015-12-05 11:30:27 +02:00
XhmikosR 4e7c7f4b9d Update jekyll-search.min.js to v1.0.9.
Fixes the IE 9 error.

[ci skip]
2015-12-04 19:28:41 +02:00
XhmikosR 14772943a6 Rename jekyll-search.js to reflect that it's minified.
[ci skip]
2015-12-04 19:28:41 +02:00
Chris Rebert 211ca58657 Use non-minified CSS when running docs locally
For easier debugging.
Just like we already do for the JS.

[skip sauce]
2015-12-04 00:45:37 -08:00
XhmikosR 8a1685fdee Run grunt.
[ci skip]
2015-12-03 08:51:57 +02:00
Taylor Poulos 0021e7e5b4 Proposed better phrasing in the "images" section
Previously, this read "Bootstrap doesn’t apply this automatically as it causes complications to other image formats." 

In this sentence, the number of the subject and the verb don't agree, and the word "this" is unclear.
2015-12-01 19:21:12 -05:00
vsn4ik 81e0295098 Fix classes for responsive floats in migration
See a8dc4812a49d8467e8642abb510b523a9a51cd48#commitcomment-14677726

[skip sauce]
2015-12-01 01:01:02 +03:00
Chris Rebert 4a51f28e2c Prevent anchors in tooltip example from splitting across lines
So as to decrease the number of future inquiries about said edge case (which is already documented).
Refs #18304
[skip sauce]
2015-11-29 23:54:13 -08:00
Chris Rebert 548834e87f Merge pull request #18340 from twbs/responsive-pulls
Add responsive float classes
2015-11-29 21:47:49 -08:00
Chris Rebert 7ae7149f3f navs.md: Fix typo
[ci skip]
2015-11-29 20:24:33 -08:00
Mark Otto c1b79347b4 Merge pull request #18264 from twbs/input-group-btns-both-sides
Add input group example with btns on both sides for completeness+testing
2015-11-29 20:02:47 -08:00
Mark Otto 0fa2c7c486 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-11-29 19:54:20 -08:00
Mark Otto 45632894d9 Merge pull request #18317 from twbs/redundant-text-aligns-18300
Remove non-responsive text alignment classes
2015-11-29 19:39:48 -08:00
Mark Otto 765c5e9c07 grunt 2015-11-29 19:38:53 -08:00
Mark Otto 389a284766 fixes #18295. improve .nav-inline usefulness and document the classes as well 2015-11-29 19:38:44 -08:00