Merge branch 'release' into develop

This commit is contained in:
Sabe Jones
2017-09-29 15:21:10 +00:00
212 changed files with 117 additions and 2393 deletions

View File

@@ -82,7 +82,7 @@
.row
.col-4
| © 2017 Habitica. All rights reserved.
.debug.float-left(v-if="!IS_PRODUCTION && isUserLoaded")
// .debug.float-left(v-if="!IS_PRODUCTION && isUserLoaded")
button.btn.btn-primary(@click="debugMenuShown = !debugMenuShown") Toggle Debug Menu
.debug-group(v-if="debugMenuShown")
a.btn.btn-default(@click="setHealthLow()") Health = 1
@@ -119,7 +119,7 @@
padding-top: 3em;
margin: 0;
color: #878190;
z-index: 99;
z-index: 17;
a {
color: #878190;