Revert "Merge branch 'master' of github.com:owntone/owntone-server"

This reverts commit bb2a778, reversing changes made to f8e2298.
owntone · Jan 23, 2025 · 8a177ed · 8a177ed
1 parent 614bcaa
commit 8a177ed
Show file tree

Hide file tree

Showing 114 changed files with 3,382 additions and 2,603 deletions.
diff --git a/web-src/package-lock.json b/web-src/package-lock.json
diff --git a/web-src/package.json b/web-src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "owntone-web",
-  "version": "3.0.0",
+  "version": "2.0.1",
   "type": "module",
   "scripts": {
     "serve": "vite --port 3000 --host",
@@ -16,7 +16,8 @@
     "@mdi/js": "^7.4.47",
     "@ts-pro/vue-eternal-loading": "^1.3.1",
     "axios": "^1.7.4",
-    "bulma": "^1.0.2",
+    "bulma": "^0.9.4",
+    "bulma-switch": "^2.0.4",
     "luxon": "^3.4.4",
     "mdi-vue": "^3.0.13",
     "pinia": "^2.1.7",

diff --git a/web-src/src/App.vue b/web-src/src/App.vue
@@ -1,24 +1,27 @@
 <template>
-  <navbar-top />
-  <vue-progress-bar class="has-background-info" />
-  <router-view v-slot="{ Component }">
-    <component :is="Component" />
-  </router-view>
-  <modal-dialog-remote-pairing
-    :show="pairing_active"
-    @close="pairing_active = false"
-  />
-  <modal-dialog-update
-    :show="show_update_dialog"
-    @close="show_update_dialog = false"
-  />
-  <notification-list v-show="!show_burger_menu" />
-  <navbar-bottom />
-  <div
-    v-show="show_burger_menu || show_player_menu"
-    class="overlay-fullscreen"
-    @click="show_burger_menu = show_player_menu = false"
-  />
+  <div id="app">
+    <navbar-top />
+    <vue-progress-bar class="has-background-info" />
+    <router-view v-slot="{ Component }">
+      <component :is="Component" />
+    </router-view>
+
+    <modal-dialog-remote-pairing
+      :show="pairing_active"
+      @close="pairing_active = false"
+    />
+    <modal-dialog-update
+      :show="show_update_dialog"
+      @close="show_update_dialog = false"
+    />
+    <notification-list v-show="!show_burger_menu" />
+    <navbar-bottom />
+    <div
+      v-show="show_burger_menu || show_player_menu"
+      class="fd-overlay-fullscreen"
+      @click="show_burger_menu = show_player_menu = false"
+    />
+  </div>
 </template>
 
 <script>

diff --git a/web-src/src/components/BaseModal.vue b/web-src/src/components/BaseModal.vue
diff --git a/web-src/src/components/ControlDropdown.vue b/web-src/src/components/ControlDropdown.vue
@@ -64,3 +64,5 @@ export default {
   }
 }
 </script>
+
+<style></style>
diff --git a/web-src/src/components/ControlMainVolume.vue b/web-src/src/components/ControlMainVolume.vue
diff --git a/web-src/src/components/ControlOutputVolume.vue b/web-src/src/components/ControlOutputVolume.vue
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,3 +64,5 @@ export default { @@
       }
     }
     </script>
+    <style></style>