0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-13 01:08:58 +01:00
Commit Graph

11181 Commits

Author SHA1 Message Date
Chris Rebert
0bd8c7cb6a grunt dist 2015-01-05 11:41:34 -08:00
Chris Rebert
0075de8ee8 Merge pull request #40 from twbs/bye-affix
Remove affix from docs & CSS; add migration guidance
2015-01-05 11:38:38 -08:00
Chris Rebert
00e6fae8fb Remove affix from docs & CSS; add migration guidance 2015-01-05 11:36:51 -08:00
Chris Rebert
6cb417616c Merge pull request #26 from twbs/autoprefixer-bump-mac-safari
bump min OS X Safari in Autoprefixer config to v7.1
2015-01-05 11:20:30 -08:00
Mark Otto
615eb99067 fix broke shit, recompile 2015-01-03 20:16:46 -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
Mark Otto
31610258de Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-01-03 16:00:45 -08:00
Mark Otto
c6af78e8a4 grunt 2015-01-01 12:13:28 -08:00
Mark Otto
a6053b573c override the box-shadows on active, checked, and indeterminate states 2015-01-01 12:13:24 -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
Bootstrap's Grunt bot
57260f16b3 automatic grunt dist 2015-01-01 19:02:43 +00:00
Mark Otto
401889a8dc Merge pull request #15477 from ZDroid/2015
Happy New Year
2015-01-01 10:35:19 -08:00
Chris Rebert
4e8f769d44 fix typo in comment 2015-01-01 00:02:21 -08:00
Bootstrap's Grunt bot
548d46eb8b automatic grunt dist 2015-01-01 03:01:40 +00:00
Zlatan Vasović
576230b92a Happy New Year 🎅 2015-01-01 01:23:48 +01: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
Bootstrap's Grunt bot
6c383c5102 automatic grunt dist 2015-01-01 00:02:16 +00: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
03e39251fa larger hr border width so it shows up 2014-12-31 10:20:29 -08:00
Mark Otto
b873edce8e tweak and improve jumbotrons 2014-12-31 10:20:12 -08:00
Mark Otto
49ac4ea0fa fix some source code for custom forms 2014-12-31 10:07:34 -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
Mark Otto
b4ac87c901 Merge pull request #15474 from NateEag/patch-1
Remove extra word from disabling-responsiveness.html
2014-12-31 09:15:36 -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
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
714cd6b608 Merge pull request #15470 from twbs/document-version
Document the VERSION property of the jQuery plugins;
2014-12-30 13:32:44 -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
9b4296b565 rm note about Safari<7.1 / iOS<8.0 percent rounding bug 2014-12-30 12:49:46 -08:00
Chris Rebert
473c75dc4c bump min OS X Safari in Autoprefixer config to v7.1 2014-12-30 12:49:46 -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
Heinrich Fenkart
c3e6111eef Switch to shields.io for badges in README
Closes #15380
[ci skip]
2014-12-30 11:48:08 -08:00
Bootstrap's Grunt bot
5a35555a72 automatic grunt dist 2014-12-30 12:31:08 +00:00
Chris Rebert
2166f238d7 Merge pull request #15456 from twbs/bump-clean-css
Bump grunt-contrib-cssmin to ~0.11.0
2014-12-30 00:12:38 -08:00
XhmikosR
13d7cc7d4c Use a glyphicon instead of the unicode character. 2014-12-30 09:56:24 +02:00
Chris Rebert
b0437f8ea9 Merge pull request #15466 from twbs/revert-14189
Revert #14189 to fix #15168
2014-12-29 20:43:13 -08:00
Chris Rebert
adaabab81b Revert "Allow multiple delegated tooltip selectors on a node"
This reverts commit 1b3237629a.
This reverts PR #14189 because it caused major regressions.

Fixes #15168.

We'll try to revisit #14167's feature request in Bootstrap v4.

[skip validator]
2014-12-29 20:08:22 -08:00
Chris Rebert
32cb071594 Remove semicolons from #15425 because fat 2014-12-29 18:34:35 -08: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