fix: various style issues

src/components/modals/main/scss/settings/_buttons.scss

@@ -153,11 +153,7 @@ input[type=number]::-webkit-outer-spin-button {
   outline: none;
 }
 
-.MuiCheckbox-root {
-  color: var(--modal-text) !important;
-}
-
-.MuiIconButton-label>svg.MuiSvgIcon-root {
+.MuiIconButton-label > svg.MuiSvgIcon-root {
   color: var(--modal-text) !important;
 }
 

src/components/modals/main/scss/settings/_main.scss

@@ -110,8 +110,12 @@ input[type=color]::-moz-color-swatch {
   margin-left: 0;
 }
 
-.MuiCheckbox-colorPrimary.Mui-checked, .MuiSwitch-colorPrimary.Mui-checked,  .MuIconButton-colorPrimary.Mui-checked{
-  color: map-get($button-colours, 'reset') !important;
+.MuiCheckbox-colorPrimary.Mui-checked, .MuiSwitch-colorPrimary.Mui-checked, .MuIconButton-colorPrimary.Mui-checked, .MuiSwitch-thumb, .MuiRadio-colorSecondary.Mui-checked {
+  color: var(--modal-text) !important;
+}
+
+.MuiRadio-root {
+  color: var(--modal-text);
 }
 
 .MuiFormControlLabel-labelPlacementStart {
@@ -141,4 +145,9 @@ input[type=color]::-moz-color-swatch {
 .radio-title {
   text-transform: uppercase;
   font-weight: bold;
+}
+
+.sortableitem {
+  width: auto !important;
+  color: var(--modal-text) !important;
 }

src/components/modals/main/settings/sections/Language.jsx

@@ -1,9 +1,9 @@
 import React from 'react';
 
-import Dropdown from '../Dropdown';
 import Radio from '../Radio';
 
 const languages = require('../../../../../modules/languages.json');
+const quote_languages = require('../../../../../modules/quote_languages.json');
 
 export default function LanguageSettings() {
   const language = window.language.modals.main.settings.sections.language;
@@ -12,11 +12,8 @@ export default function LanguageSettings() {
     <>
       <h2>{language.title}</h2>
       <Radio name='language' options={languages} />
-      <br/>
-      <Dropdown label={language.quote} name='quotelanguage'>
-        <option value='English'>English</option>
-        <option value='French'>Français</option>
-      </Dropdown>
+      <h3>{language.quote}</h3>
+      <Radio name='quotelanguage' options={quote_languages} />
     </>
   );
 }

src/components/modals/main/settings/sections/Order.jsx

@@ -5,7 +5,7 @@ import DragHandleIcon from '@material-ui/icons/DragIndicator';
 
 const SortableItem = sortableElement(({value}) => (
   <li className='sortableitem'>
-    <DragHandleIcon/>
+    <DragHandleIcon style={{'verticalAlign': 'middle'}} />
     {value.charAt(0).toUpperCase() + value.slice(1)}
   </li>
 ));

src/modules/default_settings.json

@@ -51,10 +51,6 @@
     "name": "backgroundAPI",
     "value": "mue"
   },
-  {
-    "name": "ampm",
-    "value": true
-  },
   {
     "name": "copyButton",
     "value": false
@@ -138,5 +134,9 @@
   {
     "name": "backgroundType",
     "value": "api"
+  },
+  {
+    "name": "timeformat",
+    "value": "twentyfourhour"
   }
 ]

src/modules/quote_languages.json

@@ -0,0 +1,10 @@
+[
+  {
+    "name": "English",
+    "value": "English"
+  },
+  {
+    "name": "Français",
+    "value": "French"
+  }
+]