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

159 Commits

Author SHA1 Message Date
Heinrich Fenkart cabace78da G R U N T 2014-09-11 23:43:27 +02:00
Heinrich Fenkart 9b9e2f5d13 grunt and missing new line 2014-09-09 01:23:48 +02:00
Heinrich Fenkart 9702579aeb run `grunt` 2014-09-09 00:12:33 +02:00
Heinrich Fenkart c9602c29c3 grunt 2014-09-08 22:41:45 +02:00
Mark Otto 6cec0399d0 grunt 2014-09-08 11:40:23 -07:00
Mark Otto f2783fbf83 Fixes #14319: Prevent jumbotron reflow by ensuring padding of .container isn't interferred with by .jumbotron side padding 2014-09-08 10:29:45 -07:00
Mark Otto 48a1308e5d grunt 2014-09-08 10:23:25 -07:00
XhmikosR 5b9fcea9f2 Run `grunt`. 2014-09-08 09:04:33 +03:00
Mark Otto 783e001786 grunt 2014-08-27 23:35:54 -07:00
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 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 2962f845a5 grunt 2014-07-12 15:47:42 -07:00
Mark Otto 717a50ce19 grunt 2014-07-12 15:37:13 -07:00
XhmikosR 94472ee74a Run `grunt`. 2014-07-10 10:03:24 +03:00
Mark Otto b44d4ef724 grunt 2014-07-06 15:35:24 -07:00
Mark Otto 354d423668 grunt 2014-07-06 15:08:37 -07:00
Mark Otto d55462fae8 grunt 2014-07-05 20:10:44 -07:00
Mark Otto 23dd323da1 grunt 2014-07-03 00:57:37 -07:00
Mark Otto 4f8697cbbb grunt 2014-07-02 23:44:56 -07:00
XhmikosR fec94e1695 Update "grunt-autoprefixer". 2014-06-27 07:38:46 +03:00
Mark Otto ff6b279b3c bump to v3.2.0 2014-06-26 09:13:24 -07:00
Mark Otto 4dcdc08d89 grunt 2014-06-25 23:03:40 -07:00
XhmikosR 4abb095783 Run `grunt`. 
Revert a991cd572c.
 2014-06-25 02:07:17 +03:00
XhmikosR 15c63fa137 Run `grunt`. 2014-06-24 19:01:40 +03:00
Mark Otto 1482947405 grunt 2014-06-19 15:25:50 -07:00
XhmikosR abe7afd87a Run `grunt`. 2014-06-19 12:58:34 +03:00
Mark Otto 162a27f67a grunt 2014-06-18 23:50:16 -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
Mark Otto 11cf54f9df grunt 2014-06-18 18:22:11 -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 1e3b93804f grunt 2014-06-08 11:18:59 -07:00
XhmikosR 03a8949d7c Run `grunt`. 2014-06-06 01:23:07 +03:00
Mark Otto f39b272fed grunt 2014-05-12 21:19:01 -07:00
Mark Otto d03fd289d9 grunt for raw js 2014-05-12 21:17:42 -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 30b07b942e Run `grunt`. 2014-04-26 08:35:48 +03:00
XhmikosR 1267a9a02b Run `grunt`. 2014-04-09 10:16:56 +03:00
XhmikosR 4c2626fecb Run `grunt`. 2014-04-03 10:53:44 +03:00
XhmikosR 8c95ff748f Run `grunt`. 2014-04-01 08:26:47 +03:00
Chris Rebert b5ae8f9722 grunt update-shrinkwrap build-customizer dist 2014-03-28 11:19:22 -07:00
XhmikosR 10586bf040 Run `grunt`. 2014-03-27 08:02:51 +02:00
Mark Otto 488c6b43ed grunt 2014-03-24 21:16:07 -07:00
Mark Otto 6951b48e65 grunt 2014-03-24 20:01:46 -07:00
Mark Otto ce013440e7 grunt 2014-03-24 19:31:12 -07:00
Mark Otto c6648d58f0 grunt 2014-03-24 19:09:30 -07:00
Mark Otto 43cf003f9a Update gruntfile to point to new customizer nav, run grunt 2014-03-16 20:40:30 -07:00
fat dd7cab84f6 build 2014-03-16 18:44:58 -07: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 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
Mark Otto 564b79ca87 grunt 2014-03-09 23:58:29 -07:00
mrmrs 38d0908aff Add recompiled assets after nuking toc in mixins.less. 2014-03-09 23:51:38 -07:00
mrmrs 2f380a9683 Merge branch 'master' into modular-the-mixins 
* master:
  Replace some images on the Carousel example with some base64 encoded 1x1 gifs
  ugh grunt
  moar grunt
  mo copy
  http://www.youtube.com/watch?v=AJWtLf4-WWs
  grunt
  Copy change
  fix grammar in comment in forms.less
  Fixes #12759
  Fixes #12738
  replace .visible-{size} with .visible-{size}-{display} ; fixes #8869

Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	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
	less/mixins.less
 2014-03-09 23:28:08 -07:00
mrmrs 348b7de7f7 Break mixins.less up into smaller modules. 
Move all deprecated vendor prefix mixins to less/mixins/vendor-prefixes.less
Create mixins directory and move partials to that directory.

FIXES #12994
 2014-03-09 23:18:48 -07:00
Mark Otto 213860408e moar grunt 2014-03-09 22:19:02 -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 4883605624 Fix bad grunt merge and then G R U N T 2014-03-09 16:15:53 -07:00
mrmrs fc74ee5f67 Changes compiled assets after changing mixins.less 2014-03-09 16:15:35 -07:00
Mark Otto ef5d8e98e2 Merge branch 'master' into sr-only-focusable 
Conflicts:
	dist/css/bootstrap.css
 2014-03-08 20:34:29 -08:00
fat 4d96e69a55 fixes #9836 2014-03-08 19:45:38 -08:00
fat e9cced72fd fix #9342 2014-03-08 19:20:47 -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
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 6452b409aa grunt for days 2014-03-07 00:23:22 -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 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 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 8526adf69c grunt 2014-03-06 20:33:10 -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 1399497a02 grunt 2014-03-04 00:30:40 -08:00
XhmikosR e5affbfa0a Run `grunt`. 2014-03-01 20:58:53 +02: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
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
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 728067b586 Update Glyphicons 2014-02-10 21:28:05 -08:00