From 7dbd4976b75ac6462a49d4a2dc3bdd2c8c1feabf Mon Sep 17 00:00:00 2001
From: David Ralph <ohlookitsderpy@protonmail.com>
Date: Wed, 23 Sep 2020 10:48:23 +0100
Subject: [PATCH] Even more bug fixes

---
 src/components/Navbar.jsx          |  2 +-
 src/components/modals/Settings.jsx |  2 +-
 src/components/widgets/Search.jsx  |  6 ++++--
 src/modules/settingsFunctions.js   |  7 +++++--
 src/scss/modules/_settings.scss    | 24 +++++++++++++++++++++++-
 src/translations/en.json           |  3 ++-
 6 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/components/Navbar.jsx b/src/components/Navbar.jsx
index 57368748..dda970fc 100644
--- a/src/components/Navbar.jsx
+++ b/src/components/Navbar.jsx
@@ -5,7 +5,7 @@ import NewReleases from '@material-ui/icons/NewReleases';
 
 export default class Navbar extends React.PureComponent {
   render() {
-    let refreshHTML = <div className='navbar2' ><RefreshIcon className='refreshicon' onClick={() => window.location.reload()} /></div>;
+    let refreshHTML = <div className='navbar2'><RefreshIcon className='refreshicon' onClick={() => window.location.reload()} /></div>;
     const refresh = localStorage.getItem('refresh');
     if (refresh === 'false') refreshHTML = '';
 
diff --git a/src/components/modals/Settings.jsx b/src/components/modals/Settings.jsx
index a3e39a1b..aeefd74e 100644
--- a/src/components/modals/Settings.jsx
+++ b/src/components/modals/Settings.jsx
@@ -82,7 +82,7 @@ export default class Settings extends React.PureComponent {
           </Section>
           <Section title={this.props.language.quote.title} name='quote'>
             <Checkbox name='copyButton' text={this.props.language.quote.copy} />
-            <Checkbox name='tweetButton' text='Tweet Button' />
+            <Checkbox name='tweetButton' text={this.props.language.quote.tweet} />
           </Section>
           <Section title={this.props.language.background.title} name='background'>
             <BackgroundSettings language={this.props.language} toastLanguage={this.props.toastLanguage} />
diff --git a/src/components/widgets/Search.jsx b/src/components/widgets/Search.jsx
index 1fbf60fb..787c893e 100644
--- a/src/components/widgets/Search.jsx
+++ b/src/components/widgets/Search.jsx
@@ -11,8 +11,10 @@ export default class Search extends React.PureComponent {
 
     const setting = localStorage.getItem('searchEngine');
     const info = searchEngines.find(i => i.settingsName === setting);
-    url = info.url;
-    if (info.query) query = info.query;
+    if (info !== undefined) {
+      url = info.url;
+      if (info.query) query = info.query;
+    }
 
     const custom = localStorage.getItem('customSearchEngine');
     if (custom) url = custom;
diff --git a/src/modules/settingsFunctions.js b/src/modules/settingsFunctions.js
index eaf968dc..3197418c 100644
--- a/src/modules/settingsFunctions.js
+++ b/src/modules/settingsFunctions.js
@@ -63,8 +63,11 @@ export default class SettingsFunctions {
             localStorage.setItem('customBackgroundColour', document.getElementById('customBackgroundHex').textContent);
         }
         if (document.getElementById('searchEngineInput').enabled === 'true') {
-          localStorage.setItem('searchEngine', 'custom');
-          localStorage.setItem('customSearchEngine', document.getElementById('customSearchEngine').value);
+          const input = document.getElementById('customSearchEngine').value;
+          if (input) {
+            localStorage.setItem('searchEngine', 'custom');
+            localStorage.setItem('customSearchEngine', input);
+          }
         }
         window.location.reload();
     }
diff --git a/src/scss/modules/_settings.scss b/src/scss/modules/_settings.scss
index 80829769..de919461 100644
--- a/src/scss/modules/_settings.scss
+++ b/src/scss/modules/_settings.scss
@@ -160,6 +160,7 @@ li {
     width: 25px;
     height: 25px;
     border-radius: 12px;
+    border: 0;
     background: map-get($theme-colours, "gradient");
     cursor: pointer;
   }
@@ -185,6 +186,27 @@ input[type=color] {
   }
 }
 
+// This is duplicated because it didn't work with a comma, need to look into it later
+input[type=color]::-moz-color-swatch {
+  border-radius: 100%;
+  height: 30px;
+  width: 30px;
+  box-shadow: map-get($main-parts, "shadow");
+  border: none;
+  outline: none;
+  -webkit-appearance: none;
+  vertical-align: middle;
+
+  &::-moz-color-swatch-wrapper {
+    padding: 0;
+  }
+
+  &::-moz-color-swatch {
+    border: none;
+    border-radius: 100%;
+  }
+}
+
 input[type=checkbox] {
   vertical-align: middle;
 }
@@ -226,4 +248,4 @@ select#language {
   .choices {
     background-color: white;
   }
-}
\ No newline at end of file
+}
diff --git a/src/translations/en.json b/src/translations/en.json
index 43e451b1..22b3eb2d 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -32,7 +32,8 @@
         },
         "quote": {
             "title": "Quote",
-            "copy": "Copy Button"
+            "copy": "Copy Button",
+            "tweet": "Tweet Button"
         },
         "background": {
             "title": "Background",