root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 14 Packages Projects Releases Wiki Activity
8,713 Commits 125 Branches 94 Tags 689 MiB
Commit Graph

476 Commits

Author SHA1 Message Date
fat e9cced72fd fix #9342 2014-03-08 19:20:47 -08:00
Mark Otto 4b6e1b6754 grunt dist 2014-03-08 17:40:58 -08:00
Mark Otto 7c3881086f Fix comment 2014-03-08 17:11:48 -08:00
Mark Otto bcfb27b962 grunt 2014-03-08 16:11:24 -08:00
Mark Otto 03701b8d4b Fixes #12966: Ensure icon font vars are loaded into Customizer 2014-03-08 15:32:24 -08:00
Mark Otto 67c747a109 grunt 2014-03-08 15:30:18 -08:00
Zlatan Vasović d08bbdc6ec Reorganize docs assets 2014-03-07 17:37:23 +01:00
Mark Otto 0143e38a67 Merge branch 'master' into document_popover_focus 
Conflicts:
	docs/assets/js/docs.min.js
 2014-03-07 01:30:28 -08:00
Mark Otto e25dacba14 Merge branch 'master' into typography-example-updates 
Conflicts:
	docs/assets/js/customize.min.js
 2014-03-07 01:10:16 -08:00
Mark Otto ac4dd30460 G R U N T G R U N T 2014-03-07 01:08:29 -08:00
mrmrs d1d5d90413 Fixes #12748 2014-03-07 00:59:22 -08:00
Mark Otto d44e98b34d G R U N T 2014-03-07 00:50:28 -08:00
Mark Otto 5bd2799978 G R U N T 2014-03-07 00:26:38 -08:00
Mark Otto 6452b409aa grunt for days 2014-03-07 00:23:22 -08:00
Mark Otto 705ff7f227 Moving the embed to it's own CSS file, moving the docs to the Components page with an example, fixing a Glyhpicons list problem in the docs 2014-03-06 23:18:13 -08:00
Mark Otto 12c619f5b9 Merge branch 'master' into boulox-responsive-embed 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/css.html
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-03-06 22:40:25 -08:00
Mark Otto 7e299c6a49 Fixes #12683: Remove the overflow: hidden; from the .panel-group > .panel because it apparently serves no purpose and cuts off nested dropdown menus. 2014-03-06 22:32:21 -08:00
Mark Otto df3eb66ede Merge branch 'master' into popovers-use-radii-var 
Conflicts:
	dist/css/bootstrap.css.map
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap.css.map
 2014-03-06 21:44:46 -08:00
Mark Otto 0c9308a3b2 Rewrite the disabled list group items to simplify styles 2014-03-06 21:40:22 -08:00
Mark Otto c8614c0f15 Merge branch 'master' into pr/12490 
Conflicts:
	less/list-group.less
 2014-03-06 21:32:52 -08:00
mrmrs 4868096dbd Fixes #12934 2014-03-06 21:05:29 -08:00
Mark Otto 17e41098c8 Fixes #12824: Remove white-space: nowrap from code elements 2014-03-06 20:39:19 -08:00
Mark Otto 8526adf69c grunt 2014-03-06 20:33:10 -08:00
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 784a95d945 Documents #10140 2014-02-10 21:34:05 -08:00