root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 11 Packages Projects Releases Wiki Activity
8,106 Commits 105 Branches 92 Tags 675 MiB
Commit Graph

484 Commits

Author SHA1 Message Date
Chris Rebert 6af0013ac5 Revert "Add tooltip `viewport` option, respect bounds of the viewport" 
This reverts commit edb221a20c.
Reverting due to broken JS unit tests.

Conflicts:
	docs/javascript.html
 2014-01-16 20:32:59 -08:00
Mark Otto 03f4534307 Merge branch 'bo-tooltip-viewport' of https://github.com/benogle/bootstrap into benogle-bo-tooltip-viewport 
Conflicts:
	docs/javascript.html
 2014-01-16 20:01:28 -08:00
patricker 47f786e6ea Update javascript.html 
Fixed issue in Tabs example where the div had been marked as 'active' but the li had not been.  The correct tab of data would be displayed on load, but no tabs would be highlighted.  The tabs with fade example does not have this issue.  jsFiddle: http://jsfiddle.net/uXV56/
 2014-01-16 11:41:34 -07:00
Mark Otto 14975e4ee9 indentation and page header changes 2014-01-15 13:24:34 -08:00
Chris Rebert 2ba15c3750 upgrade tooltip/popover-in-groups callout from info to warning 2014-01-14 21:01:09 -08:00
Ben Ogle edb221a20c Add tooltip `viewport` option, respect bounds of the viewport 2014-01-14 17:42:29 -08:00
Chris Rebert ae255447f2 add .container(-fluid) to remaining navbar examples for consistency/accuracy 
follow-up to 93a4d6cc5e
 2014-01-05 12:55:03 -08:00
Quy Ton a617c805f2 Fix anchor links 2014-01-04 09:28:56 -08:00
Quy Ton 11f56bbb7b Use relative URLs 2014-01-04 09:10:02 -08:00
Quy Ton a53779d020 Refer to popovers instead of tooltips. 2014-01-03 10:55:06 -08:00
Mark Otto 0df96d8c32 Merge branch 'master' into docs_dir 2013-12-31 10:38:31 -08:00
Mark Otto 70b8b330f0 no more page.base_url 2013-12-28 23:08:46 -08:00
Mark Otto a9c829bc0c Rearrange repository contents because muahahahahahaha 2013-12-28 22:47:03 -08:00
Mark Otto a8005b3d0b flatten docs dir back into root 2013-07-18 17:41:30 -07:00
fat 6ec8a1e44f Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
 2013-07-18 01:08:19 -07:00
fat 37e899d766 get button js working with actual form elements p cooll 2013-07-18 00:59:31 -07:00
Mark Otto 1363ffa473 Merge branch '3.0.0-wip' of https://github.com/mauricew/bootstrap into mauricew-3.0.0-wip 2013-07-18 00:43:48 -07:00
Mark Otto 7cc34ea547 fix broken docs callouts 2013-07-17 20:17:56 -07:00
Mark Otto 542e03ae3a Merge branch '3.0.0-docs-calloutfam' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs-calloutfam 
Conflicts:
	docs/components.html
	docs/css.html
	docs/customize.html
 2013-07-17 19:33:30 -07:00
Mark Otto 6aec8f36fc fix broken scrollspy example 2013-07-15 12:00:01 -07:00
Julian Thilo 88d76e386f Dustin the docs again 
* Fix alllll the links!
* Change all `*.js` in JS plugin docs (no mo `bootstrap-`)
* Fully remove `tr.info`
* Bring nav includes up to date
 2013-07-09 15:32:28 +02:00
Maurice Wahba 8a84da6341 Carousel no longer dependent on glyphicons 
Used laquo/raquo for control buttons
Updated docs
 2013-07-06 22:26:40 +04:00
Mark Otto 416cc6b2ee fix broke js markup 2013-06-27 19:33:26 -07:00
fat b06ec345ce Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-27 19:19:57 -07:00
fat 94761c2216 use collapse in dropdown js example 2013-06-27 18:47:35 -07:00
Mark Otto cb29ed0751 Merge pull request #8307 from cvrebert/8287-docs-patch 
Fix #8287
 2013-06-27 18:38:34 -07:00
Julian Thilo b4e0e4fee6 Adjust info callout, add callouts to docs 
* Adjust the background-color of bs-callout-info to match danger and
warning in tone
* Convert all the callouts
* Change some callouts to info/warning
* Add new callout
 2013-06-26 15:59:33 +02:00
Chris Rebert 242d92e09c Fix #8287 2013-06-25 20:18:30 -07:00
Chris Rebert 694c650f8e copyedit JS docs 2013-06-25 19:32:17 -07:00
Julian Thilo a87ea9345b Add IDs, adjust text 2013-06-25 21:59:34 +02:00
Julian Thilo 0f0e7fc376 Add a link to the mailing list for JS help 2013-06-25 21:19:19 +02:00
Julian Thilo abb112173e Add callout to docs: 3rd-party libs not supported 2013-06-25 20:52:49 +02:00
Chris Rebert 7b60d04f0c docs/javascript.html: backticks -> <code> 2013-06-18 14:35:37 -07:00
Mark Otto ecf9b020dd Merge pull request #8168 from marsuboss/patch-2 
Duplicate ID navbar-example
 2013-06-13 13:41:23 -07:00
marsuboss 436cffdaaf Duplicate ID navbar-example 2013-06-13 15:36:52 +03:00
marsuboss c6f51d0919 Duplicate ID drop5 2013-06-13 14:29:34 +02: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 e94e5e8b40 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-16 20:54:14 -07:00
Mark Otto 9762f95bde Change up link alerts 
* No more children selectors to set all links in alerts as a special color because buttons and more wrongly inherited color
* Adds .alert-link for easy styling in any alert
 2013-05-16 20:53:59 -07:00
fat abc49c729b update js docs 2013-05-16 20:42:31 -07:00
Mark Otto 0f4b4acce1 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-16 20:32:37 -07:00
Mark Otto 8a3e982305 Fix broke dropdown navbar example 2013-05-16 20:29:50 -07:00
fat 140ef2320b change namespace back to dot notation and someother js shizzle 2013-05-16 20:19:51 -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
Mark Otto da4e7ab15c fix broke example 2013-05-12 16:13:39 -07:00
Mark Otto d5e6bbba27 fix some broke buttons on the js page 2013-05-09 13:28:05 -07:00
Mark Otto 766be659c1 .bs-docs-sidenote to .bs-callout 2013-05-08 22:58:54 -07:00
Mark Otto 526dfb7735 .bs-docs-tooltip-examples to .bs-example-tooltips 2013-05-08 22:57:42 -07:00
Mark Otto 09c3a4b3bc .bs-docs-example to .bs-example 2013-05-08 22:56:29 -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