rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-03-21 13:29:00 +01:00
Code Issues Actions 10 Packages Releases Activity
8,769 Commits 114 Branches 89 Tags
Commit Graph

64 Commits

Author SHA1 Message Date
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
4883605624 Fix bad grunt merge and then G R U N T 2014-03-09 16:15:53 -07:00
Mark Otto
5e6d16ef4d grunt 2014-03-08 21:05:23 -08:00
Mark Otto
b8ab0c66ac grunt 2014-03-08 20:03:31 -08:00
fat
4d96e69a55 fixes #9836 2014-03-08 19:45:38 -08:00
Mark Otto
74aab91671 grunt 2014-03-08 19:32:40 -08:00
fat
e9cced72fd fix #9342 2014-03-08 19:20:47 -08:00
Mark Otto
67c747a109 grunt 2014-03-08 15:30:18 -08:00
Chris Rebert
c8379ff2c7 S H R I N K W R A P 2014-03-07 16:20:53 -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
XhmikosR
73ad81d89c Add time-grunt plugin. 2014-03-07 08:47:23 +02:00
Mark Otto
8526adf69c grunt 2014-03-06 20:33:10 -08:00
Chris Rebert
56a5d93b82 switch to grunt-css-flip for RTL CSS generation 2014-03-06 12:31:28 -08:00
Zlatan Vasović
c1d3337c74 Run grunt update-shrinkwrap 2014-03-05 18:07:50 +01:00
Mark Otto
1399497a02 grunt 2014-03-04 00:30:40 -08:00
XhmikosR
cd65e512a2 Update dependencies. 2014-03-02 09:27:01 +02:00
XhmikosR
e5affbfa0a Run grunt. 2014-03-01 20:58:53 +02:00
XhmikosR
1e06cdff2f Run grunt update-shrinkwrap. 2014-02-26 19:34:02 +02:00
Chris Rebert
7b386a566f update boto & s3_cache.py 2014-02-25 19:40:15 -08:00
Chris Rebert
8556fa44a3 switch browserName from "googlechrome" to "chrome" per @Jonahss in #12647 2014-02-24 13:11:17 -08:00
XhmikosR
af83e569c3 Update grunt-contrib-connect. 2014-02-23 10:56:27 +02:00
Supergibbs
49094844ac Correctly set .btn-link colors in a .navbar and .navbar-inverse #12694 2014-02-21 20:51:06 -08:00
XhmikosR
db32afe6cf Update grunt-contrib-cssmin. 2014-02-18 07:40:02 +02:00
Chris Rebert
accc95ccd6 regenerate npm-shrinkwrap.canonical.json 2014-02-13 17:57:24 -08:00
Chris Rebert
cdb381bb75 bump grunt-exec to v0.4.5 & add missing tilde to version spec 2014-02-13 13:55:36 -08:00
XhmikosR
2d18944d98 Update dependencies. 2014-02-13 11:12:05 -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
Chris Rebert
1e1f510294 rm BrowserStack testing from build 2014-02-11 10:11:38 -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
Chris Rebert
2bc29b4581 chrome => googlechrome in Sauce; fixes #12647 2014-02-10 12:11:10 -08:00
Mark Otto
3fc7a4cffa grunt with new mixins 2014-02-08 16:31:42 -08:00
Mark Otto
228d4e59fc Fixes #12555: Rearrange variables to place grids and containers closer 2014-02-07 01:22:30 -08:00
Chris Rebert
7861f6e8a5 possibly avoid some extra S3 charges 
Refs https://github.com/boto/boto/issues/2078
 2014-02-05 10:45:05 -08:00
Chris Rebert
46f9d27142 reorganize all grunt tasks into one directory 
also fixes #12581
 2014-02-04 13:18:54 -08:00
Chris Rebert
b16efebc8e disable OS X Chrome in Selenium tests to fix the build 2014-02-04 01:51:40 -08:00
Mark Otto
58bf3f9432 grunt after last commits 2014-01-31 13:40:32 -08:00
Mark Otto
1409cde7e8 Bump versions, run grunt 2014-01-30 08:30:37 -08:00
Mark Otto
d4b1bfd667 grunt 2014-01-29 22:44:06 -08:00
Chris Rebert
50ad304bb5 Merge pull request #12315 from twbs/use-shrinkwrap 
Do npm caching based on npm-shrinkwrap.canonical.json
 2014-01-26 20:46:14 -08:00
Chris Rebert
5a3f1a90ba fix #12261 2014-01-26 14:22:06 -08:00
Chris Rebert
6717f642bb re-enable OS X Chrome in Sauce tests 2014-01-25 17:55:52 -08:00
Chris Rebert
d56def706a update to iOS v7 in Sauce test config 2014-01-25 17:02:02 -08:00
Chris Rebert
9e862cdf70 enable Linux Chrome & Linux Firefox in Sauce tests 2014-01-21 16:28:38 -08:00
Chris Rebert
6f1236f81a document S3 cache more fully; fixes #12289 2014-01-19 18:48:35 -08:00
Chris Rebert
04cfca25af s3_cache.py: fix name in USAGE message 2014-01-19 15:12:09 -08:00
Chris Rebert
ee396aeb8e enable IE10 for Sauce tests 2014-01-16 19:53:02 -08:00