root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 10 Packages Projects Releases Wiki Activity
7,972 Commits 104 Branches 92 Tags 676 MiB
Commit Graph

479 Commits

Author SHA1 Message Date
Mark Otto acde2dc1ee Nuke third lines form carousel examples 2012-12-20 00:20:00 -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
Mark Otto 65edc9cd6e Change .jumbotron usage in docs layout to .bs-docs-jumbotron 2012-12-19 21:42:36 -08:00
Mark Otto 6649918c7f Merge conflicts 2012-12-08 22:45:39 -08:00
Mark Otto b5ceca14db Fix docs typos 2012-12-08 18:46:34 -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
Quy Ton 3bd9a26c01 Apply code tag to data attribute on javascript page 2012-12-08 12:06:46 -08: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 0f2a423b8d Once more, update all the favicons to retina 2012-12-03 13:25:56 -08:00
Mark Otto 15a4399015 Align the touch icons attributes 2012-12-03 13:22:10 -08:00
Mark Otto dd11d0a3fa move around social buttons 2012-12-01 13:47:07 -08:00
Mark Otto ebd2215e49 remove deleted css files, run make 2012-11-30 16:31:24 -08:00
Mark Otto fca35c0dba Merge branch '2.2.2-wip' into exploratory 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/alerts.less
	less/button-groups.less
	less/buttons.less
	less/tests/css-tests.html
 2012-11-30 00:13:30 -08:00
Mark Otto acc037de15 add holder and replace placehold.it 2012-11-29 20:59:14 -08:00
Mark Otto 7e56e2265d Merge branch '2.2.2-wip' into exploratory 
Conflicts:
	less/button-groups.less
 2012-11-22 22:04:21 -08:00
Mark Otto 5d1b4206b1 Fixes #5986: single toggle button html examples 2012-11-22 12:06:36 -08:00
Mark Otto 8df2811d49 Simpler footer for docs 
* Remove back to top link (ya'll are lazy :P)
* Center text
* Decrease vertical padding
 2012-11-21 23:29:20 -08:00
Mark Otto ee93541421 Merge branch '2.2.2-wip' into exploratory 
Conflicts:
	docs/assets/css/bootstrap.css
	less/buttons.less
	less/forms.less
 2012-11-04 19:59:07 -08:00
Mark Otto 2320a09898 fix modals display in docs on tablet view 2012-11-04 12:58:57 -08:00
Mark Otto 05a2d37559 run make after removing responsive css file 2012-11-04 00:37:49 -07:00
Mark Otto 3de6f3ff88 Swap old icons for new in docs 2012-11-03 16:18:02 -07:00
Mark Otto a249d1c8ee Merge branch '2.2.2-wip' into exploratory 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/scaffolding.html
	docs/templates/pages/scaffolding.mustache
 2012-11-03 13:44:01 -07:00
Bradly Feeley 46b5e0cbc6 Fixing various spelling typos in the docs. 2012-11-02 16:34:21 -06:00
Mark Otto 1477e081d4 Merge branch '2.2.2-wip' into exploratory 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache
	less/accordion.less
	less/alerts.less
	less/breadcrumbs.less
	less/buttons.less
	less/code.less
	less/dropdowns.less
	less/forms.less
	less/navbar.less
	less/progress-bars.less
	less/responsive-navbar.less
	less/tables.less
	less/thumbnails.less
	less/tooltip.less
	less/wells.less
 2012-11-02 09:36:51 -07:00
Mark Otto bf48c31406 Merge branch 'bradly-affix-docs-fix' into 2.2.2-wip 2012-10-31 10:48:44 -07:00
Mark Otto d5697fcf6b fixes #5717: add retina favicon, recompile docs 2012-10-31 10:41:41 -07:00
Bradly Feeley cbf1dace2f Fixing typos in affix options area in the docs. 2012-10-30 11:46:18 -07:00
Jacob Thornton ac6625de5f add updater function and rebuild 2012-10-17 21:37:34 -07:00
Mark Otto 57eb2a8018 more hellip on modals 2012-10-16 20:28:07 -07:00
Mark Otto 0ac50d28b5 fixes #5519: hellip in modal code 2012-10-16 20:18:50 -07:00
Mark Otto 463eae25b0 clarify js docs individual or compiled section 2012-10-16 12:37:36 -05:00
Mark Otto 6203535d2f Changing title of docs pages to simply say 'Bootstrap' like the docs home page 2012-10-07 21:38:28 -07:00
Mark Otto e73cd15fc8 copy and style changes to improve docs rendering on mobile devices 2012-10-02 17:01:18 -07:00
Mark Otto 4ab7b77aa3 Merge branch '2.1.2-wip' into exploratory 
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/labels-badges.less
	less/navbar.less
	less/tables.less
 2012-10-01 23:41:00 -07:00
Mark Otto fd1e9b1498 fix copy on modal popover button doodad 2012-10-01 13:28:54 -07:00
Mark Otto 26386ad615 remove tabbable tabs on left, right, and bottom; instead, from here out use stacked pills or tabs 2012-10-01 00:05:18 -07:00
Mark Otto bbd543db53 Merge branch '2.1.2-wip' into exploratory 
Conflicts:
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache
 2012-09-30 22:45:39 -07:00
Mark Otto 8ecffcb32f fixes #5334: html snippet comments 2012-09-28 10:39:15 -07:00
Mark Otto ad96435d27 Merge branch '2.1.2-wip' into box-sizing-exercise 2012-09-26 16:02:33 -07:00
Mark Otto cd5ae9e030 change up carousel 2012-09-26 11:20:27 -07:00
Mark Otto c59e5251e1 initial pass at removing navbar-inner from .navbar component 2012-09-25 22:48:02 -07:00
Jacob Thornton aec8b08930 update docs for tooltip html + the dropdown methods api 2012-09-24 23:32:55 -07:00
Mark Otto cedb3c7c56 fixes #5173: proper popover offsets; added docs examples to enable tests in the future 2012-09-17 23:03:32 -07:00
Mark Otto 595e1a189c fixes #5119: javascript in navbar typo 2012-09-13 10:07:57 -07:00
Mark Otto e1deba30aa fixes #5097: js docs typos 2012-09-12 16:22:52 -07:00
Geoff Young 76e42edb29 Updated sample markup to reflect live demo. 2012-09-09 18:58:23 -04:00
Mark Otto 209852c805 fixes #4902: proper accordion html example 2012-09-01 12:03:55 -07:00
Mark Otto 303a33f15c fixes #4664: spelling mistake in alerts docs 2012-08-27 15:48:54 -07:00
Mark Otto b444582ccd fixes #4671: mention collapsing parents in docs for affix plugin 2012-08-27 15:20:50 -07:00
Mark Otto 5da217b96e fixed #4598, typo, manually 2012-08-22 20:23:58 -07:00
Mark Otto 55facf1f2e fixes #4473: docs example typo for js affix plugin 2012-08-21 12:58:48 -07:00
Mark Otto a667fd93ab pre font-size increase; revert static top navbar, undo contents section for now 2012-08-19 23:01:24 -07:00
Mark Otto 4e979f084d fix static navbar container issues, clean up docs presentation by unfixing the top navbar in favor of static one, start adding table of contents for longer sections of docs 2012-08-19 21:12:52 -07:00
Mark Otto 8e271d664b Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-08-19 11:54:05 -07:00
Mark Otto c531a75ff0 fixes #4451 manually: add .fade to modal example in both mustache and html 2012-08-19 11:53:55 -07:00
Jacob Thornton 45dddc59a1 add click option for tooltip, popover - make click default for popover 2012-08-18 19:54:30 -07:00
Jacob Thornton 937cfa6a88 add note about .nav 2012-08-18 19:32:50 -07:00
Jacob Thornton ae9a2bd93a Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 2012-08-14 21:06:39 -07:00
Jacob Thornton dee57462e2 get affix actually working and update docs 2012-08-14 21:06:08 -07:00
Andreas Cederström 2df0a0fdeb now with 13 custom jquery plugins 2012-08-14 13:58:12 +02:00
Mark Otto 3c89f7bb5f fix chevron on js docs and run make after table changes 2012-08-07 23:07:53 -07:00
Mark Otto 0cb3ba6b23 run make after merging #4289 2012-08-07 22:34:39 -07:00
Jacob Thornton 48546c2735 aria-labelledby="myModalLabel" aria-hidden="true" 2012-08-01 20:26:44 -07:00
Dirk Ginader 6977d35eed close #3531 added focus handling and removed the badly announced "times" close button from screenreaders 2012-08-01 20:11:16 -07:00
Mark Otto c2e899f2a0 remove the canvas slider doodad 2012-08-01 19:00:25 -07:00
Mark Otto 9795e9bbe6 place chevrons first in sidenav in docs, fix ie7 bugs for said sidenav 2012-07-30 23:48:26 -07:00
Mark Otto a30045daef reverse navbar styles to save code 2012-07-29 00:30:15 -07:00
Mark Otto 79067721b1 fix js docs formatting 2012-07-26 23:21:06 -07:00
Mark Otto 4bb2a13776 rerun make 2012-07-26 21:45:30 -07:00
Mark Otto b7b4fd5c82 wrap footer in bs docs canvas for scrolling doodad 2012-07-24 01:53:32 -07:00
Jacob Thornton e38fa4b1f4 fix scroll thinggg 2012-07-24 00:30:58 -07:00
Jacob Thornton 5b2f2ed821 Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 
Conflicts:
	docs/assets/css/docs.css
	docs/javascript.html
	docs/templates/pages/javascript.mustache
 2012-07-24 00:24:25 -07:00
Jacob Thornton 4ea7c47235 slightly fix side bar 2012-07-24 00:21:40 -07:00
Mark Otto f085dbadd1 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 
Conflicts:
	docs/assets/css/docs.css
	docs/base-css.html
	docs/components.html
	docs/customize.html
	docs/getting-started.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/customize.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/javascript.mustache
	docs/templates/pages/scaffolding.mustache
 2012-07-23 23:01:38 -07:00
Mark Otto 0dda2c4659 make docs scroll over jumbotrons, but only for 980px up 2012-07-23 22:36:08 -07:00
Jacob Thornton dcf75697ec some progress on affix plugin 2012-07-22 18:28:39 -07:00
Jacob Thornton fae6c36874 adds minLength #3960 2012-07-22 14:50:52 -07:00
Mark Otto b9105b98f9 move from downloads.html to customize.html to better match purpose of page, fix up customize page layout to match other docs, link style refinement to jumbotrons 2012-07-20 22:06:47 -07:00
Mark Otto 9343e1e933 remove getting started link from home, add to navbar, overhaul getting started docs 2012-07-12 21:38:18 -07:00
Mark Otto a12f0e551f overhaul docs on sub pages, clean up css and copy 2012-07-12 18:11:49 -07:00
Mark Otto 549d61fc28 updated footer 2012-07-12 17:02:55 -07:00
Mark Otto 3c775f2432 add chevrons to other docs navs 2012-07-12 16:23:21 -07:00
Mark Otto c74dddd02e fix indenting on extend and js docs pages, remove hidden subnavs 2012-07-09 22:29:53 -07:00
Mark Otto 64e87a85f5 remove popoverarrows mixin, relegate code to tooltips and popvers since we only used them once each; this fixes the problem of broken tooltips in 2.1 2012-07-09 22:14:30 -07:00
Mark Otto f4877c2369 fix up docs popover examples and copy 2012-07-09 21:13:33 -07:00
Mark Otto 20676ddd4d adding getting started page based on Bootstrap University from awhile back, testing out side nav on docs instead of subnav bar 2012-07-08 01:47:36 -07:00
Mark Otto 5f861ef517 fix up docs to use default container, fix responsive home changes 2012-07-07 23:16:07 -07:00
Mark Otto 7cc916d137 Merge branch '21jumpst' into 2.1.0-wip 2012-07-07 00:48:15 -07:00
Mark Otto 6d447079a4 update buttons in docs to include type 2012-07-06 15:18:56 -07:00
Mark Otto 3c07eaa251 updates to type scale 2012-07-05 15:11:54 -07:00
Mark Otto c09e8473e2 use variablef or wells background-color, update docs for glyphicons license mention, update popovers to remove that thick border and make them look mo betta 2012-06-28 10:03:46 -07:00
Mark Otto a683497dbc renamed less.html to extend.html, removing all the vars and mixins 2012-06-27 23:56:00 -07:00
Mark Otto 6662f62236 remove subnav file, instead add an optional class for .navbar 2012-06-24 21:03:39 -07:00
Mark Otto 71669dda63 tons of docs cleanup in css, adding subnav to official components 2012-06-24 20:26:48 -07:00
Mark Otto 59153205b3 run make on js files 2012-06-20 23:46:29 -07:00
Mark Otto 1db72f8d77 Merge pull request #3810 from purwandi/develop 
Add space between attrs in docs on navbar button
 2012-06-11 22:31:58 -07:00
Mark Otto 2e6d4e9439 more rearrangement and removal of about sections in js docs 2012-06-11 22:28:10 -07:00
Mark Otto bf875d9e36 cleanup options display in all sections, rearrange typeahead section 2012-06-11 22:19:25 -07:00
Purwandi c7ffe6edc8 Add space on navbar button 2012-06-12 12:17:10 +07:00
Mark Otto f453909f39 add a dropdowns section to Components (still needs work) and reformat much of the js docs 2012-06-11 21:48:41 -07:00
Mark Otto 5dd47f1196 keep tables at 13px in docs for now, clean up some modals js docs stuff 2012-06-11 20:33:00 -07:00
Mark Otto 550e375af0 restore scrollspy to body 2012-06-08 16:35:04 -07:00
Mark Otto 269ce715f1 overhaul js docs top sections, update subhead 2012-06-07 22:24:47 -07:00
Mark Otto 97c7a83a8f remove individual js file download buttons 2012-06-07 22:12:15 -07:00
Mark Otto bba0b34c36 restore top navs entirely 2012-06-07 22:10:36 -07:00
Mark Otto c1c7528dd9 drop the side nav, restore topbar 2012-06-07 21:48:03 -07:00
Mark Otto df869f1eb0 fix grids 2012-06-07 21:45:37 -07:00
Mark Otto ff6dd0cf56 nav and content tweaks 2012-06-07 14:01:03 -07:00
Mark Otto a1aa2b188a more content changes to docs 2012-06-07 10:20:52 -07:00
Mark Otto 2ecbd36cbf add back left rail nav, tweak colors 2012-06-06 00:48:31 -07:00
Mark Otto 5a614fb86d remove sidenav 2012-06-05 19:53:54 -07:00
Mark Otto 8ee0679522 updated javascripts for first pass at single column 2012-06-05 18:25:46 -07:00
Mark Otto 22918f8f92 more tweaks to layouts and some docs styles 2012-06-05 17:16:17 -07:00
Mark Otto dd127611e1 two col scaffolding rev 2012-06-05 00:46:16 -07:00
Mark Otto de53f62a04 more changes to js and components, playing with new docs subnav 2012-06-04 23:57:48 -07:00
Mark Otto 446f9199c6 updated index page and footer 2012-06-04 23:31:26 -07:00
Mark Otto c44bd1edf4 revamp docs to have new width, start realigning the base css page to match 2012-06-04 21:08:31 -07:00
Jacob Thornton 82ea5847a7 adds remote source to modal. Remote source can be specified in href or by providing a remote option #936 2012-06-03 21:26:54 -07:00
Jacob Thornton 2d3a0babd2 make active selector more specific #2043 and rebuild 2012-06-02 22:10:35 -07:00
Jacob Thornton a38bc90b48 change note to point out that boostrap.js bundles all plugins #3174 2012-06-02 21:19:56 -07:00
Jacob Thornton 806a82ef83 add relatedTarget to carousel slide event 2012-06-02 18:06:00 -07:00
Jacob Thornton f836473129 add html option back to tooltip and popover to explicitly prevent XSS #3421 2012-06-02 17:55:10 -07:00
Jacob Thornton 5e5965ca6f Merge branch 'accessibility' into 2.1.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
	docs/javascript.html
	docs/templates/pages/javascript.mustache
 2012-06-02 16:11:35 -07:00
Mark Otto cc8b260ed8 adding google analytics tracking to docs 2012-05-26 16:35:28 -07:00
Mark Otto 7dbcd0be9a fix navbar button for mobile tapping (turn to button instead of adding href=#), streamline less docs page 2012-05-24 21:30:43 -07:00
Mark Otto aaf1825b49 fix example code for carousel 2012-05-24 20:26:08 -07:00
Mark Otto e5187e12c4 fix modal example per #3510 2012-05-17 21:48:13 -07:00
Jacob Thornton 9889948f58 abandon activedescendant because it was awful 2012-05-17 00:39:14 -07:00
Jacob Thornton a7b49a7d92 nearly everything working with activedescendant... then decide it's wrong. 2012-05-17 00:23:11 -07:00
Jacob Thornton 10c6db4b14 add proper role to dialog markup and cleanup modal logging 2012-05-16 19:43:22 -07:00
Jacob Thornton 4b53778150 Merge branch 'master' into 2.0.4-wip 2012-05-16 19:10:49 -07:00
Jacob Thornton a404ac33bb modal accessibility tab control 2012-05-16 19:09:57 -07:00
Mark Otto 0679f24606 example incorrect for modal dismiss button 2012-05-15 09:37:28 -07:00
Mark Otto d09db29039 #3465 part 1: add type="button" to all dismiss buttons in docs 2012-05-13 14:01:57 -07:00
Mark Otto 526d77af61 remove wrapping <label> from all js docs 2012-05-13 11:10:08 -07:00
Jacob Thornton f3cf4cbaae rebuild 2012-04-16 17:36:03 -07:00
Nirav Sanghani 031fa47f68 Update new typeahead method docs to be a bit clearer. 2012-04-16 17:27:34 -07:00
Nirav Sanghani d5a95315eb Update typeahead docs to reflect new option. 2012-04-16 17:24:51 -07:00
Mark Otto 5fa0fcc888 fix modal per #3086 2012-04-16 14:38:22 -07:00
Mark Otto a4c2332eb1 move js tooltip link 2012-04-15 00:06:11 -07:00
Mark Otto 5bc601d9a8 fix typo on js docs selector 2012-04-07 23:37:58 -07:00
Mark Otto 56ecc6ba96 clarify use of dropdowns, href, and data-target for js docs; add tests to css tests page for it's display and execution in html 2012-03-31 12:31:56 -07:00
Andreas Cederström 5d2062a3cc Finish of close conversion from a to button 2012-03-27 08:36:34 +02:00
Mark Otto 825227474b add refresh method documentation to js docs to close #2028 and #2795 2012-03-25 17:37:38 -07:00
Jacob Thornton a62810918f fix responsive navbar 2012-03-25 13:33:36 -07:00
Mark Otto d1864b3608 adding 144x144 ipad touch icon 2012-03-25 00:46:03 -07:00