Mark Otto 0e371ddf87 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 ...

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/css/docs.min.css.map

2014-12-10 20:51:17 -08:00

..

_data

stub out extend section a bit

2014-12-06 00:18:44 -08:00

_includes

update home and side nav to use new navbar structure

2014-12-01 15:41:11 -08:00

_jade

.bs-customizer-input => .col-xs-4

2014-10-27 15:02:21 -07:00

_layouts

add examples description, remove browser bugs description

2014-12-01 16:51:48 -08:00

_plugins

Add support for example IDs to {% example %} template tag

2014-12-02 18:46:42 -08:00

about

Merge branch 'master' into v4

2014-11-30 20:17:45 -08:00

assets

Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

2014-12-10 20:51:17 -08:00

components

remove docs warning on inline vs inline-block for labels

2014-12-06 00:30:28 -08:00

dist

Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

2014-12-10 20:51:17 -08:00

examples

tweak grid docs, add new tier

2014-12-04 21:02:04 -08:00

extend

stub out extend section a bit

2014-12-06 00:18:44 -08:00

getting-started

sass, not less

2014-12-04 15:25:24 -08:00

javascript

Merge branch 'master' into v4

2014-12-01 01:41:10 -08:00

layout

tweak grid docs, add new tier

2014-12-04 21:02:04 -08:00

apple-touch-icon.png

Losslessly compress apple-touch-icon.png.

2014-10-26 08:08:33 +02:00

browser-bugs.md

Merge branch 'master' into derp

2014-11-09 22:02:53 -08:00

customize.html

Merge branch 'master' into v4

2014-11-30 20:17:45 -08:00

favicon.ico

Fix favicon.ico after d763b0fe5b5d83025b94212638b1bd5500c43c71.

2014-06-09 11:13:24 +03:00

index.html

hide sections of homepage and quick start

2014-11-25 17:40:08 -08:00

LICENSE

Rename docs/LICENSE-DOCS to docs/LICENSE

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

robots.txt

Remove layout: nil.

2014-08-01 19:45:11 +03:00

sitemap.xml

Added/removed blank lines in the docs for consitency

2014-10-22 13:52:49 +02:00