0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-10 03:46:13 +01:00

2966 Commits

Author SHA1 Message Date
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
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
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
XhmikosR
de1d8c36ad Run grunt. 2014-08-01 19:49:54 +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
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
463fe476d8 Merge pull request #14166 from hnrch02/docs-cleanup
Docs cleanup
2014-07-23 20:39:40 -07:00
XhmikosR
97cb2803d7 Run grunt. 2014-07-22 08:31:36 +03:00
XhmikosR
caed585033 Update Filesaver.js to v2014-07-21. 2014-07-22 08:29:06 +03:00
XhmikosR
5c569dc4d4 Update Blob.js to the latest version. 2014-07-22 08:29:06 +03:00
XhmikosR
8d435cbb3c Run grunt. 2014-07-22 08:25:41 +03:00
Heinrich Fenkart
38335b2a3d Merge alert examples and add .bs-example-standalone class 2014-07-17 05:16:48 +02:00
Chris Rebert
b3d068f2d3 regenerate docs/assets/js/docs.min.js 2014-07-15 17:21:39 -07:00
Chris Rebert
11db482371 popover dismiss-on-next-click example: instead of <button>, use <a> w/ tabindex
Fixes #14038.

Research supporting this choice of approach:
    https://gist.github.com/cvrebert/68659d0333a578d75372

Why not <button>?
Even with a `tabindex` attribute, they don't gain focus when clicked upon in:
    * Mac OS X Firefox 30.0
    * Mac OS X Safari 7.0.5
2014-07-15 16:57:54 -07:00
Mark Otto
d60d34231a table headers 2014-07-13 23:45:34 -07:00
Mark Otto
b831dc06af more rems 2014-07-13 13:50:35 -07:00
Mark Otto
66f7062e81 transitions mixin and global variable, add it to buttons 2014-07-13 13:31:07 -07:00
Mark Otto
a1bd7634d7 more docs rems, some mixin optimization 2014-07-13 13:19:58 -07:00
Mark Otto
2211af5ed1 more rems in docs 2014-07-13 12:47:24 -07:00
Mark Otto
3d36227616 rem-ify the footer and masthead 2014-07-13 12:38:06 -07:00
Mark Otto
0d89b7f55e rem-ify homepage icon 2014-07-13 12:15:14 -07:00
Mark Otto
aaccb80c3c yellow var 2014-07-13 12:10:54 -07:00
Mark Otto
b137f0b874 vars 2014-07-13 12:04:05 -07:00
Mark Otto
bf4984145a nesting docs css 2014-07-13 12:00:17 -07:00
Mark Otto
fecbaca907 grunt some more things, rebuild customizer nav 2014-07-12 18:11:07 -07:00
Mark Otto
7a8d9dbdbf grunt 2014-07-12 18:06:26 -07:00
Mark Otto
5cfde0d3a5 Merge branch 'master' into derp
Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	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/javascript/dropdowns.md
	less/utilities.less
2014-07-12 16:15:45 -07:00
Mark Otto
fe0ef38898 Fixes #14095: Add basic styling for captions, which we've for some reason been missing all this time. 2014-07-12 15:55:15 -07:00
Mark Otto
2962f845a5 grunt 2014-07-12 15:47:42 -07:00
Mark Otto
717a50ce19 grunt 2014-07-12 15:37:13 -07:00
Mark Otto
bd292ca3b8 Fixes #14107: Lighten placeholder text 2014-07-12 15:13:18 -07:00
Mark Otto
a63c066e3d rearrange a few things; drop compiled theme file 2014-07-11 22:46:10 -07:00
Mark Otto
d2baa4fd40 tweak docs sidenav styles 2014-07-11 22:35:07 -07:00
Mark Otto
cabb86d126 Merge branch 'master' into derp
Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	docs/_includes/components/progress-bars.html
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map
2014-07-11 00:38:28 -07:00
Mark Otto
4993ab6e00 start markdowning getting started and moving things to separate pages 2014-07-10 17:54:06 -07:00
Mark Otto
35c90fe13d rewrite getting started quick start and download in markdown 2014-07-10 02:24:13 -07:00
Mark Otto
1af9ae1671 docs change 2014-07-10 00:52:10 -07:00
Mark Otto
7cfaf2f29e simplify example css 2014-07-10 00:31:09 -07:00
Mark Otto
fb775bae21 fix sidenav js 2014-07-10 00:24:34 -07:00
XhmikosR
94472ee74a Run grunt. 2014-07-10 10:03:24 +03:00
XhmikosR
e598247bcc Update uglify-js to v2.4.15. 2014-07-10 10:02:41 +03:00
Mark Otto
bae1604110 really fix the docs 2014-07-09 23:24:17 -07:00
Mark Otto
61d9606fff remove outline 2014-07-09 23:22:43 -07:00
Mark Otto
616a7a50eb nuke commented out sidenav; fix docs 2014-07-09 23:20:33 -07:00
Mark Otto
dae1a68fb1 Merge branch 'master' into derp
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/components/navs.html
	docs/_includes/css/images.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/tabs.html
	docs/assets/css/docs.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-07-09 22:19:23 -07:00
Mark Otto
216bc3d68b Rewrite grid docs in markdown 2014-07-09 22:00:07 -07:00
Mark Otto
10f9260119 docs spacing for headings and leads 2014-07-09 21:35:35 -07:00
Mark Otto
ed1bcc0af4 docs design changes for markdown content 2014-07-09 21:18:00 -07:00
Mark Otto
857fe32a70 Refactor navs: new classes, remove separate pills & tabs files, drop justified nav because it never really worked 2014-07-09 16:04:31 -07:00
Mark Otto
77a4bcad9e Drop the deprecated .visible-* classes (because we replaced them with .visible-*-block, -inline-block, -inline 2014-07-09 13:58:27 -07:00