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

451 Commits

Author SHA1 Message Date
XhmikosR d7dc8a7bd3 Merge pull request #12853 from twbs/jscs 
Switch to JSCS
 2014-03-05 08:42:50 +02:00
Mark Otto a4df363174 grunt after merging #12917 2014-03-04 14:35:23 -08:00
Mark Otto 026e2f8d30 Grunt after merging #12863 2014-03-04 14:24:09 -08:00
Mark Otto 8f2a787c36 grunt 2014-03-04 14:20:48 -08:00
Mark Otto d6e07f045c Merge branch 'master' into rtl_via_css_flip 
Conflicts:
	docs/assets/js/raw-files.min.js
 2014-03-04 00:41:57 -08:00
Mark Otto 1399497a02 grunt 2014-03-04 00:30:40 -08:00
Mark Otto 587814f16e Simplify gruntfile more to remove theme RTL 2014-03-03 22:49:43 -08:00
Mark Otto 7e764a29fa grunt 2014-03-03 21:56:40 -08:00
XhmikosR e5affbfa0a Run `grunt`. 2014-03-01 20:58:53 +02:00
XhmikosR dfb4917493 Update less.js to v1.7.0. 2014-03-01 20:14:49 +02:00
XhmikosR 537e10033e Switch to using JSCS for the indentation check. 2014-02-28 17:30:08 +02:00
Mark Otto 4ccf088a24 Merge branch 'master' into pr/12813 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-02-22 12:20:53 -08:00
Mark Otto b99be29f32 Fixes #12756: Ensure horizontal dls are cleared by moving the clearfix out of the media query 2014-02-22 12:13:11 -08:00
Supergibbs 49094844ac Correctly set .btn-link colors in a .navbar and .navbar-inverse #12694 2014-02-21 20:51:06 -08:00
Mark Otto 4b622c60c1 grunt 2014-02-21 17:42:25 -08:00
XhmikosR 65ffe69bdf Fix customizer.js indentation warnings. 2014-02-14 11:02:03 +02:00
XhmikosR ff2c506d2b Update less.js to v1.6.3. 2014-02-13 20:54:21 +02:00
Mark Otto a365d8689c grunt 2014-02-13 09:24:59 -08:00
Mark Otto 385fb68981 grunt 2014-02-13 08:59:03 -08:00
Mark Otto 88fdd45427 v3.1.1 bump 2014-02-13 01:12:26 -08:00
Zlatan Vasović fe2222e733 Fix multistr errors in customizer.js 2014-02-12 20:54:43 +01:00
Chris Rebert 40142bdc51 fix #12708 by updating class names in the docs JS 2014-02-12 11:02:56 -08:00
XhmikosR 5796b56d96 Switch to the minified JSZip. 2014-02-12 20:50:47 +02:00
Mark Otto eb20d6f132 Fixes #11659, #12698, and #12349: Always apply position and z-index form controls in input groups for proper borders 2014-02-11 14:20:01 -08:00
Mark Otto 8551f42ae2 Merge branch 'master' into pr/12412 
Conflicts:
	dist/css/bootstrap-theme.css.map
	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-theme.css.map
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	test-infra/npm-shrinkwrap.canonical.json
 2014-02-11 09:50:40 -08:00
Mark Otto 38ebf57af5 grunt 2014-02-10 21:41:14 -08:00
Mark Otto 728067b586 Update Glyphicons 2014-02-10 21:28:05 -08:00
Mark Otto 3350c73666 http://www.youtube.com/watch?v=YQwYNca4iog 2014-02-10 20:52:20 -08:00
Mark Otto b36d19c3c6 grunt 2014-02-08 16:46:12 -08:00
Mark Otto 7f88009394 grunt 2014-02-08 16:43:58 -08:00
Mark Otto 3fc7a4cffa grunt with new mixins 2014-02-08 16:31:42 -08:00
Mark Otto 26e2d7cdc9 grunt 2014-02-08 16:13:30 -08:00
Mark Otto 866c52b928 grunt 2014-02-08 15:51:38 -08:00
XhmikosR 5d8491ac9f Merge pull request #12655 from twbs/holder.js 
Update holder.js to v2.3.1.
 2014-02-09 01:48:13 +02:00
Mark Otto 06e6affa4a Merge pull request #12645 from ZDroid/docs-js-semicolons 
Omit semicolons consistently in docs
 2014-02-08 15:46:51 -08:00
Mark Otto b683433f67 grunt 2014-02-08 15:44:13 -08:00
XhmikosR c3cb63b69f Update holder.js to v2.3.1. 
Fix #12653.
 2014-02-08 18:19:39 +02:00
Zlatan Vasović bdf9ce4c45 Omit semicolons consistently in docs 2014-02-07 19:31:08 +01:00
Zlatan Vasović aead10fafa Avoid setting `jshint node: true` in every Grunt JS file 2014-02-07 13:34:17 +01:00
Mark Otto 3ccc16cad0 grunt for days 2014-02-07 02:24:37 -08:00
Mark Otto 228d4e59fc Fixes #12555: Rearrange variables to place grids and containers closer 2014-02-07 01:22:30 -08:00
XhmikosR aae64a9eba Update jzip to v2.1.0. 2014-02-06 23:10:37 +02:00
XhmikosR ec050fa0ab Update less.js to v1.6.2. 2014-02-04 11:11:40 +02:00
XhmikosR 2576fecf95 Update jszip to the latest git (202003821d). 2014-02-04 11:08:12 +02:00
XhmikosR 389e574aaa Update Filesaver.js to the latest git (2014-01-24). 2014-02-04 11:08:12 +02:00
Mark Otto ec6c9d2824 Don't offset customizer alert, grunt dist 2014-02-04 00:18:34 -08:00
Mark Otto 58bf3f9432 grunt after last commits 2014-01-31 13:40:32 -08:00
XhmikosR 7b9c0a38a7 Downgrade holder.js to v2.2.0. 
Fixes #12440.
 2014-01-31 09:32:55 +02:00
Mark Otto 1409cde7e8 Bump versions, run grunt 2014-01-30 08:30:37 -08:00
Mark Otto 9a6b7ab375 grunt 2014-01-30 08:14:18 -08:00