Commit Graph

5253 Commits

Author SHA1 Message Date
Mark Otto
43e45ce06c consolidate forms docs 2015-01-19 16:00:56 -08:00
Mark Otto
dba0e3c947 docs subheading tweaks 2015-01-19 15:53:21 -08:00
Mark Otto
3fe96e8f50 fix border color on inverse tables 2015-01-19 15:52:40 -08:00
Mark Otto
affd89122f better separation of docs sections with a light bottom border on h2s 2015-01-19 15:49:44 -08:00
Mark Otto
1633da2ce8 remove unnecessary docs sections for media queries page 2015-01-19 15:44:53 -08:00
Mark Otto
72bc9b97f0 fix homepage nav styles 2015-01-19 15:44:45 -08:00
Mark Otto
a72741ed62 nuke files 2015-01-19 15:25:53 -08:00
Mark Otto
d8c94029d3 move around files 2015-01-19 15:25:49 -08:00
Mark Otto
faedb7fec4 grunt 2015-01-19 14:55:25 -08:00
Mark Otto
325748ff68 Merge branch 'master' into v4
Conflicts:
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.min.js
	docs/_includes/components/thumbnails.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/template.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/assets/css/docs.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/src/customizer.js
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/js/bootstrap.js
	docs/dist/js/bootstrap.min.js
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/theme/index.html
	grunt/configBridge.json
	less/alerts.less
	less/badges.less
	less/jumbotron.less
	less/panels.less
	less/tables.less
	less/theme.less
	less/variables.less
	package.json
	scss/_button-group.scss
	scss/_buttons.scss
	scss/_forms.scss
2015-01-19 14:48:12 -08:00
Mark Otto
24aad4fe3a customizer typo 2015-01-19 09:19:09 -08:00
Mark Otto
fa47de717e grunt 2015-01-19 08:33:33 -08:00
Mark Otto
c683e7dea7 bump versions 2015-01-19 08:32:13 -08:00
Mark Otto
ce29def7a6 grunt 2015-01-19 08:27:15 -08:00
Mark Otto
4ed95f5fa2 fixes #15497: increase decimals on line-height-large from 1.33 to 1.3333333 to fix button sizing in Win 8.1 Chrome 2015-01-18 15:03:14 -08:00
Mark Otto
06c00d5591 Merge branch 'master' of github.com:twbs/bootstrap 2015-01-18 13:39:50 -08:00
Mark Otto
db8eeaa17a Fixes #15142: Add position: relative; to .dropup for proper placement of menus 2015-01-18 13:39:40 -08:00
Chris Rebert
161eac4fd7 rm dummy href from dismiss-on-next-click popover example; fixes #15277 2015-01-18 12:51:47 -08:00
Mark Otto
1bf1ba7103 Merge branch 'master' into pr/15278
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2015-01-18 12:24:29 -08:00
Mark Otto
22b79dae3c grunt 2015-01-18 12:22:43 -08:00
Chris Rebert
8a1efe91df #15576 errata: #15298 also reproduces on Linux
See https://github.com/twbs/bootstrap/issues/15298#issuecomment-69216754
2015-01-16 15:16:52 -08:00
Chris Rebert
2eaa7e0e1c Merge pull request #15581 from twbs/inline-form-with-visible-labels
Add example of using .form-inline with visible <label>s
2015-01-16 08:20:41 -08:00
Dan Course
21f7254e10 12 items of *fewer* as it's a countable item
http://www.oxforddictionaries.com/words/less-or-fewer
2015-01-16 10:36:46 +00:00
Chris Rebert
ca2c1e1576 custom widths not always required for inline form fields
[skip sauce]
2015-01-15 17:52:02 -08:00
Chris Rebert
2fa70f37da Add example of using .form-inline with visible <label>s
Refs #15410
[skip sauce]
2015-01-15 17:47:22 -08:00
Chris Rebert
63f3136450 Document that tooltip+popover show+hide methods are async; fixes #15500
[skip sauce]
2015-01-15 17:18:00 -08:00
Mark Otto
ec2ccf4219 Merge branch 'master' of github.com:twbs/bootstrap 2015-01-15 15:51:12 -08:00
Mark Otto
d4f1331e51 grunt 2015-01-15 15:51:02 -08:00
Chris Rebert
499f71d27f Merge pull request #15498 from twbs/fix-15332
Add examples of using feedback icons with .input-group
2015-01-15 15:49:46 -08:00
Chris Rebert
7164d84953 Add Wall of Browser Bugs entry for #15298
[skip sauce]
2015-01-15 11:10:02 -08:00
Chris Rebert
f1cb639c34 Docs: add missing "http://" 2015-01-15 10:46:58 -08:00
Chris Rebert
47ec330473 Merge pull request #15560 from twbs/fix-15555
Document that .form-inline & .form-horizontal work fine on non-<form>s too
2015-01-14 21:07:26 -08:00
Chris Rebert
ccc3eb5cc6 document usage of npm package; fixes #15127
[skip sauce]
2015-01-14 18:43:08 -08:00
Chris Rebert
e94a597685 Core & Sass Teams are now one and the same bigger Team 2015-01-14 10:45:07 -08:00
Chris Rebert
7b84705286 Document that .form-inline & .form-horizontal work fine on non-<form>s too
Fixes #15555
[skip sauce]
2015-01-13 17:36:37 -08:00
Chris Rebert
fb6622a7d4 Document that calling tooltip/popover .show()/.hide() qualifies as manual triggering
Fixes #15465

[skip sauce]
2015-01-13 17:06:31 -08:00
Chris Rebert
82d786b5fe Filed http://openradar.appspot.com/19435018
Refs #14868
2015-01-09 19:39:33 -08:00
Chris Rebert
dbe38e89d0 Filed http://openradar.appspot.com/19434933
Refs #15205
2015-01-09 19:16:06 -08:00
Chris Rebert
4576dbae95 Filed http://openradar.appspot.com/19434878
Refs #11266, #13098
2015-01-09 19:04:42 -08:00
Chris Rebert
aa62f1b944 http://crbug.com/377346 is claimed to be fixed in Chrome 41
So remove its entry from the Wall of Browser Bugs.
Refs #13892, #14037

[skip sauce]
2015-01-09 15:04:59 -08:00
Chris Rebert
901ece7996 add pointer to Masonry in the thumbnail docs 2015-01-08 13:35:05 -08:00
Gleb Mazovetskiy
3be590dd5b docs: fix typo in media-queries.md 2015-01-08 21:17:22 +00:00
Chris Rebert
698b3a7ace grunt 2015-01-07 17:04:59 -08:00
Chris Rebert
e651b48eb6 update responsive utility docs post-overhaul 2015-01-06 17:49:33 -08:00
Chris Rebert
5868b5bc9c add migration guidance regarding responsive visibility classes 2015-01-06 17:49:33 -08:00
Chris Rebert
ff9c07f4aa fix numerical typo in grid docs 2015-01-06 17:46:46 -08:00
Mark Otto
20cdb62200 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-01-06 16:06:06 -08:00
Mark Otto
b542137dd5 streamline homepage nav 2015-01-06 16:05:58 -08:00
Mark Otto
82f460b20d formatting of html 2015-01-06 15:35:49 -08:00
XhmikosR
9db1de2a3a Update jQuery to v1.11.2. 2015-01-07 00:31:18 +02:00