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

716 Commits

Author SHA1 Message Date
Mark Otto
ff1d10affb fix scrollspy nav 2015-01-19 18:51:21 -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
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
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
Chris Rebert
161eac4fd7 rm dummy href from dismiss-on-next-click popover example; fixes #15277 2015-01-18 12:51:47 -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
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
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
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
901ece7996 add pointer to Masonry in the thumbnail docs 2015-01-08 13:35:05 -08:00
Mark Otto
b542137dd5 streamline homepage nav 2015-01-06 16:05:58 -08:00
XhmikosR
9db1de2a3a Update jQuery to v1.11.2. 2015-01-07 00:31:18 +02:00
Chris Rebert
be6dc3a3c9 Add example of using feedback icons with .input-group ; fixes #15332 2015-01-05 16:19:56 -08:00
Chris Rebert
19222bfe89 overview.html: add missing <p> 2015-01-03 22:05:49 -08:00
Mark Otto
0e5d17d5f6 Merge branch 'master' into v4
Conflicts:
	Gruntfile.js
	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/_data/glyphicons.yml
	docs/_includes/components/alerts.html
	docs/_includes/components/badges.html
	docs/_includes/components/breadcrumbs.html
	docs/_includes/components/button-dropdowns.html
	docs/_includes/components/button-groups.html
	docs/_includes/components/dropdowns.html
	docs/_includes/components/glyphicons.html
	docs/_includes/components/input-groups.html
	docs/_includes/components/jumbotron.html
	docs/_includes/components/labels.html
	docs/_includes/components/list-group.html
	docs/_includes/components/media.html
	docs/_includes/components/navbar.html
	docs/_includes/components/navs.html
	docs/_includes/components/page-header.html
	docs/_includes/components/pagination.html
	docs/_includes/components/panels.html
	docs/_includes/components/progress-bars.html
	docs/_includes/components/responsive-embed.html
	docs/_includes/components/thumbnails.html
	docs/_includes/components/wells.html
	docs/_includes/css/buttons.html
	docs/_includes/css/code.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/css/helpers.html
	docs/_includes/css/images.html
	docs/_includes/css/less.html
	docs/_includes/css/tables.html
	docs/_includes/css/type.html
	docs/_includes/customizer-variables.html
	docs/_includes/getting-started/accessibility.html
	docs/_includes/getting-started/disabling-responsiveness.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/whats-included.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/modal.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/components.html
	docs/_includes/nav/javascript.html
	docs/_jade/customizer-variables.jade
	docs/_layouts/default.html
	docs/about.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/src/customizer.js
	docs/customize.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
	less/glyphicons.less
	less/mixins/vendor-prefixes.less
	less/navbar.less
	less/popovers.less
	less/tables.less
	less/theme.less
	less/tooltip.less
	less/variables.less
	package.json
	scss/_carousel.scss
	scss/_close.scss
	scss/_forms.scss
	test-infra/npm-shrinkwrap.json
2015-01-03 20:08:58 -08:00
Chris Rebert
df38cdad32 Merge pull request #15472 from twbs/address-15288
Document that responsive tables use `overflow-y: hidden`
2014-12-31 16:12:38 -08:00
Chris Rebert
c328b6254f Merge pull request #15473 from twbs/autoprefixer-docs
Document that Autoprefixer is required
2014-12-31 16:11:42 -08:00
Mark Otto
1a932b7e02 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2014-12-31 10:39:56 -08:00
Nate Eagleson
1b375420fa Remove extra word from disabling-responsiveness.html 2014-12-30 21:48:34 -05:00
Chris Rebert
4f1000d772 Document that Autoprefixer is required
Closes #14937
[skip sauce]
2014-12-30 18:34:48 -08:00
Chris Rebert
511f37dc04 Document that responsive tables use overflow-y: hidden
Closes #15288

[skip sauce]
2014-12-30 18:17:09 -08:00
Chris Rebert
5ccfd98c31 Document the VERSION property of the jQuery plugins; fixes #15202
[skip sauce]
2014-12-30 13:32:28 -08:00
Chris Rebert
c6ad3a8d6d update docs to use .{tooltip,popover}-{left,right,top,bottom} 2014-12-29 12:33:06 -08:00
Chris Rebert
6a5bc63649 rename .arrow => .popover-arrow 2014-12-29 12:33:06 -08:00
Mark Otto
489f2bc1fa no results in search form accounted for 2014-12-25 22:40:25 -08:00
Mark Otto
18e08e777b add custom forms, stub out examples for radios and checkboxes 2014-12-24 04:13:23 -08:00
Mark Otto
73e59c26e6 basic docs search 2014-12-24 02:44:38 -08:00
Mark Otto
0972c64e7a fix sidenav links 2014-12-23 13:23:03 -08:00
Chris Rebert
3406a5c97a Remove holder.js references from syntax-highlighted example HTML
Our use of Holder.js in the docs is a mere implementation detail.
Don't want to confuse people into thinking Holder.js
is somehow required by the Thumbnail component.

[skip sauce]
2014-12-22 14:55:41 -08:00
Mark Otto
36a99c68bf restore configbridge to footer files, update paths 2014-12-19 00:35:54 -08:00
Mark Otto
d1a766494e fix paths and baseurl action 2014-12-19 00:24:09 -08:00
Chris Rebert
f24a1cb28d remove remaining remnants of the Customizer 2014-12-17 13:44:52 -08:00
Mark Otto
4945e370f0 fixes #15340: mention in docs that most selects can't change border-radius 2014-12-14 16:59:47 -08:00
Mark Otto
b7be72c86c Merge pull request #15348 from bastienmoulia/master
Correction in the documentation, add the brand-primary true color in comment and woff2 glyphicons
2014-12-14 16:28:53 -08:00
Patrick H. Lauke
2d41894ce5 Expand/clarify advice about skip links 2014-12-14 21:27:58 +00:00
Julian Thilo
a940e1fdd6 Revert "fix typo in carousel doc" 2014-12-12 14:24:50 +01:00
Bastien
c8855a7ad1 Add glyphicons fonts in woff2 2014-12-12 14:22:41 +01:00
Emmanuel Gautier
f0be5e0409 fix typo 2014-12-12 12:53:50 +01:00
Bastien
bc36e31280 Add new brand-primary color in the doc and the true color in comment 2014-12-12 11:07:16 +01:00
Bastien
5b8ba0cb4d 200 to 260 glyphicons in the doc 2014-12-12 10:58:21 +01:00
XhmikosR
4e27c48248 Run grunt. 2014-12-11 08:24:31 +02:00