rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Code Issues Actions Packages Releases Activity
14,269 Commits 108 Branches 89 Tags 552 MiB
9989966dde
Commit Graph

1432 Commits

Author SHA1 Message Date
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
Mark Otto
4238e2057f grunt 2015-05-22 22:34:04 -07:00
XhmikosR
c56032a0e5 Remove grunt-banner completely. 
Add a license header in theme instead.
 2015-05-16 12:57:27 +03:00
Mark Otto
588b7e564e grrrrrrrrrrrrrrrrrrrunt 2015-05-14 11:11:03 -07:00
Mark Otto
82279a8eb2 Merge branch 'btn-borders' of https://github.com/martinbean/bootstrap into martinbean-btn-borders 2015-05-13 21:20:02 -07:00
fat
6b2b0ed32f al tests passing, dist rebuilt, w/typechecker 2015-05-13 14:52:46 -07:00
fat
f8b2569ec8 implement global dispose method 2015-05-13 12:48:34 -07:00
fat
dafdd180cd add umd module support in dist 2015-05-13 10:13:34 -07:00
fat
ab1578465a grunt test-js, grunt dist-js now working 2015-05-12 16:52:54 -07:00
fat
a58febf71a popover passing as well 2015-05-12 14:35:00 -07:00
fat
3452e8dc83 rewritten tooltip + tether integration and death to our positioner jank 2015-05-11 23:32:37 -07:00
fat
ca9c850ebb add getters for Version and Default where applicable 
add modal my gawd
 2015-05-10 19:45:38 -07:00
fat
d1fbe200f4 remove closureness from plugins 2015-05-06 13:34:14 -07:00
XhmikosR
414d0a535a Run grunt. 2015-05-05 11:57:42 +03:00
XhmikosR
5ae00f2e7c Run grunt. 2015-05-05 06:50:18 +03: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
XhmikosR
5ca44f94ac Run grunt. 2015-04-28 14:24:37 +03:00
Bootstrap's Grunt bot
e6438592e9 automatic grunt dist 
[ci skip]
 2015-04-28 09:20:25 +00:00
XhmikosR
2bc9d70069 Update clean-css to v3.2.6. 2015-04-28 12:12:05 +03:00
Bootstrap's Grunt bot
a9137bd621 automatic grunt dist 
[ci skip]
 2015-04-28 08:19:19 +00:00
Bootstrap's Grunt bot
d87b7a037b automatic grunt dist 
[ci skip]
 2015-04-27 18:30:49 +00:00
Bootstrap's Grunt bot
71597a4424 automatic grunt dist 
[ci skip]
 2015-04-27 08:20:49 +00:00
Mark Otto
b9ed61854c grunt 2015-04-27 00:51:34 -07:00
Martin Bean
9a451d4aea Add @btn-border-radius variables (#16271) 2015-04-26 17:42:34 +01:00
Bootstrap's Grunt bot
d0926f2deb automatic grunt dist 
[ci skip]
 2015-04-26 11:11:05 +00:00
XhmikosR
fa4d7d2bd2 Run grunt. 2015-04-26 14:03:35 +03:00
Bootstrap's Grunt bot
2b89fd5289 automatic grunt dist 
[ci skip]
 2015-04-26 06:40:33 +00:00
Bootstrap's Grunt bot
f5b5fc69a8 automatic grunt dist 
[ci skip]
 2015-04-26 05:20:36 +00:00
Bootstrap's Grunt bot
2900711db4 automatic grunt dist 
[ci skip]
 2015-04-26 04:50:34 +00:00
Bootstrap's Grunt bot
3e3b331ad3 automatic grunt dist 
[ci skip]
 2015-04-25 20:20:30 +00: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
Bootstrap's Grunt bot
063c1b0780 automatic grunt dist 
[ci skip]
 2015-04-22 05:30:27 +00:00
Bootstrap's Grunt bot
48232aad6c automatic grunt dist 
[ci skip]
 2015-04-22 04:50:38 +00:00
Chris Rebert
e93802b821 Merge pull request #16258 from twbs/fix-16172 
Use CSS hack to fix IE8 .caret regression
 2015-04-21 21:44:08 -07:00
Bootstrap's Grunt bot
7993251b1c automatic grunt dist 
[ci skip]
 2015-04-22 01:01:07 +00:00
Bootstrap's Grunt bot
b5f3cd37f2 automatic grunt dist 
[ci skip]
 2015-04-21 06:40:36 +00: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
80239a3da4 grunt 2015-04-17 20:59:26 -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
Bootstrap's Grunt bot
483412a795 automatic grunt dist 
[ci skip]
 2015-04-17 16:20:21 +00: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
Bootstrap's Grunt bot
e7064c7224 automatic grunt dist 2015-04-13 17:21:14 +00:00
Bootstrap's Grunt bot
a719eb69d2 automatic grunt dist 2015-04-13 00:21:28 +00:00
Chris Rebert
ee385d5980 Merge pull request #16256 from twbs/fix-16247 
Add px unit to perspective property value
 2015-04-12 17:16:16 -07:00
Bootstrap's Grunt bot
9cc9379f46 automatic grunt dist 2015-04-13 00:11:22 +00:00
Bootstrap's Grunt bot
ff88cf9335 automatic grunt dist 2015-04-11 00:02:33 +00:00
Bootstrap's Grunt bot
b9fe637ecd automatic grunt dist 2015-04-08 18:41:31 +00:00
Chris Rebert
2b3a9cda4e Use CSS hack to fix IE8 .caret regression introduced by #15697; fixes #16172 
[skip sauce]
[skip validator]
 2015-04-07 22:04:40 -07:00
Bootstrap's Grunt bot
8a9d698daf automatic grunt dist 2015-04-08 02:31:50 +00:00
Chris Rebert
bf3a64f2df grunt dist docs 
[skip sauce]
 2015-04-07 19:18:35 -07:00
Chris Rebert
e9a747246a add px unit to perspective property value; fixes #16247 
[skip sauce]
[skip validator]
 2015-04-07 18:13:21 -07:00
Bootstrap's Grunt bot
7c3034dfb0 automatic grunt dist 2015-04-07 01:30:48 +00:00
Bootstrap's Grunt bot
f62c014cbc automatic grunt dist 2015-04-05 07:10:30 +00:00
Bootstrap's Grunt bot
e2d5e084b2 automatic grunt dist 2015-04-05 07:01:05 +00:00
Mark Otto
510f56f334 Merge branch 'master' into fix_15830 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
 2015-04-04 23:52:40 -07:00
Bootstrap's Grunt bot
9c41aee780 automatic grunt dist 2015-04-05 06:50:29 +00:00
Bootstrap's Grunt bot
a250673afc automatic grunt dist 2015-04-04 08:40:29 +00: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
Bootstrap's Grunt bot
bb6af65ca6 automatic grunt dist 2015-03-29 06:40:29 +00:00
Mark Otto
ce75f289f2 grunt 2015-03-28 23:33:11 -07:00
Mark Otto
a2c69b8145 fixes #15830: properly reset border-radius on list items in collapsing panel groups 2015-03-28 21:37:40 -07:00
Bootstrap's Grunt bot
a922985788 automatic grunt dist 2015-03-29 04:10:35 +00:00
Bootstrap's Grunt bot
e260661ab8 automatic grunt dist 2015-03-29 04:00:36 +00:00
Mark Otto
57c8e3cd51 Merge branch 'master' into input_sizing 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
 2015-03-28 20:31:53 -07:00
Bootstrap's Grunt bot
93bf800e1f automatic grunt dist 2015-03-28 00:50:33 +00:00
Bootstrap's Grunt bot
0fa643a8a3 automatic grunt dist 2015-03-27 08:50:27 +00:00
Bootstrap's Grunt bot
5833d079a0 automatic grunt dist 2015-03-26 05:40:28 +00:00
Bootstrap's Grunt bot
087c68bd85 automatic grunt dist 2015-03-26 05:10:31 +00:00
Bootstrap's Grunt bot
39a05d7420 automatic grunt dist 2015-03-26 05:00:30 +00:00
Chris Rebert
02f9f2bd26 Merge pull request #16092 from twbs/pointer-events-none-a 
Only disable pointer-events on disabled <a> btns
 2015-03-25 21:58:05 -07:00
Mark Otto
df8010b815 Fixes #15074: Manually handle input sizing in form groups instead of using mixins because nesting 2015-03-25 21:18:19 -07:00
Bootstrap's Grunt bot
b6508f5d04 automatic grunt dist 2015-03-26 01:50:28 +00:00
Bootstrap's Grunt bot
e22a73fd38 automatic grunt dist 2015-03-21 23:10:30 +00:00
Bootstrap's Grunt bot
eece194763 automatic grunt dist 2015-03-19 05:30:30 +00:00
Chris Rebert
c26ffd43c3 Only disable pointer-events on disabled <a> btns; fixes #16088 
<a> doesn't support the `[disabled]` attribute,
so `a.btn.disabled` simulates it using `pointer-events: none`.
However, this is unnecessary for <button>s and <input>s, and
also prevents their `[disabled]` cursor from displaying.

[skip sauce]
[skip validator]
 2015-03-17 10:29:36 -07:00
Bootstrap's Grunt bot
f5250d0a0e automatic grunt dist 2015-03-16 15:50:28 +00:00
Chris Rebert
a10eb60bc0 full grunt 2015-03-16 08:44:41 -07:00
Bootstrap's Grunt bot
026e7ccf4e automatic grunt dist 2015-03-15 21:50:31 +00:00
Bootstrap's Grunt bot
fc99118179 automatic grunt dist 2015-03-15 11:30:30 +00:00
XhmikosR
d18a043ddc Run grunt. 2015-03-15 04:27:44 -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
Bootstrap's Grunt bot
ba1345f144 automatic grunt dist 2015-03-10 20:20:23 +00:00
Bootstrap's Grunt bot
f972a84dd7 automatic grunt dist 2015-03-09 16:21:12 +00:00
Mark Otto
fd3b376e0d fix examples alignment 2015-03-09 14:30:41 +00:00
Bootstrap's Grunt bot
fbc5d8ee41 automatic grunt dist 2015-03-09 14:03:04 +00:00
Bootstrap's Grunt bot
253dfc0d3d automatic grunt dist 2015-03-09 08:41:21 +00:00
Bootstrap's Grunt bot
c178995b87 automatic grunt dist 2015-03-09 08:11:37 +00:00
Bootstrap's Grunt bot
a97b7ec344 automatic grunt dist 2015-03-04 09:41:15 +00:00
Bootstrap's Grunt bot
2f17289ab6 automatic grunt dist 2015-03-03 21:11:15 +00:00
Bootstrap's Grunt bot
c1005f5283 automatic grunt dist 2015-03-03 05:01:43 +00:00
Bootstrap's Grunt bot
399658178d automatic grunt dist 2015-03-02 14:51:23 +00:00
Bootstrap's Grunt bot
4311e09b04 automatic grunt dist 2015-03-02 12:41:16 +00:00
Bootstrap's Grunt bot
de0722f989 automatic grunt dist 2015-03-02 00:11:14 +00:00
Mark Otto
517977fca4 fix validation, run grunt dist 2015-03-01 14:11:22 -08:00
Bootstrap's Grunt bot
ad379ffb4a automatic grunt dist 2015-02-27 07:51:17 +00:00
Bootstrap's Grunt bot
fb3610c3af automatic grunt dist 2015-02-27 04:11:09 +00:00
Bootstrap's Grunt bot
984204c39e automatic grunt dist 2015-02-26 14:21:13 +00:00
Bootstrap's Grunt bot
4cb39987f0 automatic grunt dist 2015-02-26 07:21:21 +00:00
Bootstrap's Grunt bot
033dbfd06c automatic grunt dist 2015-02-26 06:01:15 +00:00
Bootstrap's Grunt bot
f43c67b0c5 automatic grunt dist 2015-02-26 05:51:21 +00:00
Bootstrap's Grunt bot
5debbec59f automatic grunt dist 2015-02-26 05:01:07 +00:00
Bootstrap's Grunt bot
1d34615758 automatic grunt dist 2015-02-26 03:51:28 +00:00
Bootstrap's Grunt bot
1d892ceef1 automatic grunt dist 2015-02-25 01:11:20 +00:00
Bootstrap's Grunt bot
1cbbeef47c automatic grunt dist 2015-02-24 02:41:30 +00:00
Bootstrap's Grunt bot
02f8cf9d0e automatic grunt dist 2015-02-21 04:21:05 +00:00
Bootstrap's Grunt bot
9677d6685a automatic grunt dist 2015-02-19 23:51:16 +00:00
Bootstrap's Grunt bot
ed627ebcfb automatic grunt dist 2015-02-19 04:21:09 +00:00
Bootstrap's Grunt bot
6e0009e18d automatic grunt dist 2015-02-17 19:41:00 +00:00
Bootstrap's Grunt bot
6379674f35 automatic grunt dist 2015-02-12 06:41:05 +00:00
fat
1e9e3316b6 kill affix 2015-02-11 11:40:57 -08:00
fat
2eba4458fa remove gz 2015-02-11 11:37:38 -08:00
fat
834220ea20 bootstrap onto closure 2015-02-11 11:29:43 -08:00
XhmikosR
c388870cef Downgrade grunt-contrib-cssmin. 
v0.12.0-v0.12.1 breaks paths in URL.
 2015-02-10 10:49:59 +02:00
Bootstrap's Grunt bot
47c3c6a59f automatic grunt dist 2015-02-10 07:21:10 +00:00
Bootstrap's Grunt bot
3efa9c46a4 automatic grunt dist 2015-02-09 01:41:04 +00:00
Bootstrap's Grunt bot
7d4ce8104a automatic grunt dist 2015-02-09 00:31:19 +00:00
Bootstrap's Grunt bot
fa27dc13b6 automatic grunt dist 2015-02-03 02:11:42 +00:00
Bootstrap's Grunt bot
a7747dedf2 automatic grunt dist 2015-01-28 19:10:59 +00:00
Bootstrap's Grunt bot
4ebfbad9c7 automatic grunt dist 2015-01-28 19:02:08 +00:00
Bootstrap's Grunt bot
cb939e2efe automatic grunt dist 2015-01-28 01:02:34 +00:00
Bootstrap's Grunt bot
5e26ad4921 automatic grunt dist 2015-01-22 03:01:38 +00:00
Bootstrap's Grunt bot
c8be2a063a automatic grunt dist 2015-01-21 21:20:51 +00:00
Mark Otto
4bed09aff8 grunt 2015-01-20 18:48:18 -08:00
Chris Rebert
07a3ea5f54 Add .glyphicon-* aliases for other ISO 4217-ish currency codes 
Fixes #15617.
 2015-01-20 16:24:48 -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
Bootstrap's Grunt bot
c643a3d331 automatic grunt dist 2015-01-19 23:20:54 +00:00
Mark Otto
faedb7fec4 grunt 2015-01-19 14:55:25 -08:00
Mark Otto
325748ff68 Merge branch 'master' into v4 
Conflicts:
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.min.js
	docs/_includes/components/thumbnails.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/template.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/assets/css/docs.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/src/customizer.js
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/js/bootstrap.js
	docs/dist/js/bootstrap.min.js
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/theme/index.html
	grunt/configBridge.json
	less/alerts.less
	less/badges.less
	less/jumbotron.less
	less/panels.less
	less/tables.less
	less/theme.less
	less/variables.less
	package.json
	scss/_button-group.scss
	scss/_buttons.scss
	scss/_forms.scss
 2015-01-19 14:48:12 -08:00
Mark Otto
fa47de717e grunt 2015-01-19 08:33:33 -08:00
Mark Otto
c683e7dea7 bump versions 2015-01-19 08:32:13 -08:00
Mark Otto
4ed95f5fa2 fixes #15497: increase decimals on line-height-large from 1.33 to 1.3333333 to fix button sizing in Win 8.1 Chrome 2015-01-18 15:03:14 -08:00
Mark Otto
db8eeaa17a Fixes #15142: Add position: relative; to .dropup for proper placement of menus 2015-01-18 13:39:40 -08:00
Mark Otto
1bf1ba7103 Merge branch 'master' into pr/15278 
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
 2015-01-18 12:24:29 -08:00
Mark Otto
de491e914a fixes #15493: inherit color on small/.small in .panel-title 2015-01-17 21:35:55 -08:00
Bootstrap's Grunt bot
c020669b07 automatic grunt dist 2015-01-18 05:11:01 +00:00
Bootstrap's Grunt bot
46710efba4 automatic grunt dist 2015-01-16 21:41:05 +00:00
Bootstrap's Grunt bot
2a1adb5f94 automatic grunt dist 2015-01-16 19:11:06 +00:00
Bootstrap's Grunt bot
b7c332f183 automatic grunt dist 2015-01-16 16:41:05 +00:00
Bootstrap's Grunt bot
e0da137158 automatic grunt dist 2015-01-16 10:51:20 +00:00
Mark Otto
dbffb0b47f Fixes #15536, #15559: Add .form-group sizing support to .form-control-static 2015-01-15 16:03:13 -08:00
Bootstrap's Grunt bot
149dac0a58 automatic grunt dist 2015-01-15 23:41:25 +00:00
Bootstrap's Grunt bot
f31f6b9b25 automatic grunt dist 2015-01-15 23:31:25 +00:00
Bootstrap's Grunt bot
9fdf7a26e1 automatic grunt dist 2015-01-13 20:31:25 +00:00
Bootstrap's Grunt bot
e213bc0ccc automatic grunt dist 2015-01-08 02:01:51 +00: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
0e5d17d5f6 Merge branch 'master' into v4 
Conflicts:
	Gruntfile.js
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.min.js
	docs/_data/glyphicons.yml
	docs/_includes/components/alerts.html
	docs/_includes/components/badges.html
	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/input-groups.html
	docs/_includes/components/jumbotron.html
	docs/_includes/components/labels.html
	docs/_includes/components/list-group.html
	docs/_includes/components/media.html
	docs/_includes/components/navbar.html
	docs/_includes/components/navs.html
	docs/_includes/components/page-header.html
	docs/_includes/components/pagination.html
	docs/_includes/components/panels.html
	docs/_includes/components/progress-bars.html
	docs/_includes/components/responsive-embed.html
	docs/_includes/components/thumbnails.html
	docs/_includes/components/wells.html
	docs/_includes/css/buttons.html
	docs/_includes/css/code.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/css/helpers.html
	docs/_includes/css/images.html
	docs/_includes/css/less.html
	docs/_includes/css/tables.html
	docs/_includes/css/type.html
	docs/_includes/customizer-variables.html
	docs/_includes/getting-started/accessibility.html
	docs/_includes/getting-started/disabling-responsiveness.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/whats-included.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/modal.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/components.html
	docs/_includes/nav/javascript.html
	docs/_jade/customizer-variables.jade
	docs/_layouts/default.html
	docs/about.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/src/customizer.js
	docs/customize.html
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	less/glyphicons.less
	less/mixins/vendor-prefixes.less
	less/navbar.less
	less/popovers.less
	less/tables.less
	less/theme.less
	less/tooltip.less
	less/variables.less
	package.json
	scss/_carousel.scss
	scss/_close.scss
	scss/_forms.scss
	test-infra/npm-shrinkwrap.json
 2015-01-03 20:08:58 -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
Bootstrap's Grunt bot
57260f16b3 automatic grunt dist 2015-01-01 19:02:43 +00:00
Bootstrap's Grunt bot
548d46eb8b automatic grunt dist 2015-01-01 03:01:40 +00:00
Chris Rebert
45f5841785 Merge pull request #15464 from twbs/address-15419 
Address #15419
 2014-12-31 16:11:04 -08:00
Bootstrap's Grunt bot
6c383c5102 automatic grunt dist 2015-01-01 00:02:16 +00:00
Mark Otto
1a932b7e02 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2014-12-31 10:39:56 -08:00