Resolved merge conflict.

src/components/Movie.vue

@@ -7,27 +7,10 @@
         <img class="movie-item__img is-loaded"
              ref="poster-image"
              src="~assets/placeholder.png">
-
-        <!--   -->
-        <!-- <img v-else class="movie-item__img is-loaded" src="~assets/no-image.png" ref="image" alt="No image - linked image unavailable"> -->
       </figure>
-<!--         <figure class="movie__poster">
-          <img v-if="movie && poster === null"
-            class="movies-item__img is-loaded"
-            alt="movie poster image"
-            src="~assets/no-image.png">
-          <img v-else-if="poster === undefined"
-            class="movies-item__img grey"
-            alt="movie poster image"
-            src="~assets/placeholder.png">
-          <img v-else
-            class="movies-item__img is-loaded"
-            alt="movie poster image"
-            :src="ASSET_URL + ASSET_SIZES[0] + poster">
-        </figure> -->
 
-        <h1 class="movie__title" v-if="movie">{{ movie.title }}</h1>
-        <loading-placeholder v-else :count="1" />
+      <h1 class="movie__title" v-if="movie">{{ movie.title }}</h1>
+      <loading-placeholder v-else :count="1" />
     </header>
 
     <!-- Siderbar and movie info -->
@@ -75,7 +58,7 @@
         <div class="movie__info">
 
           <!-- Loading placeholder -->
-          <div class="movie__description"
+          <div class="movie__description noselect"
                @click="truncatedDescription=!truncatedDescription"
                v-if="!loading">
             <span :class="truncatedDescription ? 'truncated':null">{{ movie.overview }}</span>
@@ -211,13 +194,7 @@ export default {
       return numTorrents !== null ? numTorrents + ' results' : null
     },
     isPlexAuthenticated: () => {
-      const settings = store.getters['userModule/settings']
-      console.log('fetchedSettings', settings)
-
-      if (settings == null || settings['plex_userid'] == null)
-        return false
-
-      return true
+      return store.getters['userModule/isPlexAuthenticated']
     }
   },
   methods: {

src/components/ui/SeasonedButton.vue

@@ -9,7 +9,9 @@
 export default {
   name: 'seasonedButton',
   props: {
-    active: Boolean
+    required: false,
+    active: Boolean,
+    default: false
   },
   methods: {
     emit() {
@@ -46,9 +48,16 @@ export default {
     padding: 6px 20px 5px 20px;
   }
 
-  body:not(.touch) &:hover, &:focus, &:active, &.active {
+  &:focus, &:active, &.active {
     background: $text-color;
     color: $background-color;
   }
+
+  @media (hover: hover) {
+    &:hover {
+      background: $text-color;
+      color: $background-color;
+    }
+  }
 }
 </style>

src/modules/userModule.js

@@ -69,6 +69,10 @@ export default {
 
       ifMissingSettingsAndTokenExistsFetchSettings()
       return undefined
+    },
+    isPlexAuthenticated: (state) => {
+      let hasPlexId = state.settings['plex_userid']
+      return hasPlexId != undefined
     }
   },
   mutations: {