0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00
Commit Graph

398 Commits

Author SHA1 Message Date
Mark Otto
432d417ade fixes #6898: typo in modal test 2013-05-22 23:17:39 -07:00
fat
e7b4fedee8 remove 3rd arg from $.each call 2013-05-22 15:18:30 -07:00
Jacob Thornton
ccfa989898 upgrade jshint to 2.1.2 for anton <3 2013-05-21 19:31:51 -07:00
fat
140ef2320b change namespace back to dot notation and someother js shizzle 2013-05-16 20:19:51 -07:00
fat
5ab72f7687 fix tooltip defaults 2013-05-16 18:45:53 -07:00
fat
b239542a5e carousel bug with data 2013-05-16 18:21:42 -07:00
fat
f37b351288 only overlay dropdowns for mobile 2013-05-16 18:15:34 -07:00
fat
a72d0d6e3a fix tests 2013-05-16 17:44:50 -07:00
fat
19de2e8603 add bs- prefix to tooltip 2013-05-16 17:19:23 -07:00
fat
149ecd21bf straight trash wang 2013-05-16 17:18:15 -07:00
fat
92245e8bc7 change dropdown strategy to use an overlay - fixes mobile click anywhere + allows for firefox middle click 2013-05-16 12:50:06 -07:00
fat
bdbd268cb9 update collapse js style 2013-05-16 11:20:18 -07:00
fat
14651035de a bunch javascript junk 2013-05-16 11:06:30 -07:00
Stephen Edgar
1b132ddcb4 'js' folder .editorconfig code guide updates 2013-04-23 17:34:27 +10:00
Mark Otto
23d7215dbe Modify scrollspy to add .active to all parent li items /cc @fat 2013-03-29 23:32:47 -07:00
Mark Otto
a70c50d1f7 Merge branch 'master' into 3.0.0-wip
Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap-affix.js
	docs/assets/js/bootstrap-alert.js
	docs/assets/js/bootstrap-button.js
	docs/assets/js/bootstrap-carousel.js
	docs/assets/js/bootstrap-collapse.js
	docs/assets/js/bootstrap-dropdown.js
	docs/assets/js/bootstrap-modal.js
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap-scrollspy.js
	docs/assets/js/bootstrap-tab.js
	docs/assets/js/bootstrap-tooltip.js
	docs/assets/js/bootstrap-transition.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/index.html
	docs/templates/pages/index.mustache
	js/bootstrap-affix.js
	js/bootstrap-alert.js
	js/bootstrap-button.js
	js/bootstrap-carousel.js
	js/bootstrap-collapse.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tab.js
	js/bootstrap-tooltip.js
	js/bootstrap-transition.js
	js/bootstrap-typeahead.js
	less/bootstrap.less
	less/responsive.less
	package.json
2013-03-01 12:37:21 -08:00
fat
839b0c893f shiiiit 2013-02-28 21:15:33 -08:00
fat
3469339068 2.3.1 2013-02-28 20:55:14 -08:00
fat
01e0f8c653 only pass unique options through to child nodes in tooltips 2013-02-28 20:39:07 -08:00
fat
ef80765726 pass true to cycle 2013-02-28 19:47:01 -08:00
fat
40b7a909a6 le sigh 2013-02-28 19:37:30 -08:00
Mark Otto
2aa1a4dc70 Merge branch 'master' into 3.0.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-02-07 22:18:53 -08:00
fat
501aabf572 remove prevent default on focus 2013-02-07 21:42:34 -08:00
fat
366e1e0a6d only fire hidden once backdrop has been removed 2013-02-07 20:13:40 -08:00
fat
1bf070b4ce Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-02-07 19:47:01 -08:00
fat
d8a7a380bc if no callback, don't try to call callback ya goof 2013-02-07 19:45:42 -08:00
Mark Otto
a9729c5fd0 fix js from @fat feedback for modal 2013-02-07 19:38:46 -08:00
Yohn
60c9ff4364 unit tests 2013-02-06 06:20:05 -05:00
Yohn
beb60309d1 dont remove title attribute part 2 2013-02-06 06:17:48 -05:00
Mark Otto
8ca70bd83a Overhaul modal to make it responsive and not super lame 2013-02-06 02:07:40 -08:00
Mark Otto
421f9f67c4 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap.js
	docs/css.html
	docs/templates/pages/base-css.mustache
	js/bootstrap-popover.js
	less/mixins.less
	less/tooltip.less
2013-02-05 22:42:54 -08:00
fat
3b56227553 Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-02-05 22:30:54 -08:00
fat
4814281540 clean up styles 2013-02-05 22:29:59 -08:00
fat
5e4db94c24 Merge branch '2.3.0-wip' of git://github.com/ghusse/bootstrap into ghusse-2.3.0-wip 2013-02-05 22:10:41 -08:00
fat-kun
6a9cd513c0 Merge pull request #6783 from joprice/popoverOptionsOverride
reordered access of options in tooltip and popover
2013-02-05 21:48:34 -08:00
Mark Otto
1629df8008 screwed up a merge and an old version number crept in 2013-02-05 21:20:29 -08:00
fat
a4b31d39a2 don't hide if already hidden ya n00b 2013-02-05 21:08:56 -08:00
fat
a866a51a2e clear interval in cycle + rebuild 2013-02-05 20:34:39 -08:00
fat-kun
566380b257 Merge pull request #6488 from nanek/dropdowns-remove-touchstart
Remove touchstart from bootstrap-dropdown.js.
2013-02-05 20:08:42 -08:00
fat
c25e8182ba Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-05 20:01:25 -08:00
fat
45656fc7fc update jquery to 1.9 2013-02-05 20:00:50 -08:00
Joseph Price
4b86a91e53 fix typo 2013-02-04 09:10:48 -05:00
Joseph Price
1fe4ed8823 reordered access of options in tooltip and popover to allow overriding data attrs from js 2013-02-02 18:58:56 -05:00
Guillaume Smet
b7764d8a33 Fix tooltip positioning for IE8
IE8 defines a placeholder object getBoundingClientRect which breaks the new getPosition() method
2013-01-29 19:50:13 +01:00
Guillaume Gautreau
ee71fb492f No semicolumns 2013-01-27 10:56:01 +01:00
Guillaume Gautreau
5b0f956a60 Arrow replacement 2013-01-26 21:45:21 +01:00
Guillaume Gautreau
d9a0abaa06 works with fixed test 2013-01-26 21:39:49 +01:00
Guillaume Gautreau
db9ec13ce4 Test for replacing tooltip when resized 2013-01-26 21:39:05 +01:00
Guillaume Gautreau
e5be883bb9 lint + wrong comparison 2013-01-26 14:31:33 +01:00
Guillaume Gautreau
929598784f Unit test for replacing tooltip inside window 2013-01-26 14:06:58 +01:00