From a0c51ee4ca5bb68ffacb3b35d3d1584030f37a8e Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Fri, 18 May 2018 13:42:44 +0200 Subject: [PATCH 1/3] fix(loading bar): always above other elements --- website/client/app.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/client/app.vue b/website/client/app.vue index 3f9031a071..5c87315d0e 100644 --- a/website/client/app.vue +++ b/website/client/app.vue @@ -118,7 +118,7 @@ div /* Push progress bar above modals */ #nprogress .bar { - z-index: 1043 !important; /* Must stay above nav bar */ + z-index: 1090 !important; /* Must stay above nav bar */ } .restingInn { From c39b9dc32048f4907383a948bd39daff936773e7 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Fri, 18 May 2018 17:33:38 +0200 Subject: [PATCH 2/3] fix(challenges): format summary with markdown and do not split words, fixes #10371 --- website/client/components/challenges/challengeItem.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/client/components/challenges/challengeItem.vue b/website/client/components/challenges/challengeItem.vue index 0e458fd144..8377561faf 100644 --- a/website/client/components/challenges/challengeItem.vue +++ b/website/client/components/challenges/challengeItem.vue @@ -32,7 +32,7 @@ :member="isMember", v-once ) - .challenge-description {{challenge.summary}} + .challenge-description(v-markdown='challenge.summary') .well-wrapper(v-if="fullLayout") .well div(v-for="task in tasksData", :class="{'muted': task.value === 0}", v-once) @@ -162,7 +162,7 @@ .challenge-description { color: $gray-200; margin: 0 1.5em; - word-break: break-all; + word-break: break-word; } .well { From 644391844056857197fb920b1470c109c070f952 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Fri, 18 May 2018 17:14:39 +0000 Subject: [PATCH 3/3] 4.42.6 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 77cb7b4c00..9c4a039594 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.42.5", + "version": "4.42.6", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index c8c0310352..f58602da38 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "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", "dependencies": { "@slack/client": "^3.8.1",