Merge branch 'release/2.29.0' into main

HarmlessKey · Aug 2, 2024 · 6036f9c · 6036f9c
2 parents 45fec18 + 631053c
commit 6036f9c
Show file tree

Hide file tree

Showing 6 changed files with 389 additions and 244 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-	"version": "2.28.2",
+	"version": "2.29.0",
 	"name": "shieldmaiden",
 	"description": "A Dungeons and Dragons Combat Tracker",
 	"productName": "Shieldmaiden",

diff --git a/src/assets/_img/shieldmaiden-combat-tracker-laptop.webp b/src/assets/_img/shieldmaiden-combat-tracker-laptop.webp
diff --git a/src/components/Header.vue b/src/components/Header.vue
@@ -33,8 +33,6 @@
 				</router-link>
 			</div>
 
-			<MusicPlayer />
-
 			<!-- ENVIRONMENT LABEL -->
 			<q-chip v-if="environment !== 'live'" color="red" icon="far fa-rocket" class="white">
 				<span class="ml-1">{{ environment.capitalize() }}</span>
@@ -184,14 +182,10 @@
 </template>
 
 <script>
-import MusicPlayer from "./MusicPlayer";
 import { mapActions, mapGetters } from "vuex";
 
 export default {
 	name: "Header",
-	components: {
-		MusicPlayer,
-	},
 	props: {
 		maintenance: {
 			type: [Boolean, String],