Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release' into develop

Browse Source
This commit is contained in:
Sabe Jones
2018-12-03 22:54:08 +00:00
parent 757160d6b7 757959529b
commit bb01475e02
48 changed files with 238 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/client/assets/css/sprites/spritesmith-largeSprites-0.css
+16 -10
View File
@@ -1,6 +1,6 @@
.achievement-costumeContest6x {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -1136px -148px;
background-position: -1136px -438px;
width: 144px;
height: 156px;
}
@@ -18,13 +18,13 @@
}
.promo_armoire_backgrounds_201811 {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -481px -420px;
background-position: 0px -723px;
width: 423px;
height: 147px;
}
.promo_frost_potions {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -421px -723px;
background-position: -421px -871px;
width: 417px;
height: 147px;
}
@@ -36,40 +36,46 @@
}
.promo_mystery_201811 {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -839px -723px;
background-position: -1136px -142px;
width: 282px;
height: 147px;
}
.promo_oddballs_bundle {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -481px -568px;
background-position: -424px -723px;
width: 423px;
height: 147px;
}
.promo_piyo {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -1136px 0px;
background-position: -1136px -290px;
width: 279px;
height: 147px;
}
.promo_take_this {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -1281px -148px;
background-position: -1281px -438px;
width: 96px;
height: 69px;
}
.promo_turkey_day_2018 {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: 0px -723px;
background-position: 0px -871px;
width: 420px;
height: 147px;
}
.promo_veteran_pets {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: 0px -871px;
background-position: -1136px 0px;
width: 363px;
height: 141px;
}
.scene_hiking {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -481px -420px;
width: 258px;
height: 258px;
}
.scene_nametag {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -481px 0px;
@@ -84,7 +90,7 @@
}
.scene_veteran_pets {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -1136px -305px;
background-position: -1136px -595px;
width: 242px;
height: 62px;
}
website/client/assets/images/sprites/spritesmith-largeSprites-0.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 199 KiB

After

Width:  |  Height:  |  Size: 209 KiB

website/client/components/chat/chatCard.vue
+3 -1
View File
@@ -298,7 +298,9 @@ export default {
this.$emit('show-member-modal', memberId);
},
atHighlight (text) {
const userRegex = new RegExp(`@(${this.user.auth.local.username}|${this.user.profile.name})(?:\\b)`, 'gi');
const escapedDisplayName = escapeRegExp(this.user.profile.name);
const escapedUsername = escapeRegExp(this.user.auth.local.username);
const userRegex = new RegExp(`@(${escapedDisplayName}|${escapedUsername})(?:\\b)`, 'gi');
const atRegex = new RegExp(/(?!\b)@[\w-]+/g);
if (userRegex.test(text)) {