Merge branch 'master' into open1233a

This commit is contained in:
Charles Hacskaylo
2017-04-26 12:24:47 -07:00
committed by GitHub
978 changed files with 3890 additions and 2053 deletions

View File

@@ -235,4 +235,4 @@ $colorAboutLink: #84b3ff;
// Loading
$colorLoadingFg: $colorAlt1;
$colorLoadingBg: rgba($colorLoadingFg, 0.1);
$colorLoadingBg: rgba($colorLoadingFg, 0.1);