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

13574 Commits

Author SHA1 Message Date
Mark Otto
f16ad22530 fixes #18188 2015-11-29 19:56:17 -08:00
Mark Otto
4005b316c6 rearrange comment lines for clarity 2015-11-29 19:55:51 -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
c68019e5d0 Merge pull request #18257 from twbs/border-width-vars
Add more border width variables
2015-11-29 19:52:22 -08:00
Mark Otto
1f487f79d3 Merge pull request #18260 from twbs/fix-18259
Move viewport-dependent padding tweak into main .jumbotron block
2015-11-29 19:49:20 -08:00
Mark Otto
94d7a8f4ef Merge pull request #18265 from twbs/fix-v4-17007
Bring focused input group controls to front via z-index:3
2015-11-29 19:48:54 -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
Mark Otto
1a30d12525 clarify nav default display 2015-11-29 18:44:57 -08:00
Mark Otto
3140701b52 grunt 2015-11-29 18:41:12 -08:00
Mark Otto
9f40178112 fix ads background color 2015-11-29 18:41:08 -08:00
Mark Otto
e28e73e531 grunt 2015-11-29 18:39:46 -08:00
Mark Otto
6421e27b6c darken docs nav selected state and un-semibold it so it's not dangling 2015-11-29 18:36:50 -08:00
Chris Rebert
c2cf58b4a0 grunt dist
[ci skip]
2015-11-29 16:59:07 -08:00
Chris Rebert
7f98ad06fc Update shrinkwrap 2015-11-29 16:58:21 -08:00
Chris Rebert
de86a08377 Merge pull request #18327 from twbs/prefixing
Gruntfile: Add comments explaining CSS prefixing policy
2015-11-29 16:46:38 -08:00
Chris Rebert
9ac40cc066 Travis CI: Temporarily disable caching
So that the build will stop failing due to https://github.com/travis-ci/travis-ci/issues/5092
2015-11-29 16:27:43 -08:00
Chris Rebert
fd43ce255f Add Wall of Browser Bugs entry for #18365
See http://bugzil.la/1228802

[skip sauce]
[skip validator]
2015-11-28 20:54:15 -08:00
Chris Rebert
a23cf74340 _dropdown.scss: Revise comments; fixes #18363
[skip sauce]
2015-11-27 20:12:37 -08:00
Chris Rebert
a8dc4812a4 Add responsive float classes; fixes #13690 2015-11-26 22:13:26 -08:00
Leslie
c050d1e2e4 Update _cards.scss 2015-11-26 13:33:54 +00:00
Leslie Hoare
beb11714dd Use the new mixin. 2015-11-26 13:26:40 +00:00
Leslie Hoare
cc814f4d76 Create a mixin for creating new card styles.
I'm aware that currently cards are a lot simpler than buttons right now
but this may change in future and it feels cleaner to be able to create
new card styles without needing to know the internals of how they're
implemented.
2015-11-26 13:21:07 +00:00
XhmikosR
b4c4c0b129 Merge pull request #18351 from twbs/node_js-stable
Travis CI: Use Node.js 5 instead of "stable"
2015-11-26 08:39:16 +02:00
Chris Rebert
4bf6f0a7c7 Travis CI: Use Node.js 5 instead of "stable"
"stable" is deprecated by nvm
Refs https://github.com/twbs/grunt-bootlint/pull/61
[skip sauce]
2015-11-25 18:47:46 -08:00
Chris Rebert
48fc3d9aa7 browsers-devices.md: rm stray </p>
[skip sauce]
2015-11-24 22:37:38 -08:00
Martin Beeby
971845b763 Updating "Reporting upstream browser bugs" for IE
Adding Microsoft Edge and the rendering engine EdgeHTML.

Closes #18303
[skip sauce]
[skip validator]
2015-11-24 05:48:49 -08:00
Chris Rebert
5482e2cc96 Gruntfile: Add comments explaining CSS prefixing policy
[skip sauce]
2015-11-24 05:05:11 -08:00
Richard Kraaijenhagen
c960169807 Add responsive embed class for 1:1 aspect ratio
Closes #18141
2015-11-23 19:54:55 -08:00
XhmikosR
569f86051e Run grunt.
[ci skip]
2015-11-23 18:51:32 +02:00
XhmikosR
bc2d162fd1 Bump grunt-contrib-uglify.
[skip sauce]
2015-11-23 18:51:08 +02:00
Chris Rebert
ade2ab1341 Remove non-responsive text alignment classes
These can be replaced by their `.text-xs-*` parallels.
This also avoids any complications from interactions between the responsive and non-responsive classes.
(e.g. `<div class="text-left text-md-right">`)

Refs #18300
[skip sauce]
2015-11-22 21:33:42 -08:00
Deilv
2c3a592a6e Add missing !important-s to responsive text alignment classes; fixes #18300
Closes #18314 by merging a tweaked version of it.
2015-11-22 20:41:34 -08:00
Patrick H. Lauke
4d92e2c7ec Merge pull request #18288 from twbs/revert-18286-patch-1
Revert "Added button subsection to the component section"
2015-11-19 14:17:08 +00:00
Patrick H. Lauke
b67b52527d Revert "Added button subsection to the component section" 2015-11-19 14:16:23 +00:00
Patrick H. Lauke
76d793a1d5 Merge pull request #18286 from vanillajonathan/patch-1
Added button subsection to the component section
2015-11-19 12:10:13 +00:00
Jonathan
f99f9eb524 Added button subsection to the component section 2015-11-19 13:05:50 +01:00
Chris Rebert
c2159e0f7d Merge pull request #18285 from twbs/lint-visual-tests
Check HTML validity of JS visual tests too
2015-11-19 02:20:49 -08:00
Chris Rebert
580e2f7845 Remove stray </p> from js/tests/visual/scrollspy.html
[skip sauce]
2015-11-19 01:50:20 -08:00
Chris Rebert
7d2ee3c24c Check HTML validity of JS visual tests too
[skip sauce]
2015-11-19 01:49:16 -08:00
Chris Rebert
040f4c4a9b Merge pull request #18284 from twbs/tether-docs-fix
Docs: Separate Tether out from docs.min.js
2015-11-19 01:31:56 -08:00
Chris Rebert
9a5222ca31 Docs: Separate Tether out from docs.min.js
We can't include it in docs.min.js because docs.min.js includes application.js,
application.js depends on bootstrap.js,
and the tooltip portion of bootstrap.js depends on Tether.

So instead, we need to load Tether separately before bootstrap.js

[skip sauce]
2015-11-19 01:04:34 -08:00
XhmikosR
eea6690d0e Run grunt.
[ci skip]
2015-11-16 10:03:57 +02:00
XhmikosR
1b645ef686 Update devDependencies.
Adapt uglify for the new version.
2015-11-16 10:01:34 +02:00
Chris Rebert
ed624a805a Merge pull request #18267 from twbs/v4-dev-xmr-revert-jquery2-requirement
Revert "Make jQuery 2.0 the minimum supported version."
2015-11-16 00:00:21 -08:00
Chris Rebert
2a8b0ba1b2 Check for jQuery >= 3.
Reword jQuery version mismatch error message since jQuery v3 isn't supported.
2015-11-16 09:53:23 +02:00
XhmikosR
add3ce38f7 Revert "Make jQuery 2.0 the minimum supported version."
This partially reverts commit 9eded912a0.
2015-11-16 09:28:28 +02:00
Chris Rebert
7a2ba9a224 docs/content/reboot.md: Just to avoid any ambiguity
[ci skip]
2015-11-15 17:24:46 -08:00
Chris Rebert
60511303a1 docs/content/reboot.md: Add MDN link and a comma 2015-11-15 17:18:31 -08:00