0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

10039 Commits

Author SHA1 Message Date
Mark Otto
668dc448a7 bigger images 2014-08-05 17:23:25 -07:00
Mark Otto
60e64015de fix broke code block 2014-08-05 17:21:54 -07:00
Mark Otto
d71f6470c1 copy and remove rogue p tag 2014-08-05 17:21:13 -07:00
Mark Otto
dceeb641ed fix nav link 2014-08-05 17:19:43 -07:00
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
Mark Otto
6c87895eec fixes #14310: reset .active as well for button links 2014-08-04 10:01:20 -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
Mark Otto
77b0dc69eb Merge pull request #14311 from hnrch02/autoprefixer-for-13074
Follow-up to #13074: use spec syntax instead of deprecated mixins
2014-08-03 22:12:52 -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
c7970106a2 Merge pull request #13074 from haydenbleasel/master
WebKit CSS3 carousel transforms for supported devices
2014-08-02 18:40:21 -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
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
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