mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-26 06:44:35 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into modular-the-mixins

Browse Source 
* 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
This commit is contained in:
mrmrs
2014-03-09 23:28:08 -07:00
parent 348b7de7f7 e727973d8c
commit 2f380a9683
20 changed files with 502 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long