diff --git a/website/client/assets/scss/icon.scss b/website/client/assets/scss/icon.scss index 6039d4fae9..0686d9e2e5 100644 --- a/website/client/assets/scss/icon.scss +++ b/website/client/assets/scss/icon.scss @@ -5,5 +5,9 @@ stroke-width: 0; stroke: currentColor; fill: currentColor; - transition: none; + transition: none !important; +} + +.svg-icon * { + transition: none !important; } \ No newline at end of file diff --git a/website/client/assets/scss/index.scss b/website/client/assets/scss/index.scss index 8f4e979447..b01742f67b 100644 --- a/website/client/assets/scss/index.scss +++ b/website/client/assets/scss/index.scss @@ -2,7 +2,7 @@ @import './utils'; @import './colors'; -*:not(.svg-icon *) { +* { transition-duration: .15s; transition-property: border-color, box-shadow, color; transition-timing-function: ease-in; diff --git a/website/client/components/appMenu.vue b/website/client/components/appMenu.vue index cd4d431f6a..872953d826 100644 --- a/website/client/components/appMenu.vue +++ b/website/client/components/appMenu.vue @@ -158,6 +158,7 @@ nav.navbar { padding-right: 12.5px; padding-left: 12.5px; color: $header-color; + transition: none; &:hover { color: $white; diff --git a/website/client/components/inventory/equipment/index.vue b/website/client/components/inventory/equipment/index.vue index 04d8d0dbd0..dc060216a5 100644 --- a/website/client/components/inventory/equipment/index.vue +++ b/website/client/components/inventory/equipment/index.vue @@ -112,7 +112,7 @@ a.btn.btn-show-more( v-if="items[group.key].length > itemsPerLine", @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 }) }}