root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 11 Packages Projects Releases Wiki Activity
10,308 Commits 106 Branches 92 Tags 673 MiB
Commit Graph

255 Commits

Author SHA1 Message Date
Mark Otto 16dbdbd7a2 Merge branch 'master' into v3.3.0 
Conflicts:
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
 2014-10-29 11:56:48 -07:00
Mark Otto 5429e71401 fixes #14913: badges in list group shouldn't have text shadow 2014-10-29 10:27:18 -07:00
Mark Otto 22f9c8fc0a grunt 2014-10-29 08:58:51 -07:00
Mark Otto 94b59b57d6 version bump 2014-10-29 08:56:20 -07:00
Mark Otto a75c6d84e1 grunt 2014-10-28 23:08:42 -07:00
Mark Otto dcee894a8c grunt 2014-10-26 22:57:38 -07:00
Mark Otto 783eced7ab follow up fix for #14837 /cc @hnrch02 2014-10-25 20:20:24 -07:00
Mark Otto 2c2564faef Fixes #14736: Reverts the remaining progress bar min value overrides from #12848 2014-10-25 19:10:03 -07:00
Mark Otto 3fcd65af41 Fixes #14806: reset the text-shadow in the themed buttons 2014-10-25 18:57:27 -07:00
Mark Otto 41a26ced24 Fixes #14814: Use the link active bg variables for theme navbar gradients 2014-10-25 18:27:40 -07:00
Mark Otto 38217ee405 Merge branch 'pr/14801' 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-10-25 18:16:40 -07:00
Mark Otto 6e3c55a115 grunt 2014-10-25 18:13:50 -07:00
Mark Otto a0e6bd96de grunt 2014-10-25 17:54:06 -07:00
XhmikosR db550a9235 Run `grunt`. 2014-10-25 14:12:21 +03:00
Nicole Sullivan 919b4ccb15 Fixes #14799: Add vertical alignment of image in media component 
Signed-off-by: Jenn Dodd <jedodd@pivotal.io>
 2014-10-23 18:48:18 -04:00
Heinrich Fenkart 2bc5277b44 grunt 2014-10-22 21:04:18 +02:00
XhmikosR 9f82f27b9d Update less/print.less to the latest html5 bp version. 
Also, keep the html5 boilerplate link in the built CSS.
 2014-10-13 13:32:39 +03:00
Heinrich Fenkart 4a89fd02b7 grunt 2014-10-10 08:35:56 +02:00
XhmikosR 07f1d89dd2 Run `grunt`. 2014-10-07 19:57:01 +03:00
Mark Otto f75fc32462 grunt 2014-10-02 22:21:02 -07:00
Mark Otto 76268c4b96 more grunt 2014-10-02 21:21:49 -07:00
Mark Otto 12091b9567 Fixes #14711: Account for list groups in collapsing panels 2014-10-02 21:19:20 -07:00
Mark Otto 121b204b14 grunt 2014-09-26 13:48:31 -07:00
Mark Otto 8e25695d09 Fixes #14687: Include video element in responsive embed 2014-09-26 13:45:28 -07:00
Heinrich Fenkart 7ce6824748 grunt 2014-09-25 02:23:48 +02:00
Mark Otto 4969c2055d grunt 2014-09-22 14:27:13 -07:00
Mark Otto e33922eb06 grunt 2014-09-18 19:11:47 -07:00
Mark Otto 6cec0399d0 grunt 2014-09-08 11:40:23 -07:00
Mark Otto f2783fbf83 Fixes #14319: Prevent jumbotron reflow by ensuring padding of .container isn't interferred with by .jumbotron side padding 2014-09-08 10:29:45 -07:00
XhmikosR 5b9fcea9f2 Run `grunt`. 2014-09-08 09:04:33 +03:00
Mark Otto 783e001786 grunt 2014-08-27 23:35:54 -07:00
Mark Otto f4eefd28d1 Merge branch 'master' into sr_friendly_hidden_content 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
 2014-08-27 22:38:46 -07:00
Mark Otto 1ebc7e62a8 grunt 2014-08-27 22:37:10 -07:00
Mark Otto f5890adb17 grunt 2014-08-27 22:25:24 -07:00
Mark Otto 0140198699 grunt 2014-08-23 13:46:28 -07:00
Mark Otto 32a6d9b404 Full grunt 2014-08-23 13:43:41 -07:00
Mark Otto 4fc96e8029 grunt 2014-08-23 13:35:22 -07:00
Mark Otto 14e8ec2514 unfuck all that because lol dependencies 2014-08-04 10:14:11 -07:00
Heinrich Fenkart b10b373c60 Follow-up to #13074: use spec syntax instead of deprecated mixins 2014-08-04 06:19:42 +02:00
Mark Otto 6424acf69a Fixes #14234: Reset the hack IE8-10 with another hack just for IE11 for temporal inputs and line-height 2014-08-02 21:16:32 -07:00
Mark Otto 9d0872b748 Fixes #14251: Remove the -webkit-overflow-scrolling to prevent Safari from screwing up widths 2014-08-02 19:05:46 -07:00
Mark Otto 67d39404a2 grunt 2014-08-02 18:41:00 -07:00
Mark Otto b9e6848dc8 Fixes #14253: Add borders for tables that follow bodies in panels 2014-08-02 13:55:02 -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
Mark Otto 98d693ba7b Fixes #14142: Adding horizontal padding to captions in tables in panels. 2014-07-23 21:03:46 -07:00
Mark Otto 078aafe7fd Fixes #14221: Make .form-control-static work in inline forms as well 2014-07-23 20:54:07 -07:00
Mark Otto 6dde491ddf Fixes #14168: bold nested kbd elements 2014-07-23 20:49:47 -07: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
XhmikosR 8d435cbb3c Run `grunt`. 2014-07-22 08:25:41 +03:00
Mark Otto 8c586a8e3e Fixes #14074: Make open dropdown nav links in navbar use gradients 2014-07-12 17:59:02 -07:00