Mark Otto 06f1293acf Merge branch 'master' into panels_and_tables ...

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-07 18:36:27 -08:00

..

_data

Move homepage examples to data file

2014-01-05 23:37:14 -08:00

_includes

Fix wrong id

2014-02-07 23:21:32 +01:00

_layouts

add basic back to top link to docs sidenavs, fixes #12589

2014-02-05 13:46:24 -08:00

assets

Avoid setting jshint node: true in every Grunt JS file

2014-02-07 13:34:17 +01:00

dist

Merge branch 'master' into panels_and_tables

2014-02-07 18:36:27 -08:00

examples

Follow up to 1bdd59b18c2d1b2409d0422a60e8c007053202df, to better position the sidebar so the potential scrollbar doesn't get hidden by the navbar

2014-02-07 02:44:04 -08:00

about.html

docs & comments: v3.1 => v3.1.0

2014-01-26 17:48:15 -08:00

components.html

consistency

2014-02-07 01:31:42 -08:00

css.html

Fix .text-truncate() typo

2014-02-07 13:40:32 +01:00

customize.html

Fix #10348: Customizer dependencies

2014-01-25 12:35:46 +00:00

customizer-nav.jade

fix #12280 by templating the customizer's nav sidebar too

2014-01-20 18:06:16 -08:00

customizer-variables.jade

fix #12280 by templating the customizer's nav sidebar too

2014-01-20 18:06:16 -08:00

getting-started.html

Fixes #12477: Clarify IE support in docs

2014-02-07 01:49:12 -08:00

index.html

docs: use relative URLs instead of site.baseurl

2014-01-19 22:50:09 -08:00

javascript.html

Merge pull request #12319 from twbs/address-12007

2014-02-07 01:39:00 -08:00

LICENSE

Rename docs/LICENSE-DOCS to docs/LICENSE

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

migration.html

fix #12494 in the migration docs

2014-02-03 23:05:51 -08:00