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

157 Commits

Author SHA1 Message Date
Mark Otto
663576a7ae Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	docs/assets/css/docs.min.css
2015-05-27 15:49:55 -07:00
Mark Otto
01d1090ed2 grunt action 2015-03-09 14:08:20 +00:00
Mark Otto
c16fee5efd Merge branch 'master' into v4
Conflicts:
	.travis.yml
	Gruntfile.js
	bower.json
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.js
	dist/js/bootstrap.min.js
	docs/_data/glyphicons.yml
	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/labels.html
	docs/_includes/components/list-group.html
	docs/_includes/components/media.html
	docs/_includes/components/navs.html
	docs/_includes/components/panels.html
	docs/_includes/components/progress-bars.html
	docs/_includes/components/thumbnails.html
	docs/_includes/components/wells.html
	docs/_includes/css/buttons.html
	docs/_includes/css/forms.html
	docs/_includes/css/helpers.html
	docs/_includes/css/images.html
	docs/_includes/css/less.html
	docs/_includes/customizer-variables.html
	docs/_includes/getting-started/accessibility.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/community.html
	docs/_includes/getting-started/examples.html
	docs/_includes/getting-started/grunt.html
	docs/_includes/getting-started/license.html
	docs/_includes/getting-started/template.html
	docs/_includes/header.html
	docs/_includes/js/affix.html
	docs/_includes/js/alerts.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/scrollspy.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/js/transitions.html
	docs/_includes/nav/javascript.html
	docs/_layouts/default.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/assets/js/vendor/FileSaver.js
	docs/assets/js/vendor/autoprefixer.js
	docs/assets/js/vendor/uglify.min.js
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/js/bootstrap.min.js
	docs/examples/blog/index.html
	docs/examples/carousel/index.html
	docs/examples/cover/index.html
	docs/examples/dashboard/index.html
	docs/examples/narrow-jumbotron/narrow-jumbotron.css
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/non-responsive/non-responsive.css
	docs/examples/theme/index.html
	grunt/configBridge.json
	js/affix.js
	js/carousel.js
	js/collapse.js
	js/dropdown.js
	js/modal.js
	js/popover.js
	js/scrollspy.js
	js/tab.js
	js/tests/unit/affix.js
	js/tests/unit/button.js
	js/tests/unit/carousel.js
	js/tests/unit/modal.js
	js/tests/unit/tooltip.js
	js/tooltip.js
	less/badges.less
	less/glyphicons.less
	less/type.less
	less/variables.less
	package.json
	scss/_dropdown.scss
	scss/_forms.scss
	test-infra/npm-shrinkwrap.json
2015-03-01 13:44:10 -08:00
XhmikosR
05b444aee3 Run grunt. 2015-02-26 11:30:23 +02:00
fat
1e9e3316b6 kill affix 2015-02-11 11:40:57 -08:00
XhmikosR
8fd5718e71 Run grunt. 2015-01-30 15:13:24 +02:00
Mark Otto
faedb7fec4 grunt 2015-01-19 14:55:25 -08:00
Mark Otto
c683e7dea7 bump versions 2015-01-19 08:32:13 -08:00
Mark Otto
22b79dae3c grunt 2015-01-18 12:22:43 -08:00
Mark Otto
d4f1331e51 grunt 2015-01-15 15:51:02 -08:00
Mark Otto
615eb99067 fix broke shit, recompile 2015-01-03 20:16:46 -08:00
Mark Otto
e4fa95eb57 grunt dist 2015-01-01 12:02:02 -08:00
Mark Otto
94753bc3ec grunt 2014-12-18 20:19:53 -08:00
XhmikosR
7ea49019b8 Run grunt. 2014-11-24 09:53:42 +02:00
Heinrich Fenkart
c2abfc0a44 grunt 2014-11-17 18:57:02 +01:00
Mark Otto
9a7e365c2c bump version to v3.3.1 2014-11-12 09:03:16 -08:00
Mark Otto
ff386147ce grunt 2014-11-11 20:25:09 -08:00
Heinrich Fenkart
e27dc5d71e grunt 2014-11-05 01:56:18 +01:00
Heinrich Fenkart
db90ff6df7 grunt 2014-11-05 01:45:16 +01:00
Heinrich Fenkart
6020bb06f2 grunt 2014-11-05 00:36:52 +01:00
Heinrich Fenkart
b8c3c5c19b grunt 2014-10-30 04:45:04 +01:00
Mark Otto
94b59b57d6 version bump 2014-10-29 08:56:20 -07:00
Heinrich Fenkart
bf2ad00ee0 grunt 2014-10-29 04:56:02 +01:00
Heinrich Fenkart
94b544c229 grunt 2014-10-29 04:44:52 +01:00
Heinrich Fenkart
a7f58a8356 grunt 2014-10-29 04:30:31 +01:00
Mark Otto
a5497da5be grunt 2014-10-27 20:37:17 -07:00
Heinrich Fenkart
2cbb1d9374 grunt 2014-10-26 04:39:49 +01:00
Heinrich Fenkart
5f2e6fa58b grunt 2014-10-26 03:53:10 +01:00
Heinrich Fenkart
44cc763229 grunt 2014-10-26 03:17:19 +01:00
Mark Otto
9bf9aab132 grunt 2014-10-25 18:29:15 -07:00
Heinrich Fenkart
e9d6f256c2 grunt 2014-10-26 01:59:25 +02:00
Heinrich Fenkart
51f1f58be8 grunt 2014-10-23 06:39:51 +02:00
Heinrich Fenkart
e0cea19cbc grunt 2014-10-23 05:23:29 +02:00
Heinrich Fenkart
40c309b39a grunt 2014-10-22 21:39:37 +02:00
Heinrich Fenkart
2bc5277b44 grunt 2014-10-22 21:04:18 +02:00
Heinrich Fenkart
930c422f22 grunt 2014-10-22 04:28:16 +02:00
Heinrich Fenkart
4a89fd02b7 grunt 2014-10-10 08:35:56 +02:00
Heinrich Fenkart
5bb08c50fa grunt 2014-10-03 08:17:49 +02:00
Mark Otto
f75fc32462 grunt 2014-10-02 22:21:02 -07:00
Mark Otto
12091b9567 Fixes #14711: Account for list groups in collapsing panels 2014-10-02 21:19:20 -07:00
Heinrich Fenkart
0d04dcaebd grunt 2014-09-26 00:10:41 +02:00
Heinrich Fenkart
7ce6824748 grunt 2014-09-25 02:23:48 +02:00
Heinrich Fenkart
36ebec5e76 grunt 2014-09-22 21:47:24 +02:00
Mark Otto
75204aeafa grunt 2014-09-18 18:33:52 -07:00
Heinrich Fenkart
5a5cf224e1 grunt 2014-09-16 05:59:09 +02:00
Heinrich Fenkart
d0f76e416c grunt 2014-09-13 04:46:31 +02:00
Heinrich Fenkart
0a4c39dc40 Teh grunt
https://www.youtube.com/watch?v=L-4VxEtWyRo
2014-09-13 03:15:04 +02:00
Heinrich Fenkart
0cf94b82ee grunt 2014-09-13 02:42:18 +02:00
Heinrich Fenkart
cabace78da G R U N T 2014-09-11 23:43:27 +02:00
Heinrich Fenkart
9b9e2f5d13 grunt and missing new line 2014-09-09 01:23:48 +02:00
Heinrich Fenkart
9702579aeb run grunt 2014-09-09 00:12:33 +02:00
Heinrich Fenkart
c9602c29c3 grunt 2014-09-08 22:41:45 +02:00
Mark Otto
48a1308e5d grunt 2014-09-08 10:23:25 -07:00
XhmikosR
5b9fcea9f2 Run grunt. 2014-09-08 09:04:33 +03:00
Mark Otto
4fc96e8029 grunt 2014-08-23 13:35:22 -07:00
Mark Otto
6a0eb4e6bd grunt 2014-08-23 12:19:36 -07:00
Chris Rebert
e7d5905f38 grunt 2014-08-17 15:44:25 -07:00
Mark Otto
feed9aed5b Fixes #13202: Always use overflow: auto; on .table-responsive to prevent content breaking out of containers 2014-08-02 13:05:11 -07:00
XhmikosR
de1d8c36ad Run grunt. 2014-08-01 19:49:54 +03:00
Mark Otto
5713bd74d6 Fixes #12669 again: Redeclare the line-heights again for date inputs in IE8+ 2014-07-23 20:32:05 -07:00
Chris Rebert
49519e9816 grunt dist 2014-07-21 00:35:41 -07:00
XhmikosR
643effe382 Run grunt. 2014-07-09 10:24:39 +03:00
Mark Otto
a0d8d56593 grunt 2014-07-07 00:59:51 -07:00
Mark Otto
354d423668 grunt 2014-07-06 15:08:37 -07:00
Mark Otto
3c99de9764 grunt 2014-07-05 19:57:15 -07:00
XhmikosR
2a47034598 Copy all files in docs/dist.
Now we are on par with what we have on the gh-pages dist/ folder.
2014-07-01 07:38:38 +03:00
Mark Otto
ff6b279b3c bump to v3.2.0 2014-06-26 09:13:24 -07:00
XhmikosR
15c63fa137 Run grunt. 2014-06-24 19:01:40 +03:00
XhmikosR
6d45f733e5 Run grunt. 2014-06-18 13:16:32 +03:00
Chris Rebert
8bee6549ad grunt dist 2014-06-17 18:23:14 -07:00
Mark Otto
b1a9168b15 grunt dist 2014-06-11 18:13:50 -07:00
Mark Otto
57bd8f943b grunt 2014-06-10 22:47:25 -07:00
Mark Otto
9a51410fd3 grunt 2014-06-10 18:11:26 -07:00
Mark Otto
9e1652aa50 grunt 2014-06-09 22:25:24 -07:00
Mark Otto
85cde774b9 remove max-width: 100%; from table and place it on .table 2014-06-08 16:54:05 -07:00
Mark Otto
1e3b93804f grunt 2014-06-08 11:18:59 -07:00
XhmikosR
03a8949d7c Run grunt. 2014-06-06 01:23:07 +03:00
Chris Rebert
8e568a8e36 grunt dist 2014-05-23 15:49:13 -07:00
Chris Rebert
1340a491e5 grunt dist 2014-05-21 23:37:06 -07:00
Mark Otto
f39b272fed grunt 2014-05-12 21:19:01 -07:00
Mark Otto
7e1f2994d1 grunt dist 2014-05-12 21:15:27 -07:00
Mark Otto
0d1018cb2f grunt 2014-05-12 19:53:12 -07:00
Mark Otto
f5513fd30e nuke rtl 2014-05-12 19:47:53 -07:00
Chris Rebert
cb2ef1eff4 grunt dist 2014-05-08 16:35:03 -07:00
Mark Otto
b217357252 grunt dist 2014-04-30 19:35:47 -07:00
XhmikosR
30b07b942e Run grunt. 2014-04-26 08:35:48 +03:00
Chris Rebert
eaddbd92bb grunt dist 2014-04-20 16:19:13 -07:00
Mark Otto
06fb9406bd grunt dist 2014-04-17 00:56:22 -07:00
XhmikosR
2f0f8ec6d1 Run grunt dist. 2014-04-09 10:02:34 +03:00
Mark Otto
de86b36b50 grunt dist 2014-04-08 23:59:17 -07:00
Tyler Cipriani
0907244256 Modal body shift fix for IE10/11
Closes #13103 by merging it.
2014-03-28 23:45:22 -07:00
Mark Otto
6951b48e65 grunt 2014-03-24 20:01:46 -07:00
Mark Otto
ce013440e7 grunt 2014-03-24 19:31:12 -07:00
Mark Otto
21084192b6 Fixes #13079: Scope .open class in button variant mixin to immediate children 2014-03-24 19:08:05 -07:00
Mark Otto
43cf003f9a Update gruntfile to point to new customizer nav, run grunt 2014-03-16 20:40:30 -07:00
fat
dd7cab84f6 build 2014-03-16 18:44:58 -07:00
fat
4d96e69a55 fixes #9836 2014-03-08 19:45:38 -08:00
fat
e9cced72fd fix #9342 2014-03-08 19:20:47 -08:00
Mark Otto
8526adf69c grunt 2014-03-06 20:33:10 -08:00
Mark Otto
4b622c60c1 grunt 2014-02-21 17:42:25 -08:00