root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 11 Packages Projects Releases Wiki Activity
10,246 Commits 104 Branches 92 Tags 676 MiB
Commit Graph

184 Commits

Author SHA1 Message Date
Mark Otto f4eefd28d1 Merge branch 'master' into sr_friendly_hidden_content 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
 2014-08-27 22:38:46 -07:00
Mark Otto 1ebc7e62a8 grunt 2014-08-27 22:37:10 -07:00
Mark Otto f5890adb17 grunt 2014-08-27 22:25:24 -07:00
Mark Otto 0140198699 grunt 2014-08-23 13:46:28 -07:00
Mark Otto 32a6d9b404 Full grunt 2014-08-23 13:43:41 -07:00
Mark Otto 4fc96e8029 grunt 2014-08-23 13:35:22 -07:00
Mark Otto 6a0eb4e6bd grunt 2014-08-23 12:19:36 -07:00
Chris Rebert e7d5905f38 grunt 2014-08-17 15:44:25 -07:00
Mark Otto 9096c20021 grunt 2014-08-04 14:05:12 -07:00
XhmikosR de1d8c36ad Run `grunt`. 2014-08-01 19:49:54 +03:00
XhmikosR 97cb2803d7 Run `grunt`. 2014-07-22 08:31:36 +03:00
XhmikosR 8d435cbb3c Run `grunt`. 2014-07-22 08:25:41 +03:00
Mark Otto 7a8d9dbdbf grunt 2014-07-12 18:06:26 -07:00
Mark Otto fe0ef38898 Fixes #14095: Add basic styling for captions, which we've for some reason been missing all this time. 2014-07-12 15:55:15 -07:00
Mark Otto 2962f845a5 grunt 2014-07-12 15:47:42 -07:00
Mark Otto bd292ca3b8 Fixes #14107: Lighten placeholder text 2014-07-12 15:13:18 -07:00
XhmikosR 94472ee74a Run `grunt`. 2014-07-10 10:03:24 +03:00
XhmikosR 643effe382 Run `grunt`. 2014-07-09 10:24:39 +03:00
Mark Otto 9be2bbb5ef Fixes #14053: Don't show radio/checkbox in justified button groups 2014-07-06 16:48:41 -07:00
Mark Otto e2029e122c Fixes #13997: Move min-height for radio/checkbox to their inner label 2014-07-06 15:09:20 -07:00
Mark Otto 043b40636c grunt 2014-07-05 20:17:57 -07:00
Mark Otto 3c99de9764 grunt 2014-07-05 19:57:15 -07:00
Mark Otto 3537481c97 Fixes #12738 again: use max-device-width instead of max-width for .navbar-collapse height in landscape devices 2014-07-03 00:55:32 -07:00
XhmikosR 225351431e Update dependencies. 2014-06-30 18:35:50 +03:00
Mark Otto ff6b279b3c bump to v3.2.0 2014-06-26 09:13:24 -07:00
Mark Otto 719ebd8239 grunt 2014-06-26 02:49:21 -07:00
Mark Otto 4045740c54 Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-06-25 16:57:22 -07:00
Chris Rebert a991cd572c grunt dist; closes #13914 2014-06-24 15:06:47 -07:00
XhmikosR 15c63fa137 Run `grunt`. 2014-06-24 19:01:40 +03:00
Mark Otto 8bd4163ad4 fixes #13881: restore existing striped progress bar behavior with theme styles 2014-06-19 18:14:56 -07:00
Mark Otto a4fa8d07c8 grunt dist 2014-06-19 15:24:24 -07:00
XhmikosR abe7afd87a Run `grunt`. 2014-06-19 12:58:34 +03:00
XhmikosR 0418c7678d Update JSZip to v2.3.0. 2014-06-19 12:03:10 +03:00
Mark Otto 99f176e7ec rewrite striped and active to deprecate the parent selectors, change the docs 2014-06-18 22:35:05 -07:00
Mark Otto d222c21f84 grunt 2014-06-18 22:24:56 -07:00
Mark Otto 74982cf101 grunt 2014-06-18 22:23:31 -07:00
XhmikosR 6d45f733e5 Run `grunt`. 2014-06-18 13:16:32 +03:00
XhmikosR 1b8935ee95 Run `grunt dist`. 2014-06-10 08:30:17 +03:00
XhmikosR 41b92b967a Run `grunt`. 
[ci skip]
 2014-06-09 11:10:09 +03:00
Mark Otto 34891de173 grunt 2014-06-08 11:19:35 -07:00
Mark Otto 1e3b93804f grunt 2014-06-08 11:18:59 -07:00
XhmikosR 03a8949d7c Run `grunt`. 2014-06-06 01:23:07 +03:00
Mark Otto 8ee6a6be80 grunt 2014-05-12 21:28:14 -07:00
Mark Otto f39b272fed grunt 2014-05-12 21:19:01 -07:00
Mark Otto 0d1018cb2f grunt 2014-05-12 19:53:12 -07:00
Mark Otto f5513fd30e nuke rtl 2014-05-12 19:47:53 -07:00
XhmikosR 06fae12023 Update JSZip to v2.2.2. 2014-05-06 12:43:41 +03:00
XhmikosR 30b07b942e Run `grunt`. 2014-04-26 08:35:48 +03:00
XhmikosR 1267a9a02b Run `grunt`. 2014-04-09 10:16:56 +03:00
XhmikosR 2f0f8ec6d1 Run `grunt dist`. 2014-04-09 10:02:34 +03:00
Mark Otto bfb99413ee grunt dist 2014-04-06 20:49:22 -07:00
XhmikosR 4c2626fecb Run `grunt`. 2014-04-03 10:53:44 +03:00
Chris Rebert b5ae8f9722 grunt update-shrinkwrap build-customizer dist 2014-03-28 11:19:22 -07:00
Chris Rebert e8551d4f50 grunt dist 2014-03-28 11:00:39 -07:00
XhmikosR 10586bf040 Run `grunt`. 2014-03-27 08:02:51 +02:00
Mark Otto b4f4c7b16f Fixes #13037: add text-align: left; to prevent alignment change in dropdowns 2014-03-24 20:02:56 -07:00
Mark Otto bc250fb1e7 grunt 2014-03-24 19:41:20 -07:00
Mark Otto 6f6bce5944 Fixes #13141: Add a max-width: 100%; to label elements so IE8 wraps text 2014-03-24 19:26:41 -07:00
Mark Otto 21084192b6 Fixes #13079: Scope .open class in button variant mixin to immediate children 2014-03-24 19:08:05 -07:00
XhmikosR 4fb1fdbf74 Update JSZip to v2.2.0. 2014-03-23 08:10:00 +02:00
Chris Rebert 910ff24b4b regenerate customize.min.js 2014-03-16 22:37:32 -07:00
Mark Otto b3f30bb70e grunt 2014-03-16 20:46:00 -07:00
Mark Otto b7ab799824 Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	dist/js/bootstrap.min.js
	docs/dist/js/bootstrap.min.js
 2014-03-16 19:06:17 -07:00
Mark Otto 2a43e7e78a Break up docs into includes 2014-03-16 19:03:53 -07:00
XhmikosR d4a4bbb729 Update dependencies. 2014-03-12 20:22:22 +02:00
XhmikosR f750f7e448 Run usebanner before cssmin. 2014-03-11 19:49:11 +02:00
Mark Otto 6f13a14e4b moar grunt 2014-03-10 16:51:53 -07:00
Mark Otto 74c391b9ad Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	dist/css/bootstrap.css.map
	docs/assets/js/customize.min.js
	docs/dist/css/bootstrap.css.map
 2014-03-10 16:43:01 -07:00
Mark Otto a83ca38713 Fixes #13003: Move padding on radio and checkbox options from the surrounding div to the label to remove the no-click deadzone caused by negative margin 2014-03-10 16:41:56 -07:00
Mark Otto 552f170e3c even more grunt 2014-03-10 13:31:34 -07:00
Mark Otto a36643dd33 Merge branch 'master' into modular-the-mixins 
Conflicts:
	dist/css/bootstrap.css.map
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap.css.map
 2014-03-10 00:08:29 -07:00
mrmrs b0bc9ef815 Add consistent newline at end of files in less/mixins 2014-03-09 23:44:11 -07:00
Mark Otto a7b0fa7ebf ugh grunt 2014-03-09 22:28:29 -07:00
Mark Otto 2f955907f9 Fixes #12669: Properly reset line-height on date inputs for all sizes; Fix IE8+'s misaslignment of text within date inputs 2014-03-09 17:12:39 -07:00
Mark Otto b69e4d636a Reorganize mixins and G R U N T 2014-03-09 16:50:30 -07:00
mrmrs 0b415c6099 Merge branch 'master' into mixin-table-of-contents 
* master:
  Fix bad grunt merge and then G R U N T
  Reorder the Gruntfile a bit
  Fixes #12892: Link to one of the SO articles on Bootstrap modals and YouTube
  Remove unneeded quotes.
  Rename generateRawFilesJs to generateRawFiles
  Remove redundant parens

Conflicts:
	docs/assets/js/raw-files.min.js
	test-infra/npm-shrinkwrap.canonical.json
 2014-03-09 16:40:40 -07:00
mrmrs 71e9902d9a Adjusts some section titles to be more explicit. 
FIXES #12992
 2014-03-09 16:25:27 -07:00
Mark Otto 27da9728bc grunt 2014-03-09 13:50:55 -07:00
Mark Otto b8ab0c66ac grunt 2014-03-08 20:03:31 -08:00
Mark Otto 74aab91671 grunt 2014-03-08 19:32:40 -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 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 5bd2799978 G R U N T 2014-03-07 00:26:38 -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 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 0c9308a3b2 Rewrite the disabled list group items to simplify styles 2014-03-06 21:40:22 -08:00
Mark Otto 17e41098c8 Fixes #12824: Remove white-space: nowrap from code elements 2014-03-06 20:39:19 -08: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 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 587814f16e Simplify gruntfile more to remove theme RTL 2014-03-03 22:49:43 -08:00
XhmikosR e5affbfa0a Run `grunt`. 2014-03-01 20:58:53 +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