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

5194 Commits

Author SHA1 Message Date
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
Mark Otto
c6af78e8a4 grunt 2015-01-01 12:13:28 -08:00
Mark Otto
e4fa95eb57 grunt dist 2015-01-01 12:02:02 -08:00
Mark Otto
401ace65f4 add indeterminate checkbox support 2015-01-01 12:01:55 -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
Chris Rebert
45f5841785 Merge pull request #15464 from twbs/address-15419
Address #15419
2014-12-31 16:11:04 -08:00
Mark Otto
82403407d8 Merge pull request #55 from twbs/xl-size
account for XL size tier in grid docs
2014-12-31 10:49:33 -08:00
Mark Otto
fb176a97e1 change values, remove grid column size row 2014-12-31 10:46:50 -08:00
Mark Otto
1a932b7e02 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2014-12-31 10:39:56 -08:00
Mark Otto
a5e127fd16 grunt 2014-12-31 10:37:23 -08:00
Mark Otto
b873edce8e tweak and improve jumbotrons 2014-12-31 10:20:12 -08:00
XhmikosR
1b8f00b389 Merge pull request #15292 from twbs/customize-icon
Use a glyphicon instead of the unicode character.
2014-12-31 19:17:46 +02: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
b9de4b7392 remove lingering reference to IE8 in the Carousel docs 2014-12-30 16:15:02 -08:00
Chris Rebert
626f30fd6b remove lingering references to Less in the docs 2014-12-30 16:14:32 -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
edb6c07254 "plugins" => "third-party widgets" 2014-12-30 12:48:12 -08:00
Chris Rebert
0a1742ce8e remove unnecessary reference to Bootstrap v3 2014-12-30 12:46:25 -08:00
Chris Rebert
2e815e891b Fix @mdo's grammar 2014-12-30 12:45:24 -08:00
XhmikosR
13d7cc7d4c Use a glyphicon instead of the unicode character. 2014-12-30 09:56:24 +02:00
Chris Rebert
c6affe79b7 account for XL size tier in grid docs 2014-12-29 18:27:41 -08:00
Chris Rebert
35073fc128 grunt build-glyphicons-data 2014-12-29 17:01:05 -08:00
Chris Rebert
b342de4fa3 Merge pull request #22 from twbs/alert-heading
Use .alert-heading instead of hardcoding <h4>
2014-12-29 16:04:00 -08:00
Chris Rebert
54b03c27d2 Merge pull request #43 from twbs/popover-arrow
rename .arrow => .popover-arrow
2014-12-29 16:01:07 -08:00
Chris Rebert
a0dbe55678 add missing global declaration for SimpleJekyllSearch 2014-12-29 12:42:31 -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
7e25a958a2 sidenav for custom forms 2014-12-25 17:50:41 -08:00
Mark Otto
b92534c632 improve code quality on custom forms 2014-12-25 15:40:24 -08:00
Mark Otto
dacac2ab72 select menu custom form element 2014-12-24 21:48:49 -08:00
Mark Otto
57d15cb4f8 add more explanation text 2014-12-24 17:00:43 -08:00
Mark Otto
cd60cf3386 custom forms: checkbox and radio stacked option 2014-12-24 15:45:37 -08:00
Gleb Mazovetskiy
c0c16edc41 Update styles for Ruby Sass compat 2014-12-24 22:22:15 +02:00
Gleb Mazovetskiy
0d96695f5e Docs: Use another Sass compiler 2014-12-24 22:21:39 +02:00
Mark Otto
18e08e777b add custom forms, stub out examples for radios and checkboxes 2014-12-24 04:13:23 -08:00
Mark Otto
e1bb907050 rearrange contents docs--type, tables, images, forms, etc--into own docs section 2014-12-24 03:26:51 -08:00
Mark Otto
73e59c26e6 basic docs search 2014-12-24 02:44:38 -08:00
Mark Otto
952be04cb0 grunt 2014-12-23 22:57:03 -08:00
Mark Otto
6011b4678b rearrange some docs css 2014-12-23 22:56:45 -08:00
Mark Otto
b500713dd2 missed an end tag 2014-12-23 14:11:10 -08:00
Mark Otto
b67b2c7f49 fix up helpers docs again for .invisible and [hidden] 2014-12-23 14:00:34 -08:00
Mark Otto
1f5a75e2d7 increase spacing in docs h2s 2014-12-23 13:56:11 -08:00
Mark Otto
ca53c93f3d no need to mention jquery in the layout scaffolding docs 2014-12-23 13:26:37 -08:00
Mark Otto
e63a0acd3b fix some getting started links 2014-12-23 13:25:59 -08:00
Mark Otto
0972c64e7a fix sidenav links 2014-12-23 13:23:03 -08:00
Mark Otto
491503e4ae audit helpers docs: fix mixins formatting for scss conversion 2014-12-23 04:53:19 -08:00