Merge branch 'master' into develop

This commit is contained in:
Michael Rose 2013-07-29 07:43:20 -04:00
commit 0c38fabd8d

View file

@ -5,7 +5,7 @@
@heading-font: @base-font;
@caption-font: @base-font;
@code-font: 'source-code-pro', monospace;
@alt-font: 'volkorn', serif;
@alt-font: 'volkhov', serif;
@doc-font-size: 16;
@doc-line-height: 24;
@ -28,4 +28,4 @@ body {
@white : #fff;
@black : #000;
@accent-color : @black;
@link-color : #222;
@link-color : #222;