rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity
18,547 Commits 108 Branches 89 Tags 547 MiB
19aee321a0
Commit Graph

1706 Commits

Author SHA1 Message Date
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
fa0605132f grunt 2016-10-27 20:04:33 -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
d4d53cad96 grunt 2016-10-19 08:28:19 -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
7407518fd1 grunt 2016-10-09 20:39:50 -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
d90d060c8c grunt 2016-09-05 12:42:12 -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
0fd2f8b889 grunt dist 2016-07-27 09:32:05 -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
d306864e80 grunt 2016-07-25 20:10:10 -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
XhmikosR
e83b742c11 Run grunt. 
[ci skip]
 2016-06-29 09:00:07 +03:00
Chris Rebert
6cceeec695 grunt dist docs 
[skip sauce]
[skip validator]
 2016-06-26 16:13:28 -07:00
Mark Otto
aaad85bc30 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2016-06-12 21:17:14 -07:00
Chris Rebert
ce2e944aa6 Strip out UMD & CJS in favor of ES6 modules (#20072) 2016-06-10 09:28:03 -07:00
Chris Rebert
0f3d427bbd grunt 
[ci skip]
 2016-06-04 18:21:15 -07:00
Mark Otto
96835e1512 grunt 2016-05-12 18:16:50 -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
Mark Otto
3de570a8e5 grunt 2016-04-17 16:57:36 -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
Mark Otto
19d2a39490 grunt 2016-03-21 22:59:33 -07: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
XhmikosR
255e89b241 Run grunt. 
[ci skip]
 2016-02-19 13:14:47 +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
e194db05c8 Merge branch 'v4-dev' into mark-padding 2016-02-16 20:25:40 -08:00
Mark Otto
aca4be6539 grunt 2016-02-16 20:24:39 -08:00
Mark Otto
3b84ffcc54 grunt 2016-02-16 20:09:57 -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
a40d94000f grunt 2016-02-08 22:32:59 -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
Chris Rebert
1e8743ec89 Merge pull request #18473 from twbs/fix-18036 
Remove useless .col-*-offset-12 and .col-xs-offset-0 classes
 2015-12-23 20:33:37 -07: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
Chris Rebert
c5a3e897d6 Regenerate dist/css/bootstrap.css for diffing purposes 
[skip sauce]
[skip validator]
 2015-12-08 01:51:49 -08:00
Chris Rebert
6faa260f84 Merge pull request #18185 from twbs/fix-18129 
Refactor _utilities-spacing.scss
 2015-12-08 01:33:03 -08:00
Chris Rebert
c7851ed20c Regenerate dist/css/bootstrap.css for diffing purposes 
[skip validator]
[skip sauce]
 2015-12-08 01:08:03 -08:00
Mark Otto
af8efad583 grunt 2015-12-08 01:07:14 -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
b7b448a0e7 Run grunt. 
[ci skip]
 2015-12-05 12:59:13 +02:00
XhmikosR
34a0ce571e Run grunt. 
[ci skip]
 2015-12-05 11:43:23 +02: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
Jacob Thornton
d600831a15 add explicit error for lack of tether in tooltips - fixes #17273 2015-11-14 20:35:10 -08:00
Jacob Thornton
a3d7f79ae9 Merge branch 'v4-dev' of github.com:twbs/bootstrap into v4-dev 2015-11-14 19:52:17 -08:00
Jacob Thornton
186c1c6d80 Merge branch 'v4-dev' of https://github.com/lincolndbryant/bootstrap into lincolndbryant-v4-dev 2015-11-14 19:49:48 -08: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
f1223195b3 Run grunt. 
[ci skip]
 2015-11-12 09:17:52 +02:00
XhmikosR
a291d79ecb Run grunt. 
[ci skip]
 2015-11-11 09:00:47 +02:00
Chris Rebert
f2e337cbdc grunt dist 2015-11-01 20:56:47 -08: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
Chris Rebert
a19bcaef96 grunt dist 2015-10-23 12:06:24 -07: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
Chris Rebert
7ff9b1979c grunt dist 2015-08-26 01:28:48 -07: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
421a1393bc grunt 2015-08-22 19:01:14 -07:00
Mark Otto
a93c42bbbe grunt 2015-08-22 18:36:48 -07:00
Mark Otto
6e5e9225fd grunt 2015-08-22 18:25:20 -07:00
Mark Otto
705fb5361e grunt 2015-08-20 15:06:36 -07:00
lbryant
8b15b5a262 _removeTetherClasses is no longer referenced 2015-08-20 01:22:16 -04:00
lbryant
926fb11158 use Tether addTargetClasses: false option instead of manually removing them 2015-08-20 01:03:29 -04:00
Mark Otto
fc5d996e10 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-08-18 22:23:44 -07:00
Jacob Thornton
08d2041c45 redo js dists 2015-08-18 22:07:45 -07:00
Mark Otto
6211641f69 more grunt 2015-08-18 20:28:45 -07:00
Mark Otto
1c19ded8c1 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-08-18 20:25:48 -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
Jacob Thornton
18ff57a183 js tests passing + eslint 2015-08-18 19:22:46 -07:00
Jacob Thornton
e07071416b Merge branch 'v4' of github.com:twbs/derpstrap into v4 2015-08-18 17:02:24 -07:00
Jacob Thornton
19e43b62ed use proxy not bind in alert 2015-08-18 17:01:56 -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
86f7ee0184 grunt 2015-08-17 20:41:13 -07:00
Mark Otto
abc9f26558 grunt 2015-08-17 18:33:38 -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
Jacob Thornton
409ede0a35 rebuild js 2015-08-15 12:19:11 -07:00
Jacob Thornton
05c7a37507 fix dropdown test 2015-08-15 12:17:13 -07:00
Jacob Thornton
c830956d17 change modal.js to use is-fixed classes to target padding-right 2015-08-15 12:10:24 -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
Jacob Thornton
7ba24450be Merge branch 'v4' of github.com:twbs/derpstrap into v4 2015-08-12 21:18:36 -07:00
Jacob Thornton
17ba95c201 rebuild stuff 2015-08-12 21:17:43 -07:00
Mark Otto
a0ae458a8a grunt 2015-08-12 21:15:23 -07:00
Jacob Thornton
f2ae3ea043 Merge branch 'v4' of github.com:twbs/derpstrap into v4 2015-08-12 21:12:23 -07:00
Jacob Thornton
11abb0f7e9 fix modal 2015-08-12 21:12:03 -07:00
Thomas McDonald
35f064f96c Merge branch 'v4' of github.com:twbs/derpstrap into v4 2015-08-12 21:09:44 -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
46fbaab5ef unfuck all that watch shit 2015-08-12 20:01:15 -07:00
Mark Otto
2e98fd872c compile latest 2015-08-10 23:43:32 -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
f651338a88 disable the custom builds generation for now: 2015-08-09 21:45:08 -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
be299c1b8b switch to primary button there 2015-08-05 23:14:53 -07:00
Mark Otto
97bcfb9e7f rip badges 2015-08-05 00:48:42 -07:00
Mark Otto
9330c4a947 Run just as fast as I can 
To the middle of nowhere
To the middle of my frustrated fears
And I swear you're just like a pill
Instead of makin' me better,
You keep makin' me ill
You keep makin' me ill

adds .label-pill to replace .badge
 2015-08-05 00:45:41 -07:00
Mark Otto
d80f26fe49 unaffix sidebar and simplify styles of docs side nav to be more like v3 2015-08-05 00:38:36 -07:00
Mark Otto
d318d64c08 grunt 2015-08-04 22:31:18 -07:00
Mark Otto
1ddc3f5e21 Merge branch 'master' into v4m 2015-08-04 22:29:45 -07:00
Mark Otto
ab412b2404 grunt 2015-08-04 21:36:11 -07:00
XhmikosR
f4a44208f4 Run grunt. 2015-07-26 00:16:58 +03:00
Chris Rebert
69d489eee4 add source maps for minified CSS; refs #16589 2015-06-23 09:27:40 -07:00
Chris Rebert
7dee0c33b1 grunt dist 2015-06-23 09:26:33 -07:00
Mark Otto
847470ca09 grunt 2015-06-22 23:25:18 -07:00
Mark Otto
278804fa31 grunt 2015-06-22 16:33:23 -07:00
Mark Otto
96e7ceed90 grunt 2015-06-22 16:30:56 -07:00
Mark Otto
bc29c016b7 Merge branch 'v4' into v4_builds 2015-06-19 16:26:33 -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
8410afe0e1 Create new stylesheets for optional builds and add them to Gruntfile tasks 2015-06-18 10:19:50 -07:00
Mark Otto
83bfff7f07 bump version 2015-06-16 09:10:22 -07:00
Mark Otto
29ff44d311 grunt 2015-06-16 09:06:51 -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
XhmikosR
b5ed74d43d Run grunt. 
[ci skip]
 2015-06-01 10:29:18 +03: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