mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-18 07:07:35 +01:00
Squashed commit of the following:
commit 35fae86bf8498a21419a32f7cdfca7f521b85494 Author: Sabe Jones <sabrecat@gmail.com> Date: Thu Apr 30 11:36:24 2020 -0500 fix(items): bouncy numbers commit 3d32d8962060fc2561687bca5a4037c47e12ca04 Author: Sabe Jones <sabrecat@gmail.com> Date: Thu Apr 30 09:36:52 2020 -0500 fix(badges): standardize box-shadow commit 5f89f1a8db00ab7d1ea29b99c90c47c358ee9268 Author: Sabe Jones <sabrecat@gmail.com> Date: Wed Apr 29 15:51:56 2020 -0500 fix(badges): standardize hover, box-shadow; fix equipment pills commit 4eda06072a82f7a41de2fde6c9e1023e0e519b3c Author: Sabe Jones <sabrecat@gmail.com> Date: Tue Apr 28 13:24:04 2020 -0500 fix(badges): pill vs round commit 7181af5cb8d552e82eb4f12bf98a31723669f16b Author: Sabe Jones <sabrecat@gmail.com> Date: Mon Apr 27 15:54:30 2020 -0500 fix(items): SVG nonsense commit 95cfe28db0ec0a452ae6437b3a89c07b055a4092 Author: Sabe Jones <sabrecat@gmail.com> Date: Fri Apr 24 12:35:00 2020 -0500 fix(items): don't apply "empty" to equipment commit 5932b9e9fafc2afa914a36a91fcf4d03132f18a4 Author: Sabe Jones <sabrecat@gmail.com> Date: Fri Apr 24 11:50:46 2020 -0500 refactor(pins): move pin badge to component and implement across site commit 0533f6f79a8c51b506c2c1870bad529fccff9ae7 Author: Sabe Jones <sabrecat@gmail.com> Date: Fri Apr 24 11:50:23 2020 -0500 fix(mounts): misaligned tigers commit a74e64afa3e0ff7a032da3406f7787b4782cc7bf Author: Sabe Jones <sabrecat@gmail.com> Date: Fri Apr 24 06:17:53 2020 -0500 fix(svg): remove mask attributes commit ae0f874fb6b708b4420d8b3ac18aa3b92dc2554c Author: Sabe Jones <sabrecat@gmail.com> Date: Thu Apr 23 18:11:13 2020 -0500 refactor(icons): standard freeze structure commit 03c836313f91f761a1ae46d89b39625bd562d239 Author: Sabe Jones <sabrecat@gmail.com> Date: Thu Apr 23 16:31:33 2020 -0500 WIP(styles): pin badge story commit 661cf2a885a77fbc9edd8e84802354c282e86476 Merge: 34ec0b6c6ac4343379a1Author: Sabe Jones <sabrecat@gmail.com> Date: Thu Apr 23 14:48:22 2020 -0500 Merge branch 'develop' into sabrecat/quests-touchup commit 34ec0b6c6ae3991665699aafc80d49d550a1661b Author: Sabe Jones <sabrecat@gmail.com> Date: Mon Apr 20 16:12:11 2020 -0500 fix(items): style bodges commit 3bbe1e98e14e94d4e3de8bdcc192478fe5d7cd0d Merge: 095674ac0f13123c0baeAuthor: Sabe Jones <sabrecat@gmail.com> Date: Mon Apr 20 15:51:31 2020 -0500 Merge branch 'develop' into sabrecat/quests-touchup commit 095674ac0fd462a8558d9de5469b7216be579411 Author: Sabe Jones <sabrecat@gmail.com> Date: Tue Apr 7 12:27:03 2020 -0500 fix(markets): styling commit 8ffb8080a7b07ab0e5e19215bc8a3ce0b77cd54e Merge: 5d4b20cd4f9ac7840940Author: Sabe Jones <sabrecat@gmail.com> Date: Tue Apr 7 09:49:16 2020 -0500 Merge branch 'develop' into sabrecat/quests-touchup commit 5d4b20cd4f58c514ff788d5f64eb6398792c9583 Author: Sabe Jones <sabrecat@gmail.com> Date: Thu Mar 26 15:01:05 2020 -0500 WIP(shops): item updates start
This commit is contained in:
Sabe Jones
@@ -227,7 +227,7 @@
|
||||
></i>
|
||||
<div
|
||||
v-if="!user.purchased.background[bg.key]"
|
||||
class="purchase-background single"
|
||||
class="purchase-background single d-flex align-items-center justify-content-center"
|
||||
>
|
||||
<div
|
||||
class="svg-icon hourglass"
|
||||
@@ -237,16 +237,12 @@
|
||||
</div>
|
||||
<span
|
||||
v-if="!user.purchased.background[bg.key]"
|
||||
class="badge badge-pill badge-item badge-svg"
|
||||
:class="{
|
||||
'item-selected-badge': isBackgroundPinned(bg),
|
||||
'hide': !isBackgroundPinned(bg)}"
|
||||
@click.prevent.stop="togglePinned(bg)"
|
||||
class="badge-top"
|
||||
@click.stop.prevent="togglePinned(bg)"
|
||||
>
|
||||
<span
|
||||
class="svg-icon inline icon-12 color"
|
||||
v-html="icons.pin"
|
||||
></span>
|
||||
<pin-badge
|
||||
:pinned="isBackgroundPinned(bg)"
|
||||
/>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
@@ -295,7 +291,7 @@
|
||||
></i>
|
||||
<div
|
||||
v-if="!user.purchased.background[bg.key]"
|
||||
class="purchase-background single"
|
||||
class="purchase-background single d-flex align-items-center justify-content-center"
|
||||
>
|
||||
<div
|
||||
class="svg-icon gem"
|
||||
@@ -305,16 +301,12 @@
|
||||
</div>
|
||||
<span
|
||||
v-if="!user.purchased.background[bg.key]"
|
||||
class="badge badge-pill badge-item badge-svg"
|
||||
:class="{
|
||||
'item-selected-badge': isBackgroundPinned(bg),
|
||||
'hide': !isBackgroundPinned(bg)}"
|
||||
@click.prevent.stop="togglePinned(bg)"
|
||||
class="badge-top"
|
||||
@click.stop.prevent="togglePinned(bg)"
|
||||
>
|
||||
<span
|
||||
class="svg-icon inline icon-12 color"
|
||||
v-html="icons.pin"
|
||||
></span>
|
||||
<pin-badge
|
||||
:pinned="isBackgroundPinned(bg)"
|
||||
/>
|
||||
</span>
|
||||
</div>
|
||||
<div
|
||||
@@ -1095,38 +1087,14 @@
|
||||
}
|
||||
}
|
||||
|
||||
.badge-svg {
|
||||
left: calc((100% - 18px) / 2);
|
||||
cursor: pointer;
|
||||
color: $gray-400;
|
||||
background: $white;
|
||||
padding: 4.5px 6px;
|
||||
|
||||
&.item-selected-badge {
|
||||
background: $purple-300;
|
||||
color: $white;
|
||||
}
|
||||
}
|
||||
|
||||
.icon-12 {
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
}
|
||||
|
||||
span.badge.badge-pill.badge-item.badge-svg:not(.item-selected-badge) {
|
||||
color: #a5a1ac;
|
||||
}
|
||||
|
||||
span.badge.badge-pill.badge-item.badge-svg.hide {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.background-button {
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
.background-button:hover {
|
||||
span.badge.badge-pill.badge-item.badge-svg.hide {
|
||||
.badge-pin:not(.pinned) {
|
||||
display: none;
|
||||
}
|
||||
|
||||
&:hover .badge-pin {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
@@ -1142,6 +1110,7 @@ import usernameForm from './settings/usernameForm';
|
||||
import shops from '@/../../common/script/libs/shops';
|
||||
import guide from '@/mixins/guide';
|
||||
import notifications from '@/mixins/notifications';
|
||||
import PinBadge from '@/components/ui/pinBadge';
|
||||
import toggleSwitch from '@/components/ui/toggleSwitch';
|
||||
import bodySettings from './avatarModal/body-settings';
|
||||
import skinSettings from './avatarModal/skin-settings';
|
||||
@@ -1158,7 +1127,6 @@ import backgroundsIcon from '@/assets/svg/backgrounds.svg';
|
||||
import gem from '@/assets/svg/gem.svg';
|
||||
import hourglass from '@/assets/svg/hourglass.svg';
|
||||
import gold from '@/assets/svg/gold.svg';
|
||||
import pin from '@/assets/svg/pin.svg';
|
||||
import arrowRight from '@/assets/svg/arrow_right.svg';
|
||||
import arrowLeft from '@/assets/svg/arrow_left.svg';
|
||||
import svgClose from '@/assets/svg/close.svg';
|
||||
@@ -1170,14 +1138,14 @@ import content from '@/../../common/script/content/index';
|
||||
export default {
|
||||
components: {
|
||||
avatar,
|
||||
bodySettings,
|
||||
extraSettings,
|
||||
hairSettings,
|
||||
PinBadge,
|
||||
skinSettings,
|
||||
subMenu,
|
||||
toggleSwitch,
|
||||
usernameForm,
|
||||
bodySettings,
|
||||
skinSettings,
|
||||
hairSettings,
|
||||
extraSettings,
|
||||
|
||||
subMenu,
|
||||
},
|
||||
mixins: [guide, notifications, avatarEditorUtilies],
|
||||
data () {
|
||||
@@ -1198,7 +1166,6 @@ export default {
|
||||
backgroundsIcon,
|
||||
gem,
|
||||
hourglass,
|
||||
pin,
|
||||
gold,
|
||||
arrowRight,
|
||||
arrowLeft,
|
||||
|
||||
Reference in New Issue
Block a user