0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-13 01:08:58 +01:00
Commit Graph

11660 Commits

Author SHA1 Message Date
Mark Otto
39d9bc9cea Merge branch 'master' of https://github.com/twbs/bootstrap 2015-08-04 20:08:10 -07:00
Mark Otto
709a077c36 fixes #16824: Correct the match on .control-label sizing for input group sizes 2015-08-04 20:03:45 -07:00
Mark Otto
f9bee7deb6 fixes #16902: remove the .container-fluid from the grid system in modal example since it's doubling up padding 2015-08-04 19:57:49 -07:00
Mark Otto
10cc97cdd9 Merge pull request #16560 from supergibbs/multiple-button-input-groups
Multiple button input groups
2015-08-04 19:54:19 -07:00
Mark Otto
253619882f Merge pull request #16818 from zacechola/fix_16805
Move help block docs up page, add `.help-block` to validation example
2015-08-04 19:52:08 -07:00
Mark Otto
cf2d9bfe8a Help with issues like #16823 by mentioning where to download example source code 2015-08-04 19:50:50 -07:00
Chris Rebert
027b7efd79 Merge pull request #16923 from twbs/edge-11-potato
Confirmed that Edge still suffers from two IE11 bugs
2015-07-31 23:42:23 -07:00
Chris Rebert
0ea53a307b Confirmed that Edge still suffers from two IE11 bugs
[skip sauce]
2015-07-31 23:39:51 -07:00
Mark Otto
8babdf166a Merge pull request #16921 from twbs/footer
Simpler docs footer
2015-07-31 15:17:33 -07:00
Mark Otto
dd6280e1c2 Merge pull request #16922 from twbs/expo_img
Smaller local Expo screenshots
2015-07-31 15:17:13 -07:00
Mark Otto
c9c9c614a9 simpler footer with no social buttons, fewer links 2015-07-31 15:03:17 -07:00
Mark Otto
32f9b626b3 smaller, local expo screenshots 2015-07-31 14:51:31 -07:00
Chris Rebert
5c028448c1 Merge pull request #16908 from twbs/crbug-309483
Remove http://crbug.com/309483 from the Wall of Browser Bugs
2015-07-29 15:00:54 -07:00
Chris Rebert
0c4c1e4986 Remove http://crbug.com/309483 from the Wall of Browser Bugs
All current major browsers behave like Chrome here, so this bug is most likely invalid.
[skip sauce]
2015-07-29 14:54:55 -07:00
Chris Rebert
5e7c5a63b4 http://wkbug.com/143527 got imported as rdar://problem/21908735
Refs #16180
[skip sauce]
2015-07-28 17:27:21 -07:00
Chris Rebert
83e80b4301 Merge pull request #16897 from twbs/fix-16893
Customizer: Clarify that Collapse requires Component animations
2015-07-27 19:04:18 -07:00
Chris Rebert
91be365aad Customizer: Clarify that Collapse requires Component animations; fixes #16893
[skip sauce]
2015-07-27 19:00:00 -07:00
Chris Rebert
46c1abfc8f Customizer: For consistency, use singular in JS components list of Less files 2015-07-27 18:59:29 -07:00
Chris Rebert
335f486ba6 Merge pull request #16877 from Profab/for-plugin-preview
Add support for Meteor 1.2
2015-07-27 18:47:16 -07:00
Chris Rebert
76594dbb6a Merge pull request #16896 from twbs/jquery-3
Bootstrap v3 does not currently claim to be compatible with jQuery v3
2015-07-27 16:43:11 -07:00
Chris Rebert
9b1a213cf7 Bootstrap v3 does not currently claim to be compatible with jQuery v3; closes #16834
[skip sauce]
[skip validator]
2015-07-27 16:35:04 -07:00
Johann-S
ef1ce9ac0b Fix triggering of {shown,hidden}.bs.dropdown events so relatedTarget gets set properly
Fixes #16828
Closes #16865
2015-07-27 00:58:51 -07:00
XhmikosR
9433924732 Merge pull request #16888 from twbs/jquery-local-fallback
Add a local jQuery fallback.
2015-07-26 11:02:35 +03:00
XhmikosR
abdf41f5f3 Add a local jQuery fallback.
Shouldn't really happen, but China for example has blocked Google so this should help.
2015-07-26 10:07:33 +03:00
XhmikosR
b8bc20432f Merge pull request #16887 from twbs/deps
Update devDependencies.
2015-07-26 10:05:44 +03:00
XhmikosR
941806b1dc Update README.md.
[ci skip]
2015-07-26 00:29:29 +03:00
XhmikosR
f4a44208f4 Run grunt. 2015-07-26 00:16:58 +03:00
XhmikosR
a2e120bc04 Update devDependencies. 2015-07-26 00:11:54 +03:00
Chris Rebert
5aa56fefc0 Merge pull request #16881 from twbs/safari-position-fixed-child-bug
Add Wall of Browser Bugs entry for #16814
2015-07-24 18:24:43 -07:00
Chris Rebert
d24559df20 Add Wall of Browser Bugs entry for #16814
Closes #16814
Refs http://wkbug.com/147284
Refs http://openradar.appspot.com/21993128
[skip sauce]
2015-07-24 18:07:32 -07:00
Richard Lai
88ccbf3f93 Add support for Meteor 1.2 2015-07-24 13:14:35 +00:00
Chris Rebert
d8cae018f4 Merge pull request #16842 from twbs/wk-fixed-144990
Remove #16473's entry from Wall of Browser Bugs
2015-07-17 23:18:56 -07:00
Chris Rebert
96b5b14103 http://wkbug.com/144990 no longer repros; rm it from Wall of Browser Bugs
Refs #15998
Effectively reverts #16473
[skip sauce]
2015-07-17 23:12:35 -07:00
Chris Rebert
d99ff61950 Merge pull request #16841 from twbs/wk-fixed-139803
Remove #15407's entry from Wall of Browser Bugs
2015-07-17 22:57:35 -07:00
Chris Rebert
2c2a335668 http://wkbug.com/139803 has been fixed; rm it from Wall of Browser Bugs
Refs #15205, #15407
[skip sauce]
2015-07-17 22:51:43 -07:00
Chris Rebert
ac470b4415 Merge pull request #16840 from twbs/wk-fixed-15832
Remove WebKit entry for #15846 from Wall of Browser Bugs
2015-07-17 22:42:43 -07:00
Chris Rebert
4da8f12d53 http://wkbug.com/141804 has been fixed; rm it from Wall of Browser Bugs
Refs #15846, #15832
[skip sauce]
2015-07-17 22:39:14 -07:00
Chris Rebert
3b2708b72d Merge pull request #16839 from twbs/update-16813
Remove #16813's entry from the Wall of Browser Bugs
2015-07-17 21:28:13 -07:00
Chris Rebert
ac6477f988 http://wkbug.com/146896 has been fixed; rm it from the Wall of Browser Bugs
Refs #16813, #16809
[skip sauce]
2015-07-17 21:23:08 -07:00
Mark Otto
63f5da62bf remove all instances of .bs-docs-grid in grid docs since it's unused. nullifies #16838 2015-07-17 16:21:48 -07:00
Zac Echola
185dd0d824 Move help block docs up page, add .help-block to validation example 2015-07-13 13:17:02 -05:00
Chris Rebert
66543ed112 Merge pull request #16813 from twbs/safari-range-input-clipped
Add Wall of Browser Bugs entry for #16809
2015-07-12 19:53:04 -07:00
Chris Rebert
4f83f3f5a2 Add Wall of Browser Bugs entry for #16809
[skip sauce]
2015-07-12 19:49:01 -07:00
Patrick H. Lauke
448981fcdb Merge pull request #16793 from patrickhlauke/docs-input-addon-label
Add example with visible <label> and input group addon
2015-07-12 10:18:46 +01:00
Edwin Lin
8491962021 Show active buttons when form disabled 2015-07-10 21:10:19 -07:00
Patrick H. Lauke
38c715316b Add example with visible <label> and input group addon
Also, include visible <label> as a suggestion in the accessibility
callout.
2015-07-09 10:55:21 +01:00
Jan Vonka
b5c5589a66 Debug .container and .container-fluid 2015-07-08 17:20:02 +02:00
Richard Lindner
ba0ea92623 fixes https://github.com/twbs/bootstrap/issues/16779 2015-07-07 22:50:09 +02:00
adammacias
cb7f569262 Add Brazilian Portuguese to list of docs translations
Closes #16773 by merging a tweaked version of it.
[skip sauce]
2015-07-06 21:43:37 -07:00
Chris Rebert
0db18386a2 Merge pull request #16745 from twbs/changelog-ptr
Add changelog file that points to GitHub Releases & our blog
2015-07-04 14:41:02 -07:00