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

9632 Commits

Author SHA1 Message Date
Heinrich Fenkart
231744d628 Expose transition durations on plugin constructors; closes #13656 2014-07-07 13:03:56 +02:00
Mark Otto
a0d8d56593 grunt 2014-07-07 00:59:51 -07:00
Mark Otto
d5e2262782 Merge pull request #14058 from twbs/btn_focus
Follow up to #13907: Add .focus styles for buttons
2014-07-07 00:59:10 -07:00
Mark Otto
9ed9eb97ee Follow up to #13907: Add .focus styles for buttons 2014-07-07 00:56:06 -07:00
Mark Otto
6f88238a6b Merge pull request #14051 from loic/issue13325
Address margins on .navbar-right to fix #13325 #13464.
2014-07-07 00:39:06 -07:00
Mark Otto
907b3b2892 Merge pull request #13907 from twbs/fat-12145
add "focus" to focused btns with button plugin
2014-07-07 00:36:59 -07:00
Chris Rebert
719cde1a11 docs HTML5 validity fixup to 8e2348e9ed 2014-07-07 00:25:55 -07:00
Chris Rebert
488778857a Merge pull request #14057 from hnrch02/patch-1
Fix small typo introduced in e2029e1
2014-07-07 00:24:13 -07:00
Heinrich Fenkart
dc22226b95 Fix small typo introduced in e2029e1 2014-07-07 09:23:12 +02:00
Chris Rebert
520b3547a4 nitpick phrasing of the docs added for #13835 2014-07-07 00:10:49 -07:00
Chris Rebert
ddffe76961 grammar fix; indicate that img[src] shouldn't actually be empty 2014-07-07 00:04:14 -07:00
Mark Otto
117ca8167a Merge branch 'master' of github.com:twbs/bootstrap 2014-07-06 23:45:36 -07:00
Mark Otto
225819ae66 Merge pull request #14029 from BBosman/touch-action
Add touch-action: manipulate to .btn
2014-07-06 23:43:43 -07:00
Loic Bistuer
e88fa90991 Address margins on .navbar-right to fix #13325 #13464.
This commit follows f9fde56.
2014-07-07 12:56:52 +07:00
fat
587c09cb48 fix scrollspy test in firefox mac os 2014-07-06 21:50:46 -07:00
Jacob
b5d86ad0bd Merge pull request #13853 from hnrch02/unit-tests-cleanup
Major unit tests cleanup
2014-07-06 21:43:48 -07:00
Mark Otto
8e2348e9ed Fixes #13746: Add docs section for brand image 2014-07-06 18:39:37 -07:00
Mark Otto
5e41a23ec5 Fixes #13835: More explicitly document mobile dropdown menu dismissing behavior 2014-07-06 16:55:35 -07:00
Mark Otto
9be2bbb5ef Fixes #14053: Don't show radio/checkbox in justified button groups 2014-07-06 16:48:41 -07:00
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
Heinrich Fenkart
58eb8b2ae3 Move to leading pluses 2014-07-06 11:56:12 +02: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
Heinrich Fenkart
dad56be96c Move to 16ms from 18ms based on the Paul Irish's rAF polyfill 2014-07-06 09:24:23 +02:00
Heinrich Fenkart
8ff099585f Mention #13500 in comment for ScrollSpy test 2014-07-06 09:24:23 +02:00
Heinrich Fenkart
e341355d28 Clean tooltip unit tests up 2014-07-06 09:24:23 +02:00
Heinrich Fenkart
b3a125e941 Clean tab unit tests up 2014-07-06 09:24:23 +02:00
Heinrich Fenkart
05ba1e491e Clean scrollspy unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
56b8d5fe6e Clean popover unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
998c3724e8 Clean modal unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
9ff66a12bc Clean dropdown unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
77d0557468 Clean collapse unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
6a523bf99d Clean carousel unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
f3345f68d7 Clean button unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
b063de54a5 Clean alert unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
95d7c9c3fb Clean affix unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
4950fe6f4e Perform a cleanup after each test 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
1e64c4c0ba Update QUnit settings/QUnit phantomjs bridge to new versions 2014-07-06 09:24:22 +02: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