root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 11 Packages Projects Releases Wiki Activity
22,956 Commits 107 Branches 91 Tags 669 MiB
Commit Graph

1150 Commits

Author SHA1 Message Date
Mark Otto c7b8451cdc grunt 2016-11-26 11:16:53 -08:00
Mark Otto cb294854a3 grunt 2016-11-26 00:58:11 -08:00
Mark Otto 8a7ce25cf1 grunt 2016-11-25 17:29:28 -08:00
Mark Otto 49be9bc63a grunt 2016-11-25 15:00:23 -08:00
Mark Otto 3cfd40782c grunt 2016-11-25 14:20:49 -08:00
Mark Otto 5b151eb891 grunt 2016-11-25 13:55:34 -08:00
Mark Otto 573e029feb grunt 2016-11-16 20:42:40 -08:00
Mark Otto 93ba9ac629 grunt 2016-11-09 20:00:16 -08:00
Mark Otto cd5c7a2263 grunt 2016-10-31 21:36:10 -07:00
Mark Otto 76d53404b5 grunt 2016-10-31 21:14:23 -07:00
Mark Otto d1171ac44a grunt 2016-10-30 15:21:53 -07:00
Mark Otto d86d580d26 grunt 2016-10-30 13:40:11 -07:00
Mark Otto c9dc04b4f5 grunt 2016-10-30 13:37:11 -07:00
Mark Otto b071de65c7 grunt 2016-10-28 19:28:41 -07:00
Mark Otto cecf0db2ce grunt 2016-10-27 22:29:10 -07:00
Mark Otto 96d8553bec grunt 2016-10-27 22:11:22 -07:00
Mark Otto fde7101f13 grunt 2016-10-27 20:03:56 -07:00
Mark Otto 9dbfc90eae grunt 2016-10-27 09:51:22 -07:00
Mark Otto 8ff7edaab4 version bump to alpha 5 2016-10-19 08:27:41 -07:00
Mark Otto dd22d99254 grunt 2016-10-19 01:18:28 -07:00
Mark Otto 1543738890 grunt 2016-10-18 20:03:42 -07:00
Mark Otto 6d6538fc81 grunt 2016-10-16 19:44:11 -07:00
Mark Otto 4493701ee2 grunt 2016-10-09 20:26:49 -07:00
Mark Otto ef5bbffd55 grunt 2016-10-09 19:55:58 -07:00
Mark Otto 571e86e770 grunt 2016-10-09 17:26:51 -07:00
Mark Otto 8d162553fa grunt 2016-10-09 15:02:49 -07:00
Mark Otto 6c867667a1 Merge branch 'v4-dev' into v4-utils 2016-10-09 14:36:43 -07:00
Mark Otto a2a53cb8c5 grunt 2016-10-09 12:39:56 -07:00
Mark Otto 2919c34071 grunt 2016-10-02 20:39:19 -07:00
Mark Otto 8a85f93aba grunt 2016-10-02 19:40:39 -07:00
Mark Otto 13e4348dfd grunt 2016-09-11 23:52:47 -07:00
Mark Otto 0b36debc5f grunt 2016-09-11 23:50:50 -07:00
Mark Otto a27a488002 woof, first grunt after building all the dist lol 2016-09-11 22:34:25 -07:00
Mark Otto cbd2ac0ee7 grunt 2016-09-11 20:51:07 -07:00
Mark Otto e9bc67db5b grunt 2016-09-07 21:07:52 -07:00
Mark Otto 5495a4b3d3 versions 2016-09-05 12:41:44 -07:00
Mark Otto 59daf9f958 grunt 2016-09-05 12:37:47 -07:00
Mark Otto d6584f13bf grunt 2016-09-04 17:52:47 -07:00
Mark Otto 93522e3ae6 grunt 2016-09-04 17:44:53 -07:00
Mark Otto 9128c1adff grunt 2016-08-21 17:10:20 -07:00
Mark Otto 8e4f3fe7b9 grunt 2016-08-01 20:26:06 -07:00
Mark Otto 24e992a6ff bump versions 2016-07-27 09:31:24 -07:00
Mark Otto cf45a82068 grunt 2016-07-26 20:16:28 -07:00
Mark Otto 7e8182e9a6 grunt 2016-07-25 17:10:21 -07:00
Mark Otto 38312640df grunt 2016-07-23 21:04:37 -07:00
Mark Otto 2ab662095b grunt 2016-07-23 20:40:41 -07:00
Chris Rebert 0f3d427bbd grunt 
[ci skip]
 2016-06-04 18:21:15 -07:00
Mark Otto 2a36b4b320 grunt 2016-05-11 23:30:22 -07:00
Mark Otto 1f25326926 grunt 2016-05-11 23:24:40 -07:00
Mark Otto 0eeff0b7cd grunt 2016-05-11 16:35:02 -07:00
Mark Otto c6ac4f567e grunt 2016-05-11 15:58:46 -07:00
Mark Otto 547290293c grunt 2016-05-11 10:20:00 -07:00
Mark Otto 4e4fdb7228 grunt 2016-05-08 17:31:11 -07:00
Mark Otto dde85e9888 Redo checkboxes and radios 
- Move disabled radio and checkbox styles to Reboot
- Collapse .radio and .checkbox into single class, .form-check
- Collapse .radio-inline and .checkbox-inline into single class, .form-check-inline
- Require classes for sub-elements in both new classes
 2016-05-08 16:05:27 -07:00
Mark Otto 4a064209ba Merge branch 'v4-dev' into v4-forms-cleanup 2016-05-08 15:25:26 -07:00
Mark Otto d90064f06f grunt 2016-05-08 14:58:37 -07:00
Mark Otto 69afc16867 grunt 2016-05-08 13:46:38 -07:00
Mark Otto 932d0aa068 grunt 2016-05-08 13:43:13 -07:00
Mark Otto 9f2ab98026 Merge branch 'v4-dev' into v4-forms-cleanup 2016-04-23 14:24:08 -07:00
Chris Rebert e391fcb953 grunt dist 
[ci skip]
 2016-04-11 12:38:10 -07:00
Mark Otto 29ff8e8b14 grunt 2016-04-08 21:05:49 -05:00
Mark Otto fd260961e6 grunt 2016-04-08 20:58:40 -05:00
Mark Otto 80144d74d7 Merge branch 'v4-dev' into v4-forms-cleanup 2016-04-08 20:55:19 -05:00
XhmikosR 06ad50e262 Run `grunt`. 
[ci skip]
 2016-03-07 11:56:30 +02:00
XhmikosR 666e8aa8b1 Run `grunt`. 
[ci skip]
 2016-02-27 13:56:46 +02:00
Mark Otto b6b9d4202c grunt 2016-02-16 20:34:35 -08:00
Mark Otto db9f0ce9fc grunt 2016-02-16 20:28:56 -08:00
Mark Otto 35b9c2283b grunt 2016-02-15 19:11:35 -08:00
Mark Otto ceb0e9b69f grunt 2016-02-13 17:55:07 -08:00
Mark Otto a263e19419 grunt 2016-02-08 23:43:43 -08:00
Mark Otto ba4d52ef29 grunt 2016-02-07 23:49:09 -08:00
Mark Otto 48df6e3b72 grunt 2016-02-07 23:38:03 -08:00
Chris Rebert e3b55aadea grunt dist docs 2016-02-07 21:17:05 -08:00
Mark Otto cb7b780876 grunt 2016-02-06 20:32:24 -08:00
Mark Otto de944e088b Fixes #17300: drop the unused at-viewports 2016-02-06 18:45:56 -08:00
Mark Otto 9c0e20e41d grunt 2016-02-06 18:20:30 -08:00
Mark Otto 12bb0a7212 grunt 2016-02-06 18:09:07 -08:00
Mark Otto b2854d85c5 grunt 2016-02-06 16:47:57 -08:00
Mark Otto 40c3be90ca grunt 2016-02-06 15:20:08 -08:00
Mark Otto 18be3be3f4 grunt 2016-02-05 22:26:22 -08:00
Mark Otto b75116c679 Merge branch 'v4-card-fuckery' into v4-dev 2016-02-03 20:53:30 -08:00
Mark Otto f31575ad63 grunt 2016-02-03 20:53:00 -08:00
Mark Otto 0f18bd3257 grunt 2016-02-03 20:43:16 -08:00
Mark Otto 2ac922c78f grunt 2016-02-03 19:45:19 -08:00
Mark Otto 0e70c6a37f Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2016-02-03 19:23:29 -08:00
XhmikosR 2825bf496b Run `grunt`. 
[ci skip]
 2016-01-25 09:30:34 +02:00
Mark Otto 40525eaa4d grunt 2016-01-23 20:32:59 -08:00
Mark Otto b4bd1dc0dd grunt 2016-01-17 19:17:10 -08:00
Chris Rebert 6058dae624 grunt dist-css docs 
[ci skip]
 2016-01-10 18:49:50 -08:00
Mark Otto ed612b2b41 grunt 2016-01-07 00:17:09 -08:00
Mark Otto e1caaea06f grunt 2016-01-06 15:59:10 -08:00
Mark Otto 8812541b83 grunt 2016-01-06 15:01:22 -08:00
Mark Otto 8ba7f3db73 grunt 2016-01-06 14:07:17 -08:00
Mark Otto f550d99553 grunt 2016-01-06 00:07:41 -08:00
Mark Otto dd64fa87f3 grunt 2016-01-05 00:22:44 -08:00
Mark Otto a79f89b354 grunt 2016-01-03 19:16:53 -08:00
Chris Rebert 422ed9ab48 grunt dist docs 
[ci skip]
 2016-01-01 12:37:52 -08:00
XhmikosR 612ff4f5d1 Run `grunt`. 
[ci skip]
 2015-12-24 12:50:15 +02:00
Mark Otto ef00fa0a6d grunt after version bump 2015-12-08 09:37:12 -08:00
Mark Otto 5d3144e8fb manually bump versions because npm script wasn't working for me 2015-12-08 09:36:08 -08:00
Mark Otto ac5be12f24 unfuck that border from rem to px 2015-12-08 00:49:31 -08:00
Mark Otto 4fc721fe4a grunt 2015-12-07 23:49:29 -08:00
Mark Otto 04b3766452 grunt 2015-12-07 23:47:00 -08:00
Mark Otto 38847f564c grunt 2015-12-07 23:36:38 -08:00
Mark Otto 7303977c52 grunt 2015-12-07 23:31:06 -08:00
Mark Otto 1e9f0ab99e grunt 2015-12-07 22:11:27 -08:00
Mark Otto afbaf43505 grunt 2015-12-07 10:08:39 -08:00
Mark Otto a78b835143 grunt 2015-12-07 09:24:54 -08:00
XhmikosR 8a1685fdee Run `grunt`. 
[ci skip]
 2015-12-03 08:51:57 +02:00
Mark Otto 0fa2c7c486 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-11-29 19:54:20 -08:00
Mark Otto 765c5e9c07 grunt 2015-11-29 19:38:53 -08:00
Mark Otto e28e73e531 grunt 2015-11-29 18:39:46 -08:00
Chris Rebert c2cf58b4a0 grunt dist 
[ci skip]
 2015-11-29 16:59:07 -08:00
XhmikosR 569f86051e Run `grunt`. 
[ci skip]
 2015-11-23 18:51:32 +02:00
XhmikosR eea6690d0e Run `grunt`. 
[ci skip]
 2015-11-16 10:03:57 +02:00
Mark Otto 7d9ddb844d grunt 2015-11-14 19:46:15 -08:00
Mark Otto ffa3b7c296 grunt 2015-11-12 23:15:38 -08:00
XhmikosR a291d79ecb Run `grunt`. 
[ci skip]
 2015-11-11 09:00:47 +02:00
Chris Rebert 1dc8583bc5 grunt dist 2015-10-29 22:08:31 -07:00
XhmikosR 9dfb999fae Run `grunt`. 
[ci skip]
 2015-10-27 07:31:49 +02:00
XhmikosR 724bf86288 Run `grunt`. 
[ci skip]
 2015-10-14 00:49:31 +03:00
Chris Rebert b74536fa8c grunt dist 2015-10-09 21:03:57 -07:00
XhmikosR b93c16341d Run `grunt`. 2015-09-23 09:39:13 +03:00
Mark Otto c34fdd415e grunt 2015-09-15 21:11:19 -07:00
Mark Otto 0d0edebea6 grunt 2015-09-06 09:36:24 -07:00
Mark Otto 8f16abb669 grunt 2015-09-05 20:58:31 -07:00
Mark Otto 180f97d7b2 grunt 2015-09-05 20:56:46 -07:00
XhmikosR f0840c893b Run `grunt`. 2015-09-05 08:13:43 +03:00
Mark Otto cab79b13ca grunt 2015-09-04 21:28:06 -07:00
XhmikosR 6e732ace2c Run `grunt`. 
[ci skip]
 2015-08-30 00:01:30 +03:00
XhmikosR 606393502d Specify Internet Explorer 9 as the minimum supported version. 2015-08-25 18:52:27 +03:00
Mark Otto facb3a0c3c grunt 2015-08-24 22:34:46 -07:00
Mark Otto e7ed4ff283 grunt 2015-08-23 01:12:06 -07:00
Mark Otto 3453f55ec5 grunt 2015-08-23 01:00:29 -07:00
Mark Otto 47d5168dc8 grunt 2015-08-23 00:28:58 -07:00
Mark Otto 95292fd0e7 grunt 2015-08-23 00:26:03 -07:00
Mark Otto d4e7252a83 grunt 2015-08-23 00:18:35 -07:00
Mark Otto db87ffb0db grunt 2015-08-22 21:46:49 -07:00
Mark Otto 0644ce3703 grunt 2015-08-22 19:12:40 -07:00
Mark Otto 1f153b640d re-fix #16154 in v4-dev /cc #17101 2015-08-22 19:05:43 -07:00
Mark Otto a93c42bbbe grunt 2015-08-22 18:36:48 -07:00
Mark Otto 705fb5361e grunt 2015-08-20 15:06:36 -07:00
Mark Otto 0df8fae725 grunt 2015-08-18 20:25:35 -07:00
Mark Otto c369409a54 grunt 2015-08-18 19:26:21 -07:00
Mark Otto 4c7e4e4454 grunt 2015-08-18 01:06:40 -07:00
Mark Otto e8e7b2303f grunt 2015-08-18 00:59:48 -07:00
Mark Otto 03f21a75e5 grunt 2015-08-18 00:47:15 -07:00
Mark Otto c9ed01d972 grunt 2015-08-17 21:13:54 -07:00
Mark Otto be34e2fde6 grunt 2015-08-17 18:20:33 -07:00
Mark Otto f6925475dc grunt 2015-08-17 11:21:13 -07:00
Mark Otto 9a243f2b66 grunt 2015-08-17 11:19:22 -07:00
Mark Otto c064eef67b Massive cleanup 
- Simpler main nav on all pages
- Back to purple masthead on homepage instead of dark graphite
- Active link styles on the main nav
- Cleaned up sidebar nav
- New docs layout name
- Homepage copy edits
- Updated bright purple docs color
 2015-08-14 22:45:55 -07:00
Mark Otto b2f9fe4a3e grunt it 2015-08-13 23:18:58 -07:00
Mark Otto 9b1ee31567 nuke the shared padding vars and assign to individual components 
- no real need for everything to be 100% shared
- padding looked and felt too large for inputs but not for buttons
- tying forms and buttons seems fine, but throwing in pagination feels wrong
 2015-08-13 23:04:16 -07:00
Mark Otto 879114a808 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-08-12 22:56:56 -07:00
Thomas McDonald d8acb36777 fix breadcrumbs libsass content 2015-08-12 22:14:58 -07:00
Mark Otto 28d399c436 grunt 2015-08-12 22:14:38 -07:00
Mark Otto 5e928c7c2b Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-08-12 21:16:56 -07:00
Mark Otto a0ae458a8a grunt 2015-08-12 21:15:23 -07:00
Thomas McDonald 1d631e6ca3 remove .badge class from buttons 2015-08-12 21:07:41 -07:00
Mark Otto b1a74195c8 simpler type, docs callout for reproducing the v3 style headings and small text 2015-08-12 20:45:21 -07:00
Mark Otto 314161cb17 remove hella vars from the jumbotron 2015-08-12 20:28:46 -07:00
Mark Otto 28bcf047c8 container illustrations 2015-08-10 23:07:50 -07:00
Mark Otto 121615ceba dropdown fixes and dropdown docs tweaks 2015-08-10 16:31:28 -07:00
Mark Otto 6191e5e696 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-08-10 00:15:31 -07:00
Mark Otto 743717fbce really fix those outline buttons 2015-08-09 23:45:36 -07:00
Mark Otto eaeee93fa3 docs rearrange 2015-08-09 23:38:16 -07:00
Thomas McDonald b84bb4e218 Merge branch 'v4' into force-expanded 2015-08-09 23:33:52 -07:00
Thomas McDonald 0ef0825d01 specify expanded output style for generated css with libsass 
(also fix license banner generator bug)
 2015-08-09 23:16:43 -07:00
Mark Otto 491cc512ad build 2015-08-09 22:50:04 -07:00
Mark Otto 08d6dc5b71 add basic figure support 2015-08-09 21:42:47 -07:00
Mark Otto 7a50a2cbe8 introduce display heading classes 2015-08-09 21:17:27 -07:00
Mark Otto 7c3f5b6d59 rewrite some forms docs, use new validation styles and icons 2015-08-08 14:15:09 -07:00
Mark Otto d318d64c08 grunt 2015-08-04 22:31:18 -07:00
Mark Otto 847470ca09 grunt 2015-06-22 23:25:18 -07:00
Mark Otto 96e7ceed90 grunt 2015-06-22 16:30:56 -07:00
Mark Otto e4d72c914d fix vars, grunt that shit 2015-06-19 00:01:57 -07:00
Mark Otto b39ce7d6c0 grunt 2015-06-18 15:48:54 -07:00
Mark Otto 840938f09d tweak code styles 2015-06-09 16:28:17 -07:00
Mark Otto 2d094f9d0f grunt 2015-06-08 21:14:54 -07:00
Mark Otto c1a84e38c7 grunt 2015-05-31 23:53:14 -07:00
Mark Otto 38c7813c72 grunt 2015-05-29 13:09:57 -07:00
Mark Otto 43b083effb grunt 2015-05-29 02:09:44 -07:00
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 4238e2057f grunt 2015-05-22 22:34:04 -07:00
Mark Otto b8fa32edd2 le grunt 2015-04-29 12:02:02 -07:00
Mark Otto 52133e41c5 grunt 2015-04-29 11:42:53 -07:00
Mark Otto b9ed61854c grunt 2015-04-27 00:51:34 -07:00
Mark Otto 1770df724e update input groups to use new form control size classes 2015-04-23 01:14:43 -07:00
Mark Otto 490294e68b Fix up some form docs styles, sizing, etc 2015-04-23 01:10:14 -07:00
Mark Otto dc3abb5f12 Update labels and form grid examples 2015-04-23 00:51:39 -07:00
Mark Otto 209cdf33f9 update navbar and nav link values 2015-04-18 18:15:24 -07:00
Mark Otto 8f94078da8 New form control sizing, new navbar condensed variation, update nav and navbar spacing 2015-04-18 18:12:10 -07:00
Mark Otto d64c93e09a grunt 2015-04-18 12:23:12 -07:00
Mark Otto abde088bde grunt 2015-04-17 16:50:07 -07:00
Mark Otto bf5931b5ee massive rewrite of forms docs and some css 2015-04-17 16:02:41 -07:00
Mark Otto 7c1635cdb8 narrower borders to get closer to 1px everywhere 2015-04-17 00:44:36 -07:00
Mark Otto 7049a07444 More reboot work, commenting out things that have been moved over 2015-04-17 00:22:35 -07:00
Mark Otto 0ab1576ae2 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-04-16 18:54:17 -07:00
Mark Otto 605990400e collapsing navbar tools 2015-04-16 18:50:32 -07:00
Mark Otto 06c2862d25 start stubbing out a new reboot section and file 2015-04-16 18:39:45 -07:00
Mark Otto 650d168fd8 grunt 2015-04-15 15:30:41 -07:00
Mark Otto baad9d75ce grunt and docs 2015-04-14 01:01:37 -07:00
Mark Otto 53a3ff74ca redo sidenav 2015-04-13 19:00:59 -07:00
Mark Otto f522f1841e docs derp 2015-04-13 16:36:44 -07:00
Mark Otto 309264509d Remove grid sizing styles on tables 2015-03-30 18:11:43 -07:00
Mark Otto 6749e5509c rewrite table modifiers to use .table- prefix 2015-03-30 18:08:01 -07:00
Mark Otto 608be81a43 Fixes #13583: Move .sr-only and .sr-only-focusable to mixins, then use them to create classes in _utilities.scss 2015-03-30 17:36:00 -07:00
Mark Otto 6a2d456719 grunt dist and docs 2015-03-29 00:14:02 -07:00
Mark Otto 3f3f4c6420 grunt css 2015-03-11 19:19:26 +00:00
Mark Otto 928cfb0697 grunt css 2015-03-11 19:03:18 +00:00
Mark Otto 517977fca4 fix validation, run grunt dist 2015-03-01 14:11:22 -08:00
Mark Otto 4bed09aff8 grunt 2015-01-20 18:48:18 -08:00
Mark Otto e2c6dd29d8 tons of docs helpers cleanup 2015-01-19 16:15:51 -08:00
Mark Otto dfdb99c989 fix broken breadcrumb divider 2015-01-19 16:08:48 -08:00
Mark Otto 3fe96e8f50 fix border color on inverse tables 2015-01-19 15:52:40 -08:00
Mark Otto faedb7fec4 grunt 2015-01-19 14:55:25 -08:00
Chris Rebert 698b3a7ace grunt 2015-01-07 17:04:59 -08:00
Chris Rebert 0bd8c7cb6a grunt dist 2015-01-05 11:41:34 -08:00
Mark Otto 615eb99067 fix broke shit, recompile 2015-01-03 20:16:46 -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 a5e127fd16 grunt 2014-12-31 10:37:23 -08:00
Mark Otto b92534c632 improve code quality on custom forms 2014-12-25 15:40:24 -08:00
Mark Otto cd60cf3386 custom forms: checkbox and radio stacked option 2014-12-24 15:45:37 -08:00
Mark Otto 18e08e777b add custom forms, stub out examples for radios and checkboxes 2014-12-24 04:13:23 -08:00
Mark Otto 952be04cb0 grunt 2014-12-23 22:57:03 -08:00
Mark Otto f9aec74124 add [hidden] utility for hiding any html element (see #15274 for more context) 2014-12-23 04:10:59 -08:00
Mark Otto 547f16b58e rewrite all table styles to remove in selectors 2014-12-18 22:59:47 -08:00
Mark Otto 94753bc3ec grunt 2014-12-18 20:19:53 -08:00
Chris Rebert 90f4767d06 grunt dist 2014-12-17 15:26:12 -08:00
Mark Otto 1e136a70a2 Clean up some navbar.scss, drop the -float-breakpoint var entirely 2014-12-11 14:47:10 -08:00
Mark Otto 3737cb1d46 Use grid classes or mixins on .dl-horizontal, update docs to include it, removes auto truncate and makes .text-overflow mixin into a .text-truncate class and mixin combo for better granularity 2014-12-11 14:12:10 -08:00
Mark Otto 2edc779391 Merge branch 'v4' into scss-lint 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	scss/_card.scss
 2014-12-11 12:07:09 -08:00
Mark Otto 2a78159a20 grunt 2014-12-11 12:06:08 -08:00
Mark Otto 0e371ddf87 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/css/docs.min.css.map
 2014-12-10 20:51:17 -08:00
Mark Otto 63d4423fc0 grunt 2014-12-10 13:49:53 -08:00
Mark Otto 2ade44a9ca inline-block on labels now instead of inline 2014-12-06 00:33:36 -08:00
Mark Otto ebfe358495 tweak label component padding 2014-12-06 00:18:11 -08:00
Mark Otto bc3a2f669d fix vars order, remove rando grid class from mixin 2014-12-04 22:32:39 -08:00
Mark Otto a1a3a007b6 tweak grid docs, add new tier 2014-12-04 21:02:04 -08:00
Mark Otto 824f26a3c0 grunt dist 2014-12-04 15:29:53 -08:00
Mark Otto 2fa4ab8209 grunt 2014-12-04 15:20:45 -08:00
Mark Otto d0cffbb680 grunt dist 2014-12-04 01:03:54 -08:00
Mark Otto 4474630d77 restore px to base font size var 2014-12-04 00:10:24 -08:00
Mark Otto c213ff820a fix the variables i broke, temporarily disabling line-height-computed 2014-12-04 00:09:37 -08:00
Mark Otto 27df020852 convert to scss 2014-12-02 14:02:35 -08:00
Mark Otto 9180e15e33 Clean up navbar to remove .navbar-toggle, .navbar-collapse, and .navbar-header as they are no longer used; Add .navbar-toggler to .navbar-inverse 2014-12-01 15:03:09 -08:00
Mark Otto 4bba2d0e0c fix more broke shit, run grunt 2014-11-30 20:29:47 -08:00
Mark Otto 12be9044f4 fix a bunch of padding and alignment things for forms 2014-11-25 18:00:52 -08:00