0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-11 03:52:27 +01:00

460 Commits

Author SHA1 Message Date
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
Guillaume Gautreau
6803ff70f9 Tooltip positionning on special cases 2013-01-26 13:50:26 +01:00
Mark Otto
7d8d5c7838 Merge branch '2.3.0-wip' 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/components.html
	docs/css.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/extend.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/index.mustache
	docs/templates/pages/javascript.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/buttons.less
	less/forms.less
	less/navbar.less
	less/popovers.less
	less/responsive-767px-max.less
	less/responsive.less
	less/tables.less
	less/tooltip.less
	less/type.less
	less/variables.less
	package.json
2013-01-13 04:26:52 -08:00
Mark Otto
6e5a2fedaa Nuke .popover-inner from the JS since we nuked it from the CSS/HTML long ago 2013-01-10 18:51:04 -08:00
Kenan Shifflett
b5ad50686c Removed touchstart from bootstrap-dropdown.js. 2013-01-07 20:13:28 -05:00
Mark Otto
9749d6afc2 Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2012-12-26 09:21:34 -06:00
fat-kun
b9c7f29134 Merge pull request #6378 from Yohn/patch-7
fixes tooltip insert problems
2012-12-24 16:17:25 -08:00
Yohn
9835549faf made container option be false 2012-12-24 18:59:37 -05:00
Yohn
e867ae7b60 removed the length check
updated it to @fat's suggestion
2012-12-24 18:07:41 -05:00
Yohn
b6960d8cf9 Update js/tests/unit/bootstrap-tooltip.js 2012-12-23 04:21:02 -05:00
Yohn
d594d6377a adding container option to tooltips 2012-12-23 04:18:16 -05:00
KAWACHI Takashi
defe85bb51 Assign event variables at declarations 2012-12-23 15:17:41 +09:00
KAWACHI Takashi
7a3a88acc6 Tooltips fires show, shown, hide, hidden events
It is re-worked from #3691.
2012-12-23 14:42:13 +09:00
Mark Otto
f74990d898 Version bump 2012-12-22 16:10:06 -08:00
fat-kun
d09b46fe37 Merge pull request #6349 from Yohn/patch-6
Fixes #5753 with tooltip('toogle')
2012-12-22 14:53:24 -08:00
fat
effba9e55c add data-api namespace to dropdown 2012-12-22 14:22:45 -08:00
fat
2c0ed072b0 shifting focus to parent and adding aria menuitem for dropdown 2012-12-22 13:57:57 -08:00
fat
a9e661a2b5 read data options in constructor for collapse 2012-12-22 13:48:16 -08:00
fat
fad0fb683b allow multiple trigger types in tooltip and popover + default tooltip to hover & focus 2012-12-22 13:24:37 -08:00
fat
e2434fefbd chnage for #6248 2012-12-21 20:27:53 -08:00
fat
24a36df9f6 add support for [data-slide-to] attr on carousel 2012-12-21 19:45:19 -08:00
fat
82a758344d add direction prop to carousel slide event 2012-12-21 17:31:54 -08:00
fat
5da30ee5fb Merge branch 'marcelkorpel-master' into 2.3.0-wip 2012-12-21 17:24:45 -08:00
fat
d5345f806c Merge branch 'master' of git://github.com/marcelkorpel/bootstrap into marcelkorpel-master 2012-12-21 17:19:36 -08:00
Mark Otto
a5e04c0799 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	docs/templates/pages/base-css.mustache
	less/dropdowns.less
	less/forms.less
2012-12-20 13:47:36 -08:00
Yohn
a6705246d0 Update js/tests/unit/bootstrap-tooltip.js 2012-12-20 04:36:57 -05:00
Yohn
e21b6459ad fixes tooltip('toggle') 2012-12-20 04:34:28 -05:00
fat
5abe33f5d8 reset carousel in the case that it is reinstantiated twice 2012-12-20 01:13:03 -08:00
fat
2c9f43f685 if carousel element already open, don't reopen it duh bruh bruh 2012-12-20 01:05:07 -08:00
Mark Otto
72f13e2870 Merge branch '2.2.3' 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/base-css.mustache
	docs/templates/pages/index.mustache
	docs/templates/pages/javascript.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
	less/type.less
	package.json
2012-12-20 00:02:52 -08:00
fat
7f9ff0ba5b add js support for carousel indicators 2012-12-19 23:25:25 -08:00
fat
96e5fa6143 whitespace in tooltip + don't pass empty selector to $() in dropdown.js 2012-12-19 22:26:36 -08:00
fat
219d275ae6 can't extend bounding box thingy 2012-12-19 22:03:57 -08:00
fat
dc4e80a655 fix ghetto ass timeout shit 2012-12-19 21:55:23 -08:00
fat
5bd8cdca91 remove inside support from tooltip + fix tooltip svg support + change makefile to rely on local npm install 2012-12-19 21:36:50 -08:00
Mark Otto
529ecc5a77 Version bump 2012-12-10 18:31:04 -08:00
Mark Otto
bc0b94a3fd Merge branch 'master' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/css.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/javascript.mustache
	less/breadcrumbs.less
	less/tables.less
	less/tests/css-tests.html
2012-12-08 17:40:42 -08:00
fat
820a3b27b6 get tests passing for typeahead :P 2012-12-07 19:16:48 -05:00
fat
1747caf19d insert menu of typeahead after input which it suggests on #3529
note: this will likely break things for people in the same way that doing
this to tooltip did… however we think this is a better insertion model for
z-index,scrolling,modal,etc. applications
2012-12-07 18:59:13 -05:00