root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity
9,489 Commits 109 Branches 92 Tags 664 MiB
Commit Graph

198 Commits

Author SHA1 Message Date
Mark Otto 4045740c54 Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-06-25 16:57:22 -07:00
Mark Otto e40df7cfac fixes #13912: make radios/checkboxes work with inline forms again 2014-06-25 16:56:36 -07:00
XhmikosR 4abb095783 Run `grunt`. 
Revert a991cd572c.
 2014-06-25 02:07:17 +03:00
Chris Rebert a991cd572c grunt dist; closes #13914 2014-06-24 15:06:47 -07:00
XhmikosR 15c63fa137 Run `grunt`. 2014-06-24 19:01:40 +03:00
Mark Otto df7cfe8652 Fixes #13903: Restore side padding on .btn-block 2014-06-23 10:38:45 -07:00
Mark Otto e98fc373e3 Fixes #13872 more: add overrides for lg and sm input modifiers 2014-06-20 13:24:14 -07:00
Mark Otto 1e53dcd137 Fixes #13872: Always apply padding to .form-control-static for that vertical alignment 2014-06-19 18:33:41 -07:00
Mark Otto 8bd4163ad4 fixes #13881: restore existing striped progress bar behavior with theme styles 2014-06-19 18:14:56 -07:00
Mark Otto a4fa8d07c8 grunt dist 2014-06-19 15:24:24 -07:00
XhmikosR abe7afd87a Run `grunt`. 2014-06-19 12:58:34 +03:00
Mark Otto 162a27f67a grunt 2014-06-18 23:50:16 -07:00
Mark Otto 99f176e7ec rewrite striped and active to deprecate the parent selectors, change the docs 2014-06-18 22:35:05 -07:00
Mark Otto d222c21f84 grunt 2014-06-18 22:24:56 -07:00
Mark Otto 74982cf101 grunt 2014-06-18 22:23:31 -07:00
Mark Otto 74a264fb98 fixes #13021: add .form-group-sm/-lg 2014-06-18 18:19:17 -07:00
Mark Otto 46e8a5817d fixes #10073: add width: 100%; for ie10 and below to size svg.img-responsive correctly 2014-06-18 17:34:09 -07:00
Mark Otto fdf174e498 grunt dist 2014-06-18 15:46:38 -07: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 f09d6b7a98 grunt 2014-06-10 23:15:09 -07:00
Mark Otto 5c1357b3e9 grunt 2014-06-10 22:58:21 -07:00
Mark Otto 7bcd78847f grunt 2014-06-10 22:51:17 -07:00
Mark Otto 57bd8f943b grunt 2014-06-10 22:47:25 -07:00
Mark Otto dcbe484a09 New text align class, .text-nowrap, for preventing text from breaking to new lines. Applies it to the grid docs table. 2014-06-10 21:20:34 -07:00
Mark Otto 631e04b6fc Fixes #13548: Use position: absolute; to fix checkbox and radio line-height problems that were introduced after #13003 2014-06-10 20:50:58 -07:00
Mark Otto c0e82accad grunt 2014-06-10 20:17:22 -07:00
Mark Otto 9a51410fd3 grunt 2014-06-10 18:11:26 -07:00
Mark Otto 4aca4cf866 grunt for table change 2014-06-10 00:26:20 -07:00
Mark Otto e06970948b Fixes #13616: Add custom gutter support to containers 2014-06-10 00:24:23 -07:00
Mark Otto 9e1652aa50 grunt 2014-06-09 22:25:24 -07:00
Mark Otto 8d9ef8f0a1 Addresses part of #13643: Correct webkit-linear-gradient syntax in horizontal gradients 2014-06-08 23:02:16 -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 5dbfdd47c5 fixes #13375 2014-06-08 14:08:06 -07:00
Mark Otto d1872b4c98 Merge branch 'master' into pr/13736 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
 2014-06-08 13:57:44 -07:00
Mark Otto 5cd72ce230 grunt 2014-06-08 13:55:40 -07:00
Mark Otto 34891de173 grunt 2014-06-08 11:19:35 -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
Mark Otto d66b65ddde Merge branch 'master' into icon_paths 
Conflicts:
	dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.css.map
 2014-05-22 23:01:42 -07:00
Mark Otto fab9ab8fe9 Reset the padding on radio/checkbox labels in form-inline 2014-05-22 18:42:21 -07:00
Chris Rebert 1340a491e5 grunt dist 2014-05-21 23:37:06 -07:00
Mark Otto 91d51d3fba Merge branch 'master' into icon_paths 2014-05-20 23:21:12 -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 c42cd8164c Merge branch 'master' into icon_paths 
Conflicts:
	dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.css.map
 2014-05-12 20:26:23 -07:00
Mark Otto d4c7248749 grunt dist 2014-05-12 20:26:01 -07:00
Mark Otto 31956be6ef Merge branch 'master' into icon_paths 
Conflicts:
	dist/css/bootstrap-rtl.css
	dist/css/bootstrap.css.map
	dist/js/bootstrap.min.js
	docs/dist/css/bootstrap.css.map
	docs/dist/js/bootstrap.min.js
 2014-05-12 19:57:49 -07:00