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

Client Fixes (#8821)

Browse Source 
* new client: fix animation flickering

* fix transitions

* update copy
This commit is contained in:
Matteo Pagliazzi
2017-06-16 18:07:24 +02:00
committed by GitHub
parent f7ce269f3c
commit 042e5a8d63
7 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/client/assets/scss/icon.scss
View File

@@ -5,5 +5,9 @@
stroke-width: 0; stroke-width: 0;
stroke: currentColor; stroke: currentColor;
fill: currentColor; fill: currentColor;
transition: none; transition: none !important;
}
.svg-icon * {
transition: none !important;
} }

2
website/client/assets/scss/index.scss
View File

@@ -2,7 +2,7 @@
@import './utils'; @import './utils';
@import './colors'; @import './colors';
*:not(.svg-icon *) { * {
transition-duration: .15s; transition-duration: .15s;
transition-property: border-color, box-shadow, color; transition-property: border-color, box-shadow, color;
transition-timing-function: ease-in; transition-timing-function: ease-in;

1
website/client/components/appMenu.vue
View File

@@ -158,6 +158,7 @@ nav.navbar {
padding-right: 12.5px; padding-right: 12.5px;
padding-left: 12.5px; padding-left: 12.5px;
color: $header-color; color: $header-color;
transition: none;
&:hover { &:hover {
color: $white; color: $white;

2
website/client/components/inventory/equipment/index.vue
View File

@@ -112,7 +112,7 @@
a.btn.btn-show-more( a.btn.btn-show-more(
v-if="items[group.key].length > itemsPerLine", v-if="items[group.key].length > itemsPerLine",
@click="viewOptions[group.key].open = !viewOptions[group.key].open" @click="viewOptions[group.key].open = !viewOptions[group.key].open"
) {{ viewOptions[group.key].open ? $t('showLessGearItems', { type: group.label }) : $t('showAllGearItems', { type: group.label, items: items[group.key].length }) }} ) {{ viewOptions[group.key].open ? $t('showLessItems', { type: group.label }) : $t('showAllItems', { type: group.label, items: items[group.key].length }) }}
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>

2
website/client/components/inventory/items/index.vue
View File

@@ -53,7 +53,7 @@
a.btn.btn-show-more( a.btn.btn-show-more(
v-if="items[group.key].length > itemsPerLine", v-if="items[group.key].length > itemsPerLine",
@click="group.open = !group.open" @click="group.open = !group.open"
) {{ group.open ? $t('showLessGearItems', { type: $t(group.key) }) : $t('showAllGearItems', { type: $t(group.key), items: items[group.key].length }) }} ) {{ group.open ? $t('showLessItems', { type: $t(group.key) }) : $t('showAllItems', { type: $t(group.key), items: items[group.key].length }) }}
</template> </template>

6
website/client/components/memberDetails.vue
View File

@@ -41,16 +41,14 @@
.member-stats { .member-stats {
padding-left: 16px; padding-left: 16px;
padding-right: 24px; padding-right: 24px;
height: auto;
opacity: 1; opacity: 1;
transition: opacity 0.15s ease-out; transition: opacity 0.15s ease-out;
} }
.member-details.condensed:not(.expanded) .member-stats { .member-details.condensed:not(.expanded) .member-stats {
opacity: 0; opacity: 0;
height: 0; position: absolute;
padding: 0; z-index: -1;
width: 0;
} }
// Condensed version // Condensed version

4
website/common/locales/en/newClient.json
View File

@@ -30,8 +30,8 @@
"memberCount": "Member Count", "memberCount": "Member Count",
"recentActivity": "Recent Activity", "recentActivity": "Recent Activity",
"gearNotOwned": "You do not own this item.", "gearNotOwned": "You do not own this item.",
"showAllGearItems": "Show All <%= items %> <%= type %> Gear Items", "showAllItems": "Show All <%= items %> <%= type %> Items",
"showLessGearItems": "Show Less <%= type %> Gear Items", "showLessItems": "Show Less <%= type %> Items",
"noGearItemsOfType": "You don't own any pieces of <%= type %>.", "noGearItemsOfType": "You don't own any pieces of <%= type %>.",
"myGuilds": "My Guilds", "myGuilds": "My Guilds",
"guildsDiscovery": "Discover Guilds", "guildsDiscovery": "Discover Guilds",