From c6dd27180a54d5a71c4601fe7b61b3356d4492d2 Mon Sep 17 00:00:00 2001
From: David Ralph <ohlookitsderpy@protonmail.com>
Date: Sun, 21 Mar 2021 13:19:24 +0000
Subject: [PATCH] fix: welcome modal text and colour picker icon

---
 src/components/modals/main/scss/settings/_main.scss    | 6 +++---
 src/components/modals/welcome/Welcome.jsx              | 2 +-
 src/components/widgets/background/PhotoInformation.jsx | 4 +++-
 src/translations/en-GB.json                            | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/modals/main/scss/settings/_main.scss b/src/components/modals/main/scss/settings/_main.scss
index 0e5fb808..f4d8c1fe 100644
--- a/src/components/modals/main/scss/settings/_main.scss
+++ b/src/components/modals/main/scss/settings/_main.scss
@@ -93,11 +93,11 @@ input[type=color] {
   border-radius: 100%;
   height: 30px;
   width: 30px;
-  box-shadow: map-get($main-parts, 'shadow');
   border: none;
   outline: none;
   -webkit-appearance: none;
   vertical-align: middle;
+  background: none;
 
   &::-webkit-color-swatch-wrapper {
     padding: 0;
@@ -113,11 +113,11 @@ 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;
+  -moz-appearance: none;
   vertical-align: middle;
+  background: none;
 
   &::-moz-color-swatch-wrapper {
     padding: 0;
diff --git a/src/components/modals/welcome/Welcome.jsx b/src/components/modals/welcome/Welcome.jsx
index f606dc59..754ad18b 100644
--- a/src/components/modals/welcome/Welcome.jsx
+++ b/src/components/modals/welcome/Welcome.jsx
@@ -17,7 +17,7 @@ export default function WelcomeModal(props) {
         <h1 className='welcometitle'>Mue Tab</h1>
         <img alt='celebration' style={{ 'height': '200px', 'width': 'auto' }} draggable={false} src='./././icons/undraw_celebration.svg' />
         <h2 className='subtitle'>{language.information}</h2>
-        <p>{language.thankyoumessage1},<br/> {language.thankyoumessage2}</p>
+        <p>{language.thankyoumessage1}<br/> {language.thankyoumessage2}</p>
         <h2 className='subtitle'>{language.support}</h2>
         <a href='mailto:hello@muetab.com' className='welcomeLink' target='_blank' rel='noopener noreferrer'><EmailIcon/></a>
         <a href='https://twitter.com/getmue' className='welcomeLink' target='_blank' rel='noopener noreferrer'><TwitterIcon/></a>
diff --git a/src/components/widgets/background/PhotoInformation.jsx b/src/components/widgets/background/PhotoInformation.jsx
index a5b0308b..9542a49b 100644
--- a/src/components/widgets/background/PhotoInformation.jsx
+++ b/src/components/widgets/background/PhotoInformation.jsx
@@ -9,7 +9,9 @@ import Photographer from '@material-ui/icons/Person';
 export default function PhotoInformation(props) {
   const language = window.language.widgets.background;
 
-  if (props.info.hidden === true) return null;
+  if (props.info.hidden === true) {
+    return null;
+  }
 
   return (
     <div className='photoInformation'>
diff --git a/src/translations/en-GB.json b/src/translations/en-GB.json
index 44cee06f..06a23585 100644
--- a/src/translations/en-GB.json
+++ b/src/translations/en-GB.json
@@ -244,7 +244,7 @@
     "welcome": {
       "title": "Welcome to",
       "information": "Information",
-      "thankyoumessage1": "Thank you for downloading Mue Tab,",
+      "thankyoumessage1": "Thank you for installing Mue Tab,",
       "thankyoumessage2": "we hope you enjoy your time with our extension.",
       "support": "Support",
       "close": "Close"