krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' into develop

Browse Source
This commit is contained in:
Sabe Jones
2018-05-18 17:15:16 +00:00
parent ac973ee753 6443918440
commit 026e1a5bca
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package-lock.json generated
View File

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

2
package.json
View File

@@ -1,7 +1,7 @@
{ {
"name": "habitica", "name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.", "description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.42.5", "version": "4.42.6",
"main": "./website/server/index.js", "main": "./website/server/index.js",
"dependencies": { "dependencies": {
"@slack/client": "^3.8.1", "@slack/client": "^3.8.1",

2
website/client/app.vue
View File

@@ -116,7 +116,7 @@ div
/* Push progress bar above modals */ /* Push progress bar above modals */
#nprogress .bar { #nprogress .bar {
z-index: 1043 !important; /* Must stay above nav bar */ z-index: 1090 !important; /* Must stay above nav bar */
} }
.restingInn { .restingInn {

4
website/client/components/challenges/challengeItem.vue
View File

@@ -32,7 +32,7 @@
:member="isMember", :member="isMember",
v-once v-once
) )
.challenge-description {{challenge.summary}} .challenge-description(v-markdown='challenge.summary')
.well-wrapper(v-if="fullLayout") .well-wrapper(v-if="fullLayout")
.well .well
div(v-for="task in tasksData", :class="{'muted': task.value === 0}", v-once) div(v-for="task in tasksData", :class="{'muted': task.value === 0}", v-once)
@@ -162,7 +162,7 @@
.challenge-description { .challenge-description {
color: $gray-200; color: $gray-200;
margin: 0 1.5em; margin: 0 1.5em;
word-break: break-all; word-break: break-word;
} }
.well { .well {