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

636 Commits

Author SHA1 Message Date
Mark Otto
a365d8689c grunt 2014-02-13 09:24:59 -08:00
Mark Otto
385fb68981 grunt 2014-02-13 08:59:03 -08:00
Mark Otto
88fdd45427 v3.1.1 bump 2014-02-13 01:12:26 -08:00
Zlatan Vasović
fe2222e733 Fix multistr errors in customizer.js 2014-02-12 20:54:43 +01:00
Chris Rebert
40142bdc51 fix #12708 by updating class names in the docs JS 2014-02-12 11:02:56 -08:00
XhmikosR
5796b56d96 Switch to the minified JSZip. 2014-02-12 20:50:47 +02:00
Mark Otto
eb20d6f132 Fixes #11659, #12698, and #12349: Always apply position and z-index form controls in input groups for proper borders 2014-02-11 14:20:01 -08:00
Mark Otto
8551f42ae2 Merge branch 'master' into pr/12412
Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	test-infra/npm-shrinkwrap.canonical.json
2014-02-11 09:50:40 -08:00
Mark Otto
38ebf57af5 grunt 2014-02-10 21:41:14 -08:00
Mark Otto
784a95d945 Documents #10140 2014-02-10 21:34:05 -08:00
Mark Otto
728067b586 Update Glyphicons 2014-02-10 21:28:05 -08:00
Mark Otto
3350c73666 http://www.youtube.com/watch?v=YQwYNca4iog 2014-02-10 20:52:20 -08:00
Mark Otto
b36d19c3c6 grunt 2014-02-08 16:46:12 -08:00
Mark Otto
7f88009394 grunt 2014-02-08 16:43:58 -08:00
Mark Otto
3fc7a4cffa grunt with new mixins 2014-02-08 16:31:42 -08:00
Mark Otto
26e2d7cdc9 grunt 2014-02-08 16:13:30 -08:00
Mark Otto
866c52b928 grunt 2014-02-08 15:51:38 -08:00
XhmikosR
5d8491ac9f Merge pull request #12655 from twbs/holder.js
Update holder.js to v2.3.1.
2014-02-09 01:48:13 +02:00
Mark Otto
06e6affa4a Merge pull request #12645 from ZDroid/docs-js-semicolons
Omit semicolons consistently in docs
2014-02-08 15:46:51 -08:00
Mark Otto
b683433f67 grunt 2014-02-08 15:44:13 -08:00
XhmikosR
c3cb63b69f Update holder.js to v2.3.1.
Fix #12653.
2014-02-08 18:19:39 +02:00
Zlatan Vasović
bdf9ce4c45 Omit semicolons consistently in docs 2014-02-07 19:31:08 +01:00
Zlatan Vasović
aead10fafa Avoid setting jshint node: true in every Grunt JS file 2014-02-07 13:34:17 +01:00
Mark Otto
3ccc16cad0 grunt for days 2014-02-07 02:24:37 -08:00
Mark Otto
228d4e59fc Fixes #12555: Rearrange variables to place grids and containers closer 2014-02-07 01:22:30 -08:00
XhmikosR
aae64a9eba Update jzip to v2.1.0. 2014-02-06 23:10:37 +02:00
XhmikosR
ec050fa0ab Update less.js to v1.6.2. 2014-02-04 11:11:40 +02:00
XhmikosR
2576fecf95 Update jszip to the latest git (202003821d). 2014-02-04 11:08:12 +02:00
XhmikosR
389e574aaa Update Filesaver.js to the latest git (2014-01-24). 2014-02-04 11:08:12 +02:00
Mark Otto
ec6c9d2824 Don't offset customizer alert, grunt dist 2014-02-04 00:18:34 -08:00
Mark Otto
58bf3f9432 grunt after last commits 2014-01-31 13:40:32 -08:00
XhmikosR
7b9c0a38a7 Downgrade holder.js to v2.2.0.
Fixes #12440.
2014-01-31 09:32:55 +02:00
Mark Otto
1409cde7e8 Bump versions, run grunt 2014-01-30 08:30:37 -08:00
Mark Otto
9a6b7ab375 grunt 2014-01-30 08:14:18 -08:00
Mark Otto
d4b1bfd667 grunt 2014-01-29 22:44:06 -08:00
Mark Otto
6a0a139cda Upgrade to Normalize v3-rc1 in prep for v3 final 2014-01-27 12:08:55 -08:00
Mark Otto
08e83a62b7 Fix #11655: Fix broken disabled states for iOS form controls and buttons 2014-01-22 21:43:08 -06:00
Mark Otto
f4dd6221d4 Merge branch 'responsive-embed' of https://github.com/boulox/bootstrap into boulox-responsive-embed
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
2014-01-13 20:01:54 -08:00
Chris Rebert
b9216a292c update to Holder.js 5b79144fa 2014-01-13 17:50:17 -08:00
Chris Rebert
80bed836e0 grunt dist build-customizer 2014-01-12 14:53:21 -08:00
XhmikosR
f972331a10 update to FileSaver.js version 2013-12-27 / 0055d054ac
Refs #12196
2014-01-12 14:47:54 -08:00
Chris Rebert
4b5e73b842 add Blob.js separate from filesaver.js
Blob.js version 2013-12-27 / 0055d054acbca43eff44fc25c891055440685d9c
Refs #12196
2014-01-12 14:41:30 -08:00
XhmikosR
ef22ab5aed update less.js to v1.6.1 & use accurate filename; refs #12196 2014-01-12 14:32:58 -08:00
XhmikosR
77ff3871fd update holder.js to v2.3; refs #12196 2014-01-12 14:23:41 -08:00
Mark Otto
1127cd6287 grunt dist 2014-01-11 14:48:47 -08:00
Mark Otto
e68d3b961e Merge branch 'minify-assets' of https://github.com/XhmikosR/bootstrap into XhmikosR-minify-assets
Conflicts:
	package.json
2014-01-11 14:48:04 -08:00
Chris Rebert
8a10bd5231 grunt build-customizer 2014-01-08 18:39:45 -08:00
XhmikosR
d7bf9372ec Remove extra newline from banner. 2014-01-08 13:41:17 +02:00
XhmikosR
016d573a80 Use the docs banner for all the docs generated files. 2014-01-08 13:41:17 +02:00
XhmikosR
ebf7807985 docs-assets: concatenate and minify all javascript files. 2014-01-08 13:41:16 +02:00
Chris Rebert
c891be5e5f adjust filename to indicate that customize JS is minified 2014-01-07 19:10:31 -08:00
Chris Rebert
ef7bf0abf8 grunt dist build-customizer 2014-01-07 19:05:29 -08:00
Chris Rebert
c635d8f547 have customizer output Bootstrap Theme too; fixes #12003 2014-01-07 18:57:15 -08:00
Chris Rebert
07309edce5 make customizer compilation code more generic 2014-01-07 18:55:13 -08:00
Julian Thilo
7fcfe61f4d Update copyright notices in all places
- Implements new format "Copyright 2011-xxxx Twitter, Inc.", which resonates well with our History page and more accurately reflects the copyright status of the repo
- grunt dist to update all the files
2014-01-07 01:05:24 +01:00
Gregory HOULLIER
a53cf55be2 Replace getElementsByTag by querySelector for IE10 Mobile plateform. 2014-01-05 20:15:48 +01:00
Zlatan Vasović
1c83d68ca4 New Year 2014-01-01 15:37:08 +01:00
Mark Otto
50cf0b1a9d Update Gruntfile.js to copy 'dist/' files to 'docs/dist/' with 'grunt dist' task; Fixes #12030: navbar toggle focus state 2013-12-31 18:23:10 -08:00
Mark Otto
0df96d8c32 Merge branch 'master' into docs_dir 2013-12-31 10:38:31 -08:00
Mark Otto
a9c829bc0c Rearrange repository contents because muahahahahahaha 2013-12-28 22:47:03 -08:00
Chris Rebert
336f5f1dce rename raw-files.js to raw-files.min.js
it's not /technically/ minified, but close enough
it's autogenerated, not terribly human-readable, and not meant to be directly modified
2014-01-19 22:29:51 -08:00
Chris Rebert
06a7bdd0b0 grunt build-raw-files dist 2014-01-19 22:27:01 -08:00
Chris Rebert
b67cba2b4d make WP8 device-width hack code fully consistent between docs HTML & docs JS 2014-01-18 18:35:47 -08:00
XhmikosR
4bca3c79b3 Move docs third-party libraries to a separate folder. 2014-01-18 08:15:21 +02:00
Mark Otto
d07e8fece4 grunt 2014-01-16 15:03:34 -08:00
fat
3b2418e688 remove flaky pos bottom test which is effect by unit scroll pos 2014-01-16 13:44:08 -08:00
Mark Otto
a633fc042d Merge branch 'master' into docs_derp
Conflicts:
	docs/components.html
	docs/css.html
2014-01-15 13:08:35 -08:00
Chris Rebert
5ead87d519 revert unnecessary customizations of Blob.js & FileSaver.js
Per https://github.com/eligrey/Blob.js/pull/20
& https://github.com/eligrey/FileSaver.js/pull/63
The library author has deemed the existing /*! @source URL */ comments to be
sufficient attribution, and these already survive minification.

Refs ea591748ed
2014-01-14 20:46:25 -08:00
Mark Otto
cae63200d8 Merge branch 'master' into docs_derp
Conflicts:
	docs/_includes/old-bs-docs.html
2014-01-14 15:53:06 -08:00
Chris Rebert
46b0874ef5 add copyright notice to raw-files.js 2014-01-14 13:27:50 -08:00
Zlatan Vasović
c335104957 Rename uglify.js to uglify.min.js for consistency 2014-01-14 13:41:21 +01:00
Mark Otto
eca81939cc Merge branch 'master' into docs_derp
Conflicts:
	docs/assets/css/pack.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
2014-01-13 22:43:18 -08:00
Chris Rebert
ea591748ed sort out attribution banners of docs assets; fixes #11976 2014-01-13 21:58:27 -08:00
Chris Rebert
2d038186e3 add a title/description to customizer.js's attribution comment 2014-01-13 21:08:04 -08:00
Mark Otto
b17dca240e Merge branch 'master' into docs_derp
Conflicts:
	docs/assets/js/docs.min.js
2014-01-12 16:10:57 -08:00
Mark Otto
79c18da452 homepage improvements 2014-01-11 19:35:40 -08:00
Mark Otto
bacfd65cb2 Merge branch 'master' into docs_derp
Conflicts:
	docs/getting-started.html
2014-01-11 19:13:10 -08:00
Mark Otto
ea20f44815 Merge branch 'master' into docs_derp
Conflicts:
	docs/assets/css/docs.css
2014-01-09 20:33:55 -08:00
Mark Otto
04161a8c75 more derp 2014-01-09 18:05:04 -08:00
Mark Otto
ed5c7baaf1 Merge branch 'master' into docs_derp 2014-01-05 17:49:40 -08:00
Mark Otto
70459c1454 Merge branch 'master' into docs_derp
Conflicts:
	docs/_includes/footer.html
	docs/assets/css/docs.css
2014-01-01 12:27:09 -08:00
Mark Otto
b253cb2c1e Merge branch 'master' into docs_derp
Conflicts:
	_config.yml
	docs/_includes/footer.html
	docs/_includes/nav-main.html
	docs/_includes/old-bs-docs.html
	docs/_layouts/default.html
	docs/_layouts/home.html
	docs/getting-started.html
	docs/index.html
2013-12-31 13:53:33 -08:00
Mark Otto
a8005b3d0b flatten docs dir back into root 2013-07-18 17:41:30 -07:00
fat
4b40ee692d cleaner way of preventing double click events + clean up tests for jshint 2013-07-18 01:07:11 -07:00
fat
37e899d766 get button js working with actual form elements p cooll 2013-07-18 00:59:31 -07:00
fat
8cf04911db fixes #7776 2013-07-17 23:25:26 -07:00
fat
18d23b892c rebuild js + fixes #7583 2013-07-17 21:35:28 -07:00
fat
2cccc0889f make sure triggering element is visible before focusing #7521 2013-07-17 21:30:38 -07:00
fat
102df4ff33 Merge branch '3.0.0-wip' of git://github.com/muan/bootstrap into muan-3.0.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-07-17 21:14:02 -07:00
fat
eb3333a612 fix #7000 2013-07-17 21:08:50 -07:00
fat
392bf0c9c9 fixes #6691 2013-07-17 20:29:41 -07:00
fat
f97dd5af49 rebuild doe 2013-07-17 19:33:21 -07:00
Mark Otto
817972724a Remove further mentions of Glyphicons 2013-07-05 14:11:12 -05:00
Mu-An Chiou
55fa1acbd6 Tooltip: apply position class before positioning 2013-06-28 11:05:38 +01:00
Mark Otto
1a09eada35 Run make on JS 2013-06-28 00:08:19 -07:00
Mark Otto
6a2858f7bf make on js i guess? /cc @fat 2013-06-27 19:36:35 -07:00
Mark Otto
2aec6dae59 Fixes #7730: Better hiding of empty titles in popovers
If the popover's title contains no text, hide it via JS. Previously was
done via CSS's `:empty` property, but that doesn't work in IE8, so JS
it is.

/cc @fat becaue I probably did this wrong <3
2013-06-20 16:02:05 -07:00
Mark Otto
65ad52060e Offcanvas example update
* Remove plugin file and put JS inline
* Update grid layout to use tablet columns
* Switch from LESS to CSS for transition
* Pad footer sides for better mobile rendering
* Spacing cleanup
2013-06-19 20:31:03 -07:00
Mark Otto
b0bece66f2 Merge branch 'offcanvas-example' of https://github.com/trumbitta/bootstrap into trumbitta-offcanvas-example 2013-06-19 19:13:38 -07:00
Ivan Malopinsky
c1655e6cbd upgrade holder to 2.0, update thumbnail examples in docs to fit inside containers 2013-06-16 23:16:56 -04:00
Mark Otto
949c7cca00 Merge pull request #8156 from baer/toggle-button-fix
Docs Customize toggle button used incorrect selectors
2013-06-12 16:59:40 -07:00
Mark Otto
47f8ba98f3 Merge pull request #8158 from baer/download-button-fix-proper
Docs "Customize and Download" button didn't send the correct parameters
2013-06-12 16:59:22 -07:00
Eric Baer
6771be1ced Docs Customize "Customize and Download" button not working properly 2013-06-12 14:01:59 -06:00
Eric Baer
7f8703ef86 Docs Customize toggle button used incorrect selectors 2013-06-12 12:51:10 -06:00
Mark Otto
9fac2c0467 Update docs JS to prevent clicks on links with hash hrefs 2013-06-09 23:45:14 -07:00
Mark Otto
9ba11ba60a No more need for grid column highlighting, so nuke that 2013-06-09 23:44:14 -07:00
Robert Burns
cc684750e5 Fix for carousel indicators 2013-06-01 08:15:40 -04:00
fat
f5ce66177b fix event binding in modal.js 2013-05-29 11:24:00 -04:00
fat
a7a87c8e8c rebuild 2013-05-27 12:48:16 -07:00
fat
9257bdc097 fixes #7163 2013-05-27 12:45:13 -07:00
Jacob Thornton
e424b3879c fixes #4781 2013-05-24 23:53:44 -07:00
Jacob Thornton
f3e45c3778 add show/shown hide/hidden events to dropdown + update dropdown links for testing + catch a few missed namespace things 2013-05-24 23:15:04 -07:00
Mark Otto
3160bd872e rearrange customizer content 2013-05-23 21:34:32 -07:00
Mark Otto
acc0875259 fix up customizer js and classes; turn buttons into real buttons 2013-05-22 23:34:28 -07:00
fat
e7b4fedee8 remove 3rd arg from $.each call 2013-05-22 15:18:30 -07:00
Jacob Thornton
7cbec6e89a remove jszip files 2013-05-21 19:33:57 -07:00
Jacob Thornton
ccfa989898 upgrade jshint to 2.1.2 for anton <3 2013-05-21 19:31:51 -07:00
Mark Otto
c0f5a0775d Run make on latest JS 2013-05-16 20:54:06 -07:00
Mark Otto
55a1416789 remove prettyprint js mention 2013-05-16 20:07:48 -07:00
fat
5ab72f7687 fix tooltip defaults 2013-05-16 18:45:53 -07:00
fat
c072b6b2fc remove dumb assets update makefile wassup 2013-05-16 18:34:51 -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
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
a4c16155a2 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	Makefile
	docs/_site/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.min.js
	docs/customize.html
	docs/docs.html
2013-05-16 11:08:46 -07:00
fat
14651035de a bunch javascript junk 2013-05-16 11:06:30 -07:00
Mark Otto
3c3e56ca50 .bs-docs-top to .bs-top 2013-05-08 22:52:48 -07:00
Mark Otto
d7acf4e82d more work on the sidenav, including small css refactor and new classes 2013-05-08 22:42:42 -07:00
Mark Otto
edb733ebc7 Super massive docs overhaul
* Bring back the navbar up top
* Pull the docs content back into separate pages because a 6.6k line docs file is just crazy
* Recenter the page content and bring back affixed side nav (needs work)
2013-05-08 21:56:08 -07:00
Mark Otto
88dd9de9ba Drop typeahead.js--instead try Twitter's typeahead plugin 2013-05-08 20:04:54 -07:00
William Ghelfi
9013ff002a add offcanvas layout example based on bradfrost/this-is-responsive 2013-05-08 14:25:37 +02:00
Mark Otto
57ba494409 running make 2013-04-26 10:44:44 -07:00
Stephen Edgar
1a6dbc371e 'docs' folder .editorconfig code guide updates 2013-04-23 17:40:41 +10:00
Mark Otto
40f671a531 add basic back to top link via affix 2013-03-30 18:41:26 -07: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
081c061281 new subnav on all pages 2013-03-28 00:21:21 -07:00
Mark Otto
fe414d8566 turn docs navbar into left navbar 2013-03-27 23:33:45 -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
cec434a4c3 rebuild 2013-02-28 20:48:48 -08:00
fat
2f27d9851c whitespace 2013-02-28 20:48:02 -08:00
fat
01e0f8c653 only pass unique options through to child nodes in tooltips 2013-02-28 20:39:07 -08:00
fat
cf998040ec rebuild 2013-02-28 19:49:08 -08:00
fat
40b7a909a6 le sigh 2013-02-28 19:37:30 -08:00
Mark Otto
4cbb663d9d Update some links and rename #gridsystem to #grid-system 2013-02-17 18:10:29 -08:00
Mark Otto
6d048471c4 Re-add carousel captions as optional
* They're hidden by default in the mobile-first views because otherwise they just cover up the slides
* In mobile they're centered, and then are shown left aligned at larger viewports
2013-02-16 02:47:15 -08:00
Mark Otto
979ca4ea7a Convert JS page to pygments; nuke prettify assets 2013-02-14 22:33:26 -08:00
Mark Otto
e45f12ad42 rearrange jekyll and docs 2013-02-12 12:44:41 -08:00
Mark Otto
8b9733b288 nuke what we don't need for jekyll 2013-02-12 12:25:05 -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
Mark Otto
e3f3542d0b Fixes #6823: add some docs notes about tooltips in input groups 2013-02-06 17:25:58 -08: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
Mark Otto
0fe9148b91 Fixes #6190: Add print utility classes 2013-02-05 22:17:28 -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
45656fc7fc update jquery to 1.9 2013-02-05 20:00:50 -08:00
Mark Otto
5638b2559a Verion number in JS makefile 2013-02-02 18:50:13 -08:00
Mark Otto
83e5c01856 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/css/docs.css
	docs/assets/js/application.js
	docs/components.html
	docs/templates/pages/components.mustache
	less/sprites.less
2013-01-31 17:57:31 -08:00
Mark Otto
3cc65cb86c clear up show-grid stuff 2013-01-30 18:16:14 -08:00
Mark Otto
d9b35c2602 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/css.html
	docs/customize.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/layout.mustache
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	less/navbar.less
2013-01-17 20:23:33 -08:00
Mark Otto
5c76518f7d Add respond.js to main docs pages, but only for IE8 and down 2013-01-17 14:00:03 -08:00
Mark Otto
b6b8633542 twerk docs code examples 2013-01-16 12:02:45 -08:00
Mark Otto
267690eb1b docs changes, more type improvements, add grid system basics back 2013-01-15 14:30:00 -08:00
Mark Otto
f9ee99cf6f Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing 2013-01-14 00:11:55 -08: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
4b34f4947a Update Holder.js 1.6 to 1.9 2013-01-12 19:49:15 -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
Mark Otto
330b143b40 Add longer tooltip example to docs, tighten up line-height on tooltip; run make 2012-12-26 09:36:07 -06: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
Yohn
da0217405f data-toggle instead of rel for tooltip and popover 2012-12-23 06:51:46 -05:00
Mark Otto
f74990d898 Version bump 2012-12-22 16:10:06 -08:00
fat
2c0ed072b0 shifting focus to parent and adding aria menuitem for dropdown 2012-12-22 13:57:57 -08:00
fat
4d195222d4 remake js 2012-12-22 13:48:28 -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
818c56f078 rewrite makefile to make a bit more "efficient" + rebuild 2012-12-21 17:42:24 -08:00
fat
e194c3e4f4 rebuild 2012-12-21 17:25:31 -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
Mark Otto
b6575cc72e fix up code snippet 2012-12-20 13:41:08 -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
bbe4625672 lol we dont' have affix(refresh) 2012-12-19 23:39:26 -08:00
fat
7f9ff0ba5b add js support for carousel indicators 2012-12-19 23:25:25 -08:00
fat
e9eff0cbff wait 100ms before engaging affix (allows for initial browser scroll) 2012-12-19 22:37:41 -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
7c456c8554 fix tooltip doc dumbness 2012-12-19 22:05:33 -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
Mark Otto
cacc213762 Nesting tables
* Add simple test to css-tests.html
* Scope .table-bordered to immediate children th/td elements only
2012-12-08 12:52:19 -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
fat
437654030a focus on escape in typeahead 2012-12-07 18:37:32 -05:00
fat
91fbadad5b remove slide from carousel constructor #5579 2012-12-07 17:49:05 -05:00
fat
66b70016d0 rebuild and only select visible dropdown items 2012-12-07 17:14:49 -05:00
fat
a7eb9c294a add noConflict functionality to all bootstrap plugins 2012-12-07 17:06:01 -05:00
Mark Otto
33e14fe5bf Merge branch '2.2.2-wip' into 3.0.0-wip
Conflicts:
	README.md
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/examples/fluid.html
	docs/scaffolding.html
	less/breadcrumbs.less
	less/popovers.less
	less/responsive.less
2012-12-05 11:05:10 -08:00
Mark Otto
b3019d7aab add gallery page, fill with a few screenshots to start 2012-12-04 20:30:21 -08:00
Mark Otto
ed74992853 Fixes #4550: Temporary fix for dropdown taps on mobile
* Fix as documented here: https://github.com/twitter/bootstrap/issues/4756#issuecomment-9952781
* Stops propagation for touchstart for dropdowns
2012-12-04 18:36:18 -08:00
Andreas Cederström
68cbba347b Fixing header color for success, error and info alerts 2012-12-03 14:20:14 +01:00
Mark Otto
32d425967a run make on js changes to popover 2012-12-02 01:32:23 -08:00
Mark Otto
dd11d0a3fa move around social buttons 2012-12-01 13:47:07 -08:00
Mark Otto
98b0d475ae version bump to 3.0 2012-11-30 22:30:50 -08:00
Mark Otto
38c546c785 upgrade to holder 1.6 2012-11-29 21:35:45 -08:00
Mark Otto
acc037de15 add holder and replace placehold.it 2012-11-29 20:59:14 -08:00
Mark Otto
05655ff4ff fixes #5922: clicking only button should download custom build 2012-11-15 09:14:54 -08:00
Mark Otto
79b7017227 version bump 2012-11-05 09:32:48 -08:00
Bradly Feeley
46b5e0cbc6 Fixing various spelling typos in the docs. 2012-11-02 16:34:21 -06:00
fat
3b3dd3ac3c 2.2.1 - hotfix for carousel 2012-10-30 21:59:56 -07:00
fat
404e4d9e9a fix carousel and rebuild js 2012-10-30 21:32:15 -07:00
Mark Otto
41ad16fe40 v2.2.0 instead of v2.1.2 2012-10-29 21:00:53 -07:00
Jacob Thornton
ba2a99e7c4 don't lookup typeahead when shift alt or ctrl are pushed 2012-10-17 23:39:41 -07:00
Jacob Thornton
45046544a6 when static, refocus on click 2012-10-17 23:36:22 -07:00
Jacob Thornton
0b9d4e78ad Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-10-17 23:06:58 -07:00
Jacob Thornton
7f3b94c453 Merge branch 'delegate-api-to-document' of git://github.com/badcarl/bootstrap into badcarl-delegate-api-to-document
Conflicts:
	js/bootstrap-carousel.js
2012-10-17 23:05:16 -07:00
billy gates
d6ac499ca8 Merge pull request #5309 from erlendfh/dropdown-bugfix
Fixed bug in dropdown toggle where menu would only clear on the first dropdown
2012-10-17 23:00:41 -07:00
Jacob Thornton
280d4aeb30 rebuild 2012-10-17 22:51:39 -07:00
Jacob Thornton
edc3eee5ea fix carousel event 2012-10-17 22:26:44 -07:00
mfansler
e24b46b7f3 fixes #5336: reorder focus() call to avoid scrolling 2012-10-16 12:27:43 -04:00
Erlend Halvorsen
e9a648cd39 Fixed bug in dropdown toggle where menu would only clear on the first drop down 2012-09-27 10:31:40 +02:00
Jacob Thornton
0540b63ab0 check affix pos on clicks - use timeout for clicks which scroll 2012-09-24 23:59:02 -07:00
Jacob Thornton
88b1e44dd6 change tooltip/popover insert strategy
remove modal-open class
hopefully resolve z-index headaches
2012-09-24 23:28:38 -07:00
Jacob Thornton
003fcccceb change tooltip/popover html default to false for xss safety net 2012-09-24 23:15:36 -07:00
Jacob Thornton
ebf94c53a5 change transition.js, rebuild… travis maybe will be happy? 2012-09-20 16:50:36 -07:00
Jacob Thornton
fe38d12f12 rebuild - fix missing ( 2012-09-20 16:26:00 -07:00
Jacob Thornton
667179f406 added support for jquery 1.8.* 2012-09-20 16:23:54 -07:00
Mark Otto
08b8571cb8 version bump to get this started 2012-09-05 10:00:57 -07:00
Jacob Thornton
c52368d3c5 last rebuild before 2.1.1 release 2012-09-04 20:44:11 -07:00
Mark Otto
bf590d8c81 fixes #4958: add version to minified js 2012-09-04 11:13:08 -07:00
Mark Otto
e27b1355b5 fixes #4771: widen .form-horizontal labels and .dl-horizontal terms given larger font-size of 2.1.0 2012-08-28 10:12:04 -07:00
Jacob Thornton
3568146b28 only stop prop on form – as people seem to be relying on dropdown hiding when clicking internal elements 2012-08-27 21:44:09 -07:00
Mark Otto
7d412b1e14 fixes #4741: undo previous version's attempt at firefox gradient changes and add gradient tests 2012-08-27 21:18:55 -07:00
Jacob Thornton
601e252074 fix for #4761 2012-08-27 20:58:51 -07:00
Jacob Thornton
d797a5fbd7 fix for open elements under modal when .modal-open 2012-08-27 20:43:12 -07:00
Mark Otto
1c134d9a7f update version numbers to 2.1.1 2012-08-21 13:11:25 -07:00
Mark Otto
6477ad1acf fixes #4472: manually change mustache file as well for typo 2012-08-21 12:57:41 -07:00
Jacob Thornton
320b75de63 add affix to zip 2012-08-20 23:13:43 -07:00