Profile Page: redesign gear label (#12395)

* redesign gear label + lintOnSave not in development environment

* fix lint / build

* fix(lint): remove extra parens

* fix break-word + remove lintOnSave

* remove unneeded styles

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
This commit is contained in:
negue
2020-07-17 12:43:27 +02:00
committed by GitHub
parent 8bbb0ddaee
commit 0261d12bd9

View File

@@ -17,7 +17,7 @@
<div <div
v-if="label !== 'skip'" v-if="label !== 'skip'"
:id="key" :id="key"
class="box" class="gear box"
:class="{white: equippedItems[key] && equippedItems[key].indexOf('base_0') === -1}" :class="{white: equippedItems[key] && equippedItems[key].indexOf('base_0') === -1}"
> >
<div :class="`shop_${equippedItems[key]}`"></div> <div :class="`shop_${equippedItems[key]}`"></div>
@@ -39,9 +39,12 @@
:user="user" :user="user"
/> />
</b-popover> </b-popover>
<h3 v-if="label !== 'skip'"> <span
v-if="label !== 'skip'"
class="gear-label"
>
{{ label }} {{ label }}
</h3> </span>
</div> </div>
</div> </div>
</div> </div>
@@ -60,7 +63,7 @@
<div <div
v-if="label !== 'skip'" v-if="label !== 'skip'"
:id="key + 'C'" :id="key + 'C'"
class="box" class="gear box"
:class="{white: costumeItems[key] && costumeItems[key].indexOf('base_0') === -1}" :class="{white: costumeItems[key] && costumeItems[key].indexOf('base_0') === -1}"
> >
<div :class="`shop_${costumeItems[key]}`"></div> <div :class="`shop_${costumeItems[key]}`"></div>
@@ -68,7 +71,7 @@
<!-- Show background on 8th tile rather than a piece of equipment.--> <!-- Show background on 8th tile rather than a piece of equipment.-->
<div <div
v-if="label === 'skip'" v-if="label === 'skip'"
class="box" class="gear box"
:class="{white: user.preferences.background}" :class="{white: user.preferences.background}"
style="overflow:hidden" style="overflow:hidden"
> >
@@ -91,12 +94,18 @@
:user="user" :user="user"
/> />
</b-popover> </b-popover>
<h3 v-if="label !== 'skip'"> <span
v-if="label !== 'skip'"
class="gear-label"
>
{{ label }} {{ label }}
</h3> </span>
<h3 v-else> <span
v-else
class="gear-label"
>
{{ $t('background') }} {{ $t('background') }}
</h3> </span>
</div> </div>
</div> </div>
</div> </div>
@@ -667,9 +676,9 @@ export default {
} }
.item-wrapper { .item-wrapper {
h3 {
text-align: center; text-align: center;
} vertical-align: top;
margin-bottom: 0.5rem;
} }
.pet-mount-row { .pet-mount-row {
@@ -684,4 +693,34 @@ export default {
.save-row { .save-row {
margin-top: 1em; margin-top: 1em;
} }
.gear.box {
vertical-align: top;
margin: 0 auto;
}
.gear-label {
margin: 0 auto;
margin-top: 0.5rem;
min-height: 1rem;
font-family: Roboto;
font-size: 12px;
font-weight: bold;
line-height: 1.33;
text-align: center;
color: $gray-200;
text-overflow: ellipsis;
// the following 4 lines are needed for the 2 line clamp
// the non-prefixes not supported "anywhere" but these "-webkit"-ones are
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
overflow: hidden;
// breaks the long words without a space
word-break: break-word;
}
</style> </style>