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

9595 Commits

Author SHA1 Message Date
Mark Otto
44f83fff90 Merge pull request #14021 from CFXd/add_collapsed_default_class_to_navbar_collapse_button
Add collapsed default class to navbar-toggle
2014-07-06 16:37:42 -07:00
Mark Otto
b44d4ef724 grunt 2014-07-06 15:35:24 -07:00
Mark Otto
e2029e122c Fixes #13997: Move min-height for radio/checkbox to their inner label 2014-07-06 15:09:20 -07:00
Mark Otto
354d423668 grunt 2014-07-06 15:08:37 -07:00
Mark Otto
ac18e5811d jscs fix 2014-07-06 15:08:33 -07:00
fat
cb19f4f227 Merge branch 'breaddevil-replace-scrollspy-default-behavior-test' 2014-07-06 14:11:38 -07:00
fat
b19719ea1a Merge branch 'replace-scrollspy-default-behavior-test' of git://github.com/breaddevil/bootstrap into breaddevil-replace-scrollspy-default-behavior-test
Conflicts:
	js/tests/unit/scrollspy.js
2014-07-06 14:11:23 -07:00
Jacob
279c46152b Merge pull request #13815 from hnrch02/tabs-fade-not-active
Allow tabs to fade in if no initially active pane is present
2014-07-06 13:50:54 -07:00
XhmikosR
0a8845c3fd Update package.json.
* "grunt-jscs-checker" was renamed to "grunt-jscs"
* update deps
2014-07-06 14:25:56 +03:00
Chris Rebert
a34e52de4d Merge pull request #14015 from twbs/possible-14013-fix
Possible fix for #14013
2014-07-06 00:36:52 -07:00
Chris Rebert
f9ffb49932 refactor/reformat Tooltip.getPosition per @fat's feedback 2014-07-06 00:16:54 -07:00
Jacob
5830febd9a Merge pull request #13855 from hnrch02/modal-mousedown
Use mousedown instead of click for backdrop click detection; fixes #13816
2014-07-06 00:01:57 -07:00
Chris Rebert
fc29dfab1b Merge pull request #14050 from twbs/bower
Bower: only ignore /.*
2014-07-06 00:00:27 -07:00
Jacob
13a4c50cc7 Merge pull request #14000 from hnrch02/modal-keydown
Only close modal if escape was hit with keydown; fixes #13929
2014-07-05 23:55:36 -07:00
fat
c08e275000 fix build 2014-07-05 23:49:45 -07:00
Chris Rebert
7933a50ee5 Merge pull request #14034 from twbs/deprecate-modal-remote
Deprecate the `remote` option of modals?
2014-07-05 23:48:25 -07:00
Chris Rebert
7f4af4aeea remote modal docs: mention jQuery.load and other JS options as alternatives
[skip sauce]
2014-07-05 23:43:29 -07:00
fat
22f851fa62 apply #14022 without semicolon – cleans up some jquery class usage 2014-07-05 23:28:44 -07:00
Mark Otto
c1bd4fca61 only ignore /.* 2014-07-05 21:20:09 -07:00
Mark Otto
043b40636c grunt 2014-07-05 20:17:57 -07:00
Mark Otto
b4b82e815c Merge pull request #13920 from AndreiRailean/patch-1
assign background to row of .table-striped
2014-07-05 20:16:10 -07:00
Mark Otto
d55462fae8 grunt 2014-07-05 20:10:44 -07:00
Mark Otto
b5205bf848 Merge pull request #13923 from ilikeprograms/gray-base-variable
Added @gray-base variable to make @gray-{shade} reference, also allows @...
2014-07-05 20:04:47 -07:00
Mark Otto
9677c95d83 Fixes #13967: Don't reset the cite element's font-style 2014-07-05 20:02:02 -07:00
Mark Otto
f22e7d857a Fixes #13953: Remove the progress bar min-width styles for low percentages to avoid jumping progress 2014-07-05 20:01:18 -07:00
Mark Otto
0378a6be2a Fixes #13943: Lighten the navbar inverse link color more since our text contrast change in v3.2.0 2014-07-05 19:59:50 -07:00
Mark Otto
3c99de9764 grunt 2014-07-05 19:57:15 -07:00
Mark Otto
f9fde567be Merge pull request #13464 from nickcolley/#13325-navbar-right-first
Changed last-child to first-child to fix #13325
2014-07-05 18:51:47 -07:00
XhmikosR
bae2c55a52 Merge pull request #14047 from twbs/kbd
Docs: add missing example code code for `kbd` after #13351.
2014-07-05 18:38:50 +03:00
XhmikosR
97ca848e16 Docs: add missing example code code for kbd after #13351. 2014-07-05 15:51:03 +03:00
Chris Rebert
83c9510da2 Merge pull request #14037 from twbs/close-13892
Add Wall of Browser Bugs entry for #13892
2014-07-03 17:41:42 -07:00
Chris Rebert
a14f6222a6 Add Wall of Browser Bugs entry for #13892
Closes #13892.
[skip sauce]
2014-07-03 17:17:18 -07:00
Chris Rebert
24e51590b7 modal docs formatting tweak
[skip sauce]
2014-07-03 12:58:20 -07:00
Chris Rebert
8340d664ce Mark the remote option of the Modal plugin as deprecated.
Follow-up to https://github.com/twbs/bootstrap/issues/13087#issuecomment-46563760
Closes #13087 as WONTFIX.
Closes #13597 as WONTFIX.
2014-07-03 12:58:10 -07:00
Chris Rebert
456bd67da8 Merge pull request #13986 from twbs/address-13874
docs: use valid JSON in compound option value examples
2014-07-03 11:07:50 -07:00
Chris Rebert
9875ce8d63 Merge pull request #13998 from steelywing/patch-1 2014-07-03 10:52:42 -07:00
Wing
4b08832308 no need to create $.Event
`trigger()` can handle string argument
2014-07-03 10:52:22 -07:00
Wing
48b822db40 trigger 'affixed.bs.affix' instead of 'affixed'
Original is triggering `affixed` not `affixed.bs.affix`, only `.on('affixed.bs.affix', ...)` also catch `affixed` event.

Closes #13998.
2014-07-03 10:52:22 -07:00
Mark Otto
13426c18a3 Merge pull request #14030 from BBosman/double-cursor
Remove superfluous cursor:pointer
2014-07-03 09:57:36 -07:00
Bas Bosman
4975978083 Remove superfluous cursor:pointer 2014-07-03 13:17:14 +02:00
Mark Otto
23dd323da1 grunt 2014-07-03 00:57:37 -07:00
Mark Otto
3537481c97 Fixes #12738 again: use max-device-width instead of max-width for .navbar-collapse height in landscape devices 2014-07-03 00:55:32 -07:00
Mark Otto
4f8697cbbb grunt 2014-07-02 23:44:56 -07:00
Mark Otto
fcf9470a20 typo 2014-07-02 23:35:37 -07:00
Mark Otto
96b545c6b5 Fixes #13989: Don't extend the input sizes; manually chain the selectors 2014-07-02 23:14:23 -07:00
Mark Otto
fb37ec16f8 Merge branch 'master' into pr/14005 2014-07-02 22:55:01 -07:00
Mark Otto
b4958aba69 merge in and resolve conflicts 2014-07-02 22:54:56 -07:00
Mark Otto
a091c90063 fix new form validation 2014-07-02 22:12:39 -07:00
Mark Otto
d67fe0f5b9 Merge branch 'pr/14011' 2014-07-02 22:06:32 -07:00
Mark Otto
ebdecacd65 fix up examples 2014-07-02 22:06:28 -07:00