From a94e4bf547ba2b774c04300932dc9771a999ec00 Mon Sep 17 00:00:00 2001
From: Lukas Winkler <git@lw1.at>
Date: Sat, 20 Apr 2019 22:08:53 +0200
Subject: [PATCH] minor style improvements

---
 client/src/App.vue             | 3 +++
 client/src/components/Icon.vue | 4 ----
 client/src/utils.ts            | 5 +++--
 client/src/views/Main.vue      | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/src/App.vue b/client/src/App.vue
index 359819c..d39e9f5 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -45,6 +45,9 @@
 <script lang="ts">
     import Vue from "vue";
     import {Version} from "@/interfaces";
+    // @ts-ignore
+    import Navbar from "bootstrap-vue/es/components/navbar";
+    Vue.use(Navbar);
 
     const versionJSON = "/version.json";
 
diff --git a/client/src/components/Icon.vue b/client/src/components/Icon.vue
index 40bdc9c..e584945 100644
--- a/client/src/components/Icon.vue
+++ b/client/src/components/Icon.vue
@@ -4,9 +4,6 @@
 </template>
 <script lang="ts">
 import Vue from "vue";
-// @ts-ignore
-import Navbar from "bootstrap-vue/es/components/navbar";
-Vue.use(Navbar);
 
 export default Vue.extend({
     props: ["icon", "title"],
@@ -18,6 +15,5 @@ export default Vue.extend({
     .icon {
         width: 48px;
         height: 48px;
-        vertical-align: middle;
     }
 </style>
diff --git a/client/src/utils.ts b/client/src/utils.ts
index 546d547..f622929 100644
--- a/client/src/utils.ts
+++ b/client/src/utils.ts
@@ -1,9 +1,10 @@
-const regex = /("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)/g;
+// tslint:disable-next-line
+const regex = "/(\"(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\\"])*\"(\s*:)?|\b(tru./e|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)/g\"";
 
 export function syntaxHighlight(jsonstring: string): string {
     // from https://stackoverflow.com/a/7220510/
     jsonstring = jsonstring.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-    return jsonstring.replace(regex, (match) => {
+    return jsonstring.replace(regex, (match: string) => {
         let cls = "number";
         if (/^"/.test(match)) {
             if (/:$/.test(match)) {
diff --git a/client/src/views/Main.vue b/client/src/views/Main.vue
index 9feee1d..e7f1d53 100644
--- a/client/src/views/Main.vue
+++ b/client/src/views/Main.vue
@@ -50,7 +50,7 @@
             </div>
         </div>
         <div v-if="gotData">
-            <b-button variant="primary" :aria-expanded="showJSON ? true : false"
+            <b-button variant="primary" :aria-expanded="showJSON"
                       @click="showJSON=!showJSON">
                 Show Device Detector response
             </b-button>