Merge branch 'master' into docs-theme-toggler

Conflicts:
	docs/assets/css/docs.min.css
This commit is contained in:
Mark Otto 2014-05-20 23:27:40 -07:00
commit 707b362b80
80 changed files with 336 additions and 8462 deletions

View file

@ -1111,6 +1111,8 @@ h1[id] {
padding: 0;
margin-top: 0;
margin-bottom: 0;
word-break: normal;
word-wrap: nowrap;
white-space: nowrap;
background-color: transparent;
border: 0;