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

4607 Commits

Author SHA1 Message Date
Mark Otto
0181d3c643 move license and translations to about section 2014-08-05 17:19:12 -07:00
Mark Otto
7629e08d2b space out consecutive navs better 2014-08-05 17:17:00 -07:00
Mark Otto
adefbf6ebe copy on badges 2014-08-05 17:16:28 -07:00
Mark Otto
25d6824e6c cards 2014-08-05 17:12:24 -07:00
Mark Otto
af0921062f rename imported files to preface with underscore; rerun grunt dist 2014-08-04 15:36:41 -07:00
Mark Otto
ef9e76c2c5 comment out firefox specific code for linter to parse fully 2014-08-04 15:17:43 -07:00
Mark Otto
724240fe4f Merge branch 'master' into derp
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/customizer-variables.html
	docs/_includes/js/overview.html
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/browser-bugs.html
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	less/carousel.less
2014-08-04 15:09:23 -07:00
Mark Otto
9096c20021 grunt 2014-08-04 14:05:12 -07:00
Mark Otto
14e8ec2514 unfuck all that because lol dependencies 2014-08-04 10:14:11 -07:00
Julian Thilo
fd6c00d141 Merge pull request #14315 from twbs/browser_bug_applet
Add Wall of Browser Bugs entry for #14124
2014-08-04 18:48:04 +02:00
Julian Thilo
f7acc1c77c Add Wall of Browser Bugs entry for #14124
[skip sauce]
2014-08-04 18:46:27 +02:00
Chris Rebert
fb2e9fe30c Merge branch 'KyleMit/add-default-settings-documentation' 2014-08-04 09:08:07 -07:00
Kyle
333af7d371 Add docs for how to change default JS plugin settings
Closes #14250.
2014-08-04 09:07:19 -07:00
Heinrich Fenkart
b10b373c60 Follow-up to #13074: use spec syntax instead of deprecated mixins 2014-08-04 06:19:42 +02:00
Mark Otto
9e92b74aa3 fix ads text 2014-08-03 16:58:59 -07:00
Mark Otto
99edff6dda fix sidebar again 2014-08-03 16:23:32 -07:00
Mark Otto
ae9c160932 Merge branch 'master' into derp
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-08-03 16:18:41 -07:00
Mark Otto
6424acf69a Fixes #14234: Reset the hack IE8-10 with another hack just for IE11 for temporal inputs and line-height 2014-08-02 21:16:32 -07:00
Mark Otto
9d0872b748 Fixes #14251: Remove the -webkit-overflow-scrolling to prevent Safari from screwing up widths 2014-08-02 19:05:46 -07:00
Mark Otto
de77d04899 Merge branch 'master' into derp
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-08-02 18:46:11 -07:00
Mark Otto
67d39404a2 grunt 2014-08-02 18:41:00 -07:00
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
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
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
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
vsn4ik
3e15e40ac9 dropdowns.html: Remove wrong "type" attribute. 2014-07-25 16:54:05 +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
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
Chris Rebert
c0eddc1fe3 Merge pull request #14188 from twbs/doc-14148
Document limitations of buttons JS plugin
2014-07-23 18:01:31 -07:00