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

..

_data

update homepage showcase with three new posts

2014-02-13 01:21:35 -08:00

_includes

Fix comment

2014-03-08 17:11:48 -08:00

_layouts

Merge branch 'master' into sr-only-focusable

2014-03-08 20:34:29 -08:00

assets

Merge branch 'master' into modular-the-mixins

2014-03-09 23:28:08 -07:00

dist

Merge branch 'master' into modular-the-mixins

2014-03-09 23:28:08 -07:00

examples

Replace some images on the Carousel example with some base64 encoded 1x1 gifs

2014-03-09 22:38:13 -07:00

jade

Move jade files to docs/jade/

2014-02-08 22:29:06 +01:00

about.html

add svg logos to brand guidelines

2014-03-04 13:32:02 -08:00

browser-bugs.html

Moves IE8 justified button border mention to docs section, not the browser bugs page /cc @cvrebert

2014-03-09 15:32:36 -07:00

components.html

Moves IE8 justified button border mention to docs section, not the browser bugs page /cc @cvrebert

2014-03-09 15:32:36 -07:00

css.html

mo copy

2014-03-09 22:10:58 -07:00

customize.html

add responsive embed to customizer

2014-03-06 23:19:16 -08:00

getting-started.html

Merge branch 'master' into sr-only-focusable

2014-03-08 20:34:29 -08:00

index.html

Fixes #12685: Display current version under download button on homepage

2014-02-10 20:23:29 -08:00

javascript.html

Fixes #12892: Link to one of the SO articles on Bootstrap modals and YouTube

2014-03-09 16:03:46 -07:00

LICENSE

Rename docs/LICENSE-DOCS to docs/LICENSE

2014-01-14 13:47:18 +01:00

migration.html

add data-toggle button.js change to migration docs

2014-03-03 14:42:39 -08:00

robots.txt

Add sitemap.xml and robots.txt files.

2014-02-27 17:05:52 +02:00

sitemap.xml

Add sitemap.xml and robots.txt files.

2014-02-27 17:05:52 +02:00