From d5ffede5ea496add166c24eb2c6f2a29606b47c8 Mon Sep 17 00:00:00 2001
From: Geometrically <18202329+Geometrically@users.noreply.github.com>
Date: Sat, 7 Jan 2023 19:40:34 -0700
Subject: [PATCH] Add changes from prod to master (#837)

* redo 6346b5b

* Fix incorrect caps

* Fix reduced motion
---
 layouts/default.vue                  | 4 ++--
 pages/_type/_id/settings/license.vue | 8 ++++++--
 pages/index.vue                      | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/layouts/default.vue b/layouts/default.vue
index 2b290fdd7..84bfc731b 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -212,7 +212,7 @@
             class="tab iconified-button"
             @click.native="isBrowseMenuOpen = false"
           >
-            <span>Data packs</span>
+            <span>Data Packs</span>
           </NuxtLink>
           <NuxtLink
             :tabindex="isBrowseMenuOpen ? 0 : -1"
@@ -228,7 +228,7 @@
             class="tab iconified-button"
             @click.native="isBrowseMenuOpen = false"
           >
-            <span>Resource packs</span>
+            <span>Resource Packs</span>
           </NuxtLink>
           <NuxtLink
             :tabindex="isBrowseMenuOpen ? 0 : -1"
diff --git a/pages/_type/_id/settings/license.vue b/pages/_type/_id/settings/license.vue
index d46fd7dbb..5d5bb80fb 100644
--- a/pages/_type/_id/settings/license.vue
+++ b/pages/_type/_id/settings/license.vue
@@ -178,12 +178,16 @@ export default {
     },
     licenseId() {
       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 += this.license.short
       if (this.license.requiresOnlyOrLater)
         id += this.allowOrLater ? 'or-later' : '-only'
-      if (this.nonSpdxLicense) id.replaceAll(' ', '-')
+      if (this.nonSpdxLicense && this.license.short === 'Custom')
+        id.replaceAll(' ', '-')
       return id
     },
     defaultLicenses() {
diff --git a/pages/index.vue b/pages/index.vue
index 488034931..417cb9ca1 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -744,7 +744,7 @@ export default {
         animation: scroll 100s linear infinite;
 
         @media (prefers-reduced-motion) {
-          animation-play-state: paused;
+          animation-play-state: paused !important;
         }
 
         @keyframes scroll {
@@ -1250,7 +1250,7 @@ export default {
     animation: slide 10s infinite;
 
     @media (prefers-reduced-motion) {
-      animation-play-state: paused;
+      animation-play-state: paused !important;
     }
   }