10817 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mark Otto	089d434895	Merge branch 'master' into derp ... Conflicts: _config.yml dist/css/bootstrap-theme.css.map dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/_includes/components/glyphicons.html docs/_includes/css/forms.html docs/_includes/css/tables.html docs/_includes/getting-started/browser-device-support.html docs/_includes/header.html docs/_includes/js/affix.html docs/_includes/js/alerts.html docs/_includes/js/buttons.html docs/_includes/js/dropdowns.html docs/_includes/js/overview.html docs/_includes/js/popovers.html docs/_includes/js/tooltips.html docs/_includes/nav/javascript.html docs/assets/css/docs.min.css docs/assets/css/src/docs.css docs/assets/js/customize.min.js docs/assets/js/docs.min.js docs/assets/js/raw-files.min.js docs/browser-bugs.html docs/dist/css/bootstrap-theme.css.map docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css docs/examples/blog/index.html docs/examples/carousel/index.html docs/examples/cover/index.html docs/examples/dashboard/index.html docs/examples/grid/index.html docs/examples/jumbotron-narrow/index.html docs/examples/jumbotron/index.html docs/examples/justified-nav/index.html docs/examples/navbar-fixed-top/index.html docs/examples/navbar-static-top/index.html docs/examples/navbar/index.html docs/examples/non-responsive/index.html docs/examples/offcanvas/index.html docs/examples/signin/index.html docs/examples/starter-template/index.html docs/examples/sticky-footer-navbar/index.html docs/examples/sticky-footer/index.html docs/examples/theme/index.html docs/examples/tooltip-viewport/index.html less/code.less less/panels.less less/variables.less	2014-08-02 18:30:59 -07:00
Mark Otto	033f1654b0	Fixes #14296: document a table caption example	2014-08-02 14:49:48 -07:00
Mark Otto	b9e6848dc8	Fixes #14253: Add borders for tables that follow bodies in panels	2014-08-02 13:55:02 -07:00
Mark Otto	feed9aed5b	Fixes #13202: Always use overflow: auto; on .table-responsive to prevent content breaking out of containers	2014-08-02 13:05:11 -07:00
Chris Rebert	557d3e527c	Firefox 31 has been released, so rm pre-v31 browser bug entry	2014-08-01 15:04:55 -07:00
Jacob	8bf48121a0	Merge pull request #14061 from hnrch02/fix-13656 ... Expose transition durations on plugin constructors; closes #13656	2014-08-01 12:50:03 -07:00
Chris Rebert	948a74662f	Merge pull request #14299 from twbs/fix-14076 ... Add unit test for tooltips on SVG elements	2014-08-01 12:10:46 -07:00
Chris Rebert	08393bf68a	Fix #14076: Add unit test for tooltips on SVG elements ... [skip validator]	2014-08-01 12:10:00 -07:00
XhmikosR	de1d8c36ad	Run grunt.	2014-08-01 19:49:54 +03:00
XhmikosR	1625102671	Remove layout: nil. ... It throws a warning with the latest Jekyll.	2014-08-01 19:45:11 +03:00
Chris Rebert	232b61a3ce	Merge pull request #14297 from twbs/bump-deps ... Bump dependencies	2014-07-31 14:28:32 -07:00
Chris Rebert	553c5d6f86	update shrinkwrap	2014-07-31 14:14:24 -07:00
Chris Rebert	460294ff77	bump grunt-saucelabs to ~8.2.0	2014-07-31 13:16:04 -07:00
Chris Rebert	80ca659154	bump grunt-contrib-clean to ~0.6.0	2014-07-31 13:15:27 -07:00
Chris Rebert	87ce371018	Merge branch 'thomaswelton/11004-import-config'	2014-07-31 11:46:17 -07:00
Thomas Welton	9739271c04	Add drag and drop config import; closes #11004 ... Closes #13790 by merging a rebased version of it.	2014-07-31 11:45:21 -07:00
Chris Rebert	f026cfb831	Merge pull request #14069 from twbs/fix-13818 ... Use more robust "find next carousel item" logic	2014-07-31 11:36:56 -07:00
Chris Rebert	cbba8e53df	Fix #13818 by using more robust "find next carousel item" logic ... Also adds another test for #9461: carousel next/prev should ignore non-items	2014-07-31 11:36:24 -07:00
Chris Rebert	d38fd028d6	Merge pull request #14290 from michaeljayt/patch-1 ... grunt now watch files in all folders/subfolders	2014-07-30 20:07:27 -07:00
Michael J.	0c03d0c273	grunt now watch files in all folders/subfolders	2014-07-31 10:21:56 +08:00
Heinrich Fenkart	18c0a1c977	Revert "Use mousedown instead of click for backdrop click detection; fixes #13816"	2014-07-30 23:54:25 +02:00
Chris Rebert	fc1db2e74b	Merge pull request #14264 from hnrch02/document-placement-args ... Document arguments passed to `placement` function of tooltip/popover	2014-07-28 17:47:51 -07:00
Heinrich Fenkart	852d0d1144	Document arguments passed to placement function of tooltip/popover ... Closes #14255	2014-07-29 02:29:41 +02:00
Chris Rebert	86d698f4e4	Merge pull request #14256 from twbs/fix-14224 ... Correctly doc args passed to function vals for `title` & `content` options of tooltips+popovers	2014-07-28 13:53:48 -07:00
Chris Rebert	2973103571	Merge pull request #14257 from twbs/fix-14219 ... Document that empty tooltips+popovers do not get displayed	2014-07-28 13:51:51 -07:00
Chris Rebert	5892273a23	Merge pull request #14258 from twbs/fix-14164 ... Move Windows Phone 8 IE10 viewport bug workaround script from head to footer	2014-07-27 17:08:27 -07:00
Chris Rebert	a64f2008da	Merge pull request #14235 from twbs/doc-14221 ... Update docs & add example for #14221	2014-07-27 17:06:48 -07:00
Chris Rebert	9742bb2ee4	Fix #14164: move Windows Phone 8 IE10 viewport bug workaround script to footer of pages	2014-07-27 17:01:34 -07:00
Chris Rebert	90424296eb	Fix #14219: Document that empty tooltips+popovers do not get displayed	2014-07-27 16:51:07 -07:00
Chris Rebert	ff12a76e5a	Fix #14224: Correctly document args passed to function vals for title & content options of tooltips+popovers	2014-07-27 16:18:59 -07:00
Mark Otto	d6d9bb5bc8	Fixes #14213: Rouge 1.6.1	2014-07-27 09:35:16 -07:00
Chris Hynes	531fc80885	Use .end() to remove extra line	2014-07-25 11:10:46 -07:00
Chris Rebert	c2f4e5fef1	re-alphabetize .jscsrc	2014-07-25 11:02:30 -07:00
Chris Hynes	519a087dbe	Remove popover content with .children().detach() instead of .empty() so it can be reused	2014-07-25 10:16:44 -07:00
Chris Rebert	f023ddc64e	Merge pull request #14239 from artbelov/patch-1 ... Delete duplicate property in .JSCSRC	2014-07-25 07:44:06 -07:00
Chris Rebert	73540abc80	Merge pull request #14240 from vsn4ik/fix_dropdown_link_example ... dropdowns.html: Remove wrong "type" attribute.	2014-07-25 07:27:49 -07:00
vsn4ik	3e15e40ac9	dropdowns.html: Remove wrong "type" attribute.	2014-07-25 16:54:05 +04:00
Artem Belov	098242afd8	Delete duplicate JSCS properties	2014-07-25 15:03:07 +04:00
Chris Rebert	2c4641855d	fix #14115 ... [skip sauce]	2014-07-24 15:16:08 -07:00
Chris Rebert	43fe197da7	Update docs & add example for #14221 ... [skip sauce]	2014-07-24 13:58:13 -07:00
Chris Rebert	5ea6b57616	Merge pull request #14233 from twbs/another-one-bites-the-dust ... Remove #9226 from Wall of Browser Bugs	2014-07-24 12:25:42 -07:00
Chris Rebert	8288cc9c05	Remove #9226 from Wall of Browser Bugs ... Per https://code.google.com/p/chromium/issues/detail?id=272750 and https://github.com/twbs/bootstrap/issues/9226#issuecomment-49873472	2014-07-24 12:22:22 -07:00
Mark Otto	98d693ba7b	Fixes #14142: Adding horizontal padding to captions in tables in panels.	2014-07-23 21:03:46 -07:00
Mark Otto	7fcc6c7889	unfuck those dropdowns	2014-07-23 21:00:48 -07:00
Mark Otto	078aafe7fd	Fixes #14221: Make .form-control-static work in inline forms as well	2014-07-23 20:54:07 -07:00
Mark Otto	abbb4d64e1	Merge branch 'master' of github.com:twbs/bootstrap	2014-07-23 20:50:00 -07:00
Mark Otto	6dde491ddf	Fixes #14168: bold nested kbd elements	2014-07-23 20:49:47 -07:00
Mark Otto	463fe476d8	Merge pull request #14166 from hnrch02/docs-cleanup ... Docs cleanup	2014-07-23 20:39:40 -07:00
Mark Otto	5713bd74d6	Fixes #12669 again: Redeclare the line-heights again for date inputs in IE8+	2014-07-23 20:32:05 -07:00
Chris Rebert	912c4bcbe4	Merge pull request #14225 from twbs/issue-14211 ... Add Wall of Browser Bugs entry for IE bug from issue #14211	2014-07-23 18:02:58 -07:00