From 0ab3424e3e82899722fb617522e33fcb5f89c4b5 Mon Sep 17 00:00:00 2001 From: samcm Date: Mon, 13 Nov 2017 12:42:21 +1100 Subject: [PATCH] Upgrading Vuetify -> .16.9 Vue -> 2.5.2 --- package.json | 4 +- src/App.vue | 32 ++- src/assets/css/styleNew.css | 23 ++ src/components/application.vue | 30 +-- src/components/application/joinroom.vue | 2 - src/components/application/plexbrowser.vue | 6 +- .../application/plexbrowser/plexcontent.vue | 20 +- .../application/plexbrowser/plexlibrary.vue | 2 +- .../application/plexbrowser/plexseason.vue | 6 +- .../application/plexbrowser/plexseries.vue | 2 +- .../application/plexbrowser/plexserver.vue | 6 +- .../application/plexbrowser/plexthumb.vue | 6 +- src/components/application/plexserver.vue | 18 -- src/components/application/ptplayer.vue | 2 +- .../application/ptplayer/videoplayer.vue | 21 +- src/components/application/sidebar.vue | 253 ------------------ src/components/application/walkthrough.vue | 16 +- src/components/home.vue | 6 +- src/sidebar.vue | 133 ++++----- 19 files changed, 163 insertions(+), 425 deletions(-) delete mode 100644 src/components/application/plexserver.vue delete mode 100644 src/components/application/sidebar.vue diff --git a/package.json b/package.json index 0460d59a..97d37500 100644 --- a/package.json +++ b/package.json @@ -15,9 +15,9 @@ "cors": "^2.8.3", "socket.io": "^2.0.3", "videojs-contrib-hls": "^5.5.2", - "vue": "^2.4.2", + "vue": "^2.5.2", "vue-router": "^2.3.1", - "vuetify": "^0.13.1" + "vuetify": "^0.16.9" }, "devDependencies": { "autoprefixer": "^6.7.2", diff --git a/src/App.vue b/src/App.vue index e1cd03d5..18a560ba 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,12 +1,14 @@ diff --git a/src/assets/css/styleNew.css b/src/assets/css/styleNew.css index 16395623..c37527e6 100644 --- a/src/assets/css/styleNew.css +++ b/src/assets/css/styleNew.css @@ -231,6 +231,29 @@ span { /* PTPlayer */ +.video-js.vjs-fluid, +.video-js.vjs-16-9, +.video-js.vjs-4-3, +video.video-js, +video.vjs-tech, { + max-height: calc(100vh - 64px); + position: relative !important; + width: 100%; + height: auto !important; + max-width: 100% !important; + padding-top: 0 !important; + line-height: 0; +} + +/* Fix the control bar due to us resetting the line-height on the video-js */ +.vjs-control-bar { + line-height: 1; +} + +.ptplayer .video-js { + max-height: calc(100vh - 64px) !important; +} + .ptplayer .video-js .vjs-menu-button-inline.vjs-slider-active, .video-js .vjs-menu-button-inline:focus, .video-js .vjs-menu-button-inline:hover, .video-js.vjs-no-flex .vjs-menu-button-inline { width: 10em } diff --git a/src/components/application.vue b/src/components/application.vue index aaccc6cf..f5fdc3d5 100644 --- a/src/components/application.vue +++ b/src/components/application.vue @@ -1,26 +1,28 @@ @@ -39,12 +41,10 @@ // Components import plexclient from './application/plexclient' - import plexserver from './application/plexserver' import ptuser from './application/ptuser' import joinroom from './application/joinroom' import chatmessage from './application/chatmessage' import walkthrough from './application/walkthrough' - import sidebar from './application/sidebar' import ptplayer from './application/ptplayer' import plexbrowser from './application/plexbrowser' import plexcontent from './application/plexbrowser/plexcontent' @@ -54,9 +54,7 @@ name: 'application', components: { plexclient, - plexserver, joinroom, - sidebar, ptuser, chatmessage, walkthrough, diff --git a/src/components/application/joinroom.vue b/src/components/application/joinroom.vue index 8f5b6f7e..5a6a729b 100644 --- a/src/components/application/joinroom.vue +++ b/src/components/application/joinroom.vue @@ -48,7 +48,6 @@ :autofocus="true" v-on:keyup.enter.native="joinRoom()" v-model="room" - class="input-group" > @@ -59,7 +58,6 @@ label="Room password" v-on:keyup.enter.native="joinRoom()" v-model="password" - class="pt-0 mt-0 input-group orange--text" > diff --git a/src/components/application/plexbrowser.vue b/src/components/application/plexbrowser.vue index c9dee508..974ae914 100644 --- a/src/components/application/plexbrowser.vue +++ b/src/components/application/plexbrowser.vue @@ -38,7 +38,7 @@ Movies ({{filteredMovies.length}}) - + @@ -47,7 +47,7 @@ TV Shows ({{filteredShows.length}}) - + @@ -79,7 +79,7 @@

Browse

- + diff --git a/src/components/application/plexbrowser/plexcontent.vue b/src/components/application/plexbrowser/plexcontent.vue index 7c9f5ca0..00b5bbae 100644 --- a/src/components/application/plexbrowser/plexcontent.vue +++ b/src/components/application/plexbrowser/plexcontent.vue @@ -32,9 +32,9 @@
- {{ largestRes }}p - {{ contents.year }} - {{ contents.contentRating }} + {{ largestRes }}p + {{ contents.year }} + {{ contents.contentRating }}
@@ -54,9 +54,9 @@
- {{ largestRes }}p - {{ contents.contentRating }} - {{ contents.studio }} + {{ largestRes }}p + {{ contents.contentRating }} + {{ contents.studio }}
@@ -100,14 +100,14 @@
- {{ contents.year }} - {{ copy.audioCodec.toUpperCase() }} + {{ contents.year }} + {{ copy.audioCodec.toUpperCase() }}
- {{ country.tag }} - {{ genre.tag }} + {{ country.tag }} + {{ genre.tag }}
diff --git a/src/components/application/plexbrowser/plexlibrary.vue b/src/components/application/plexbrowser/plexlibrary.vue index 6cc3e343..00152975 100644 --- a/src/components/application/plexbrowser/plexlibrary.vue +++ b/src/components/application/plexbrowser/plexlibrary.vue @@ -11,7 +11,7 @@
- + diff --git a/src/components/application/plexbrowser/plexseason.vue b/src/components/application/plexbrowser/plexseason.vue index 966457fc..528e1ce0 100644 --- a/src/components/application/plexbrowser/plexseason.vue +++ b/src/components/application/plexbrowser/plexseason.vue @@ -31,8 +31,8 @@

{{ content.summary }}

- {{ contents.MediaContainer.grandparentContentRating }} - {{ contents.MediaContainer.grandparentStudio }} + {{ contents.MediaContainer.grandparentContentRating }} + {{ contents.MediaContainer.grandparentStudio }}
@@ -45,7 +45,7 @@
- + diff --git a/src/components/application/plexbrowser/plexseries.vue b/src/components/application/plexbrowser/plexseries.vue index 69732088..b34d0ee4 100644 --- a/src/components/application/plexbrowser/plexseries.vue +++ b/src/components/application/plexbrowser/plexseries.vue @@ -53,7 +53,7 @@

Seasons

- + diff --git a/src/components/application/plexbrowser/plexserver.vue b/src/components/application/plexbrowser/plexserver.vue index e1cf6eef..d45664bb 100644 --- a/src/components/application/plexbrowser/plexserver.vue +++ b/src/components/application/plexbrowser/plexserver.vue @@ -13,9 +13,9 @@

Libraries

- - - + + +
diff --git a/src/components/application/plexbrowser/plexthumb.vue b/src/components/application/plexbrowser/plexthumb.vue index 3819711e..d5e31ef1 100644 --- a/src/components/application/plexbrowser/plexthumb.vue +++ b/src/components/application/plexbrowser/plexthumb.vue @@ -1,8 +1,6 @@