Merge branch 'release' into develop

This commit is contained in:
Matteo Pagliazzi 2019-07-30 19:07:13 +02:00
commit b4b9caed83
3 changed files with 4 additions and 4 deletions

2
package-lock.json generated
View file

@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "4.105.0",
"version": "4.105.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View file

@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.105.0",
"version": "4.105.1",
"main": "./website/server/index.js",
"dependencies": {
"@google-cloud/trace-agent": "^4.0.0",

View file

@ -20,7 +20,7 @@
.create-task-area.d-flex(v-if='canCreateTasks')
transition(name="slide-tasks-btns")
.d-flex(v-if="openCreateBtn")
.create-task-btn.rounded-btn(
.create-task-btn.diamond-btn(
v-for="type in columns",
:key="type",
@click="createTask(type)",
@ -28,7 +28,7 @@
)
.svg-icon(v-html="icons[type]", :class='`icon-${type}`')
#create-task-btn.create-btn.rounded-btn.btn.btn-success(
#create-task-btn.create-btn.diamond-btn.btn.btn-success(
@click="openCreateBtn = !openCreateBtn",
:class="{open: openCreateBtn}",
)