Fix highlight block

client/src/components/SearchWarning.vue

@@ -12,7 +12,7 @@
     font-style: italic;
     color: $orange;
 
-    .highlight {
+    &.highlight {
       color: #fff;
       background-color: $orange-darken;
       font-style: normal;

client/src/main.ts

@@ -76,11 +76,16 @@ p.catch(err => {
 
     routes = routes.concat([
       {
-        path: '/' + locale,
+        path: base + locale,
         component: Search
       },
       {
-        path: '/search',
+        path: base + 'search',
+        component: Search
+      },
+      {
+        path: '/*',
+        // Don't want to create a 404 page
         component: Search
       }
     ])

client/src/views/Search.vue

@@ -444,8 +444,9 @@
       this.indexedInstancesUrl = config.indexedInstancesUrl
       this.indexName = config.searchInstanceName
 
-      this.loadUrl()
-      this.doSearch()
+      if (this.loadUrl()) {
+        this.doSearch()
+      }
     },
 
     watch: {
@@ -656,7 +657,7 @@
 
       loadUrl () {
         const query = this.$route.query as SearchUrl & { page: number }
-        if (Object.keys(query).length === 0) return
+        if (Object.keys(query).length === 0) return false
 
         if (query.search) this.formSearch = query.search
         if (query.nsfw) this.formNSFW = query.nsfw
@@ -673,6 +674,8 @@
         if (query.page && this.currentPage !== query.page) {
           this.currentPage = parseInt(query.page + '')
         }
+
+        return true
       },
 
       buildVideoSearchQuery () {