Add changes from prod to master (#837)

* redo 6346b5b

* Fix incorrect caps

* Fix reduced motion
This commit is contained in:
Geometrically
2023-01-07 19:40:34 -07:00
committed by GitHub
parent 212bb33142
commit d5ffede5ea
3 changed files with 10 additions and 6 deletions

View File

@@ -212,7 +212,7 @@
class="tab iconified-button" class="tab iconified-button"
@click.native="isBrowseMenuOpen = false" @click.native="isBrowseMenuOpen = false"
> >
<span>Data packs</span> <span>Data Packs</span>
</NuxtLink> </NuxtLink>
<NuxtLink <NuxtLink
:tabindex="isBrowseMenuOpen ? 0 : -1" :tabindex="isBrowseMenuOpen ? 0 : -1"
@@ -228,7 +228,7 @@
class="tab iconified-button" class="tab iconified-button"
@click.native="isBrowseMenuOpen = false" @click.native="isBrowseMenuOpen = false"
> >
<span>Resource packs</span> <span>Resource Packs</span>
</NuxtLink> </NuxtLink>
<NuxtLink <NuxtLink
:tabindex="isBrowseMenuOpen ? 0 : -1" :tabindex="isBrowseMenuOpen ? 0 : -1"

View File

@@ -178,12 +178,16 @@ export default {
}, },
licenseId() { licenseId() {
let id = '' let id = ''
if (this.nonSpdxLicense || this.license.short === 'All-Rights-Reserved') if (
(this.nonSpdxLicense && this.license.friendly === 'Custom') ||
this.license.short === 'All-Rights-Reserved'
)
id += 'LicenseRef-' id += 'LicenseRef-'
id += this.license.short id += this.license.short
if (this.license.requiresOnlyOrLater) if (this.license.requiresOnlyOrLater)
id += this.allowOrLater ? 'or-later' : '-only' id += this.allowOrLater ? 'or-later' : '-only'
if (this.nonSpdxLicense) id.replaceAll(' ', '-') if (this.nonSpdxLicense && this.license.short === 'Custom')
id.replaceAll(' ', '-')
return id return id
}, },
defaultLicenses() { defaultLicenses() {

View File

@@ -744,7 +744,7 @@ export default {
animation: scroll 100s linear infinite; animation: scroll 100s linear infinite;
@media (prefers-reduced-motion) { @media (prefers-reduced-motion) {
animation-play-state: paused; animation-play-state: paused !important;
} }
@keyframes scroll { @keyframes scroll {
@@ -1250,7 +1250,7 @@ export default {
animation: slide 10s infinite; animation: slide 10s infinite;
@media (prefers-reduced-motion) { @media (prefers-reduced-motion) {
animation-play-state: paused; animation-play-state: paused !important;
} }
} }