feat: expand clickable area for setting items (#1194)

Robot-Inventor · Nov 29, 2024 · 5ac21d6 · 5ac21d6
1 parent ca99e79
commit 5ac21d6
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 24 deletions.
diff --git a/src/css/browserAction.css b/src/css/browserAction.css
@@ -4,28 +4,28 @@
     --window-padding: 1.75rem;
     --container-outside-text-padding-left: 0.25rem;
 
-    --theme-background-color: #f2f3f6;
-    --theme-secondary-background-color: white;
-    --theme-secondary-background-color-variant: #fafafc;
-    --theme-font-color: rgb(51, 51, 51);
-    --theme-secondary-font-color: rgb(51, 51, 51, 0.7);
+    --md-surface-container: #f2f3f6;
+    --md-surface: white;
+    --md-surface-variant: #fafafc;
+    --md-on-surface: rgb(51, 51, 51);
+    --md-on-surface-variant: rgb(51, 51, 51, 0.7);
 
     --md-sys-color-primary: rgb(73, 113, 214);
-    --md-sys-color-on-primary: var(--theme-secondary-background-color);
+    --md-sys-color-on-primary: var(--md-surface);
     --md-sys-color-on-surface-variant: #888;
     --md-sys-color-on-surface: #aaa;
 }
 
 @media (prefers-color-scheme: dark) {
     :root {
-        --theme-background-color: #0d0e14;
-        --theme-secondary-background-color: #1f2029;
-        --theme-secondary-background-color-variant: #2a2b37;
-        --theme-font-color: #ebedf2;
-        --theme-secondary-font-color: #a8b2c7;
+        --md-surface-container: #0d0e14;
+        --md-surface: #1f2029;
+        --md-surface-variant: #2a2b37;
+        --md-on-surface: #ebedf2;
+        --md-on-surface-variant: #a8b2c7;
 
         --md-sys-color-primary: rgb(98, 125, 194);
-        --md-sys-color-on-primary: var(--theme-secondary-background-color);
+        --md-sys-color-on-primary: var(--md-surface);
         --md-sys-color-on-surface-variant: #aaa;
         --md-sys-color-on-surface: #888;
     }
@@ -41,8 +41,8 @@
 body {
     padding: var(--window-padding);
     width: max-content;
-    background: var(--theme-background-color);
-    color: var(--theme-font-color);
+    background: var(--md-surface-container);
+    color: var(--md-on-surface);
     font-size: 1rem;
 }
 
@@ -61,7 +61,7 @@ h1 {
     margin-left: 0.5rem;
     color: inherit;
     text-decoration: none;
-    color: var(--theme-secondary-font-color);
+    color: var(--md-on-surface-variant);
 }
 
 fieldset {
@@ -92,7 +92,7 @@ settings-description {
 
 small {
     font-size: 0.8em;
-    color: var(--theme-secondary-font-color);
+    color: var(--md-on-surface-variant);
     padding-left: var(--container-outside-text-padding-left);
 }
 

diff --git a/src/ts/components/settingsDescription.ts b/src/ts/components/settingsDescription.ts
@@ -17,7 +17,7 @@ class SettingsDescription extends LitElement {
             font-size: 0.8rem;
             flex-grow: 1;
             width: 0;
-            color: var(--theme-secondary-font-color);
+            color: var(--md-on-surface-variant);
         }
     `;
 

diff --git a/src/ts/components/settingsItem.ts b/src/ts/components/settingsItem.ts
@@ -20,28 +20,35 @@ class SettingsItem extends LitElement {
             flex-direction: row;
             justify-content: space-between;
             align-items: center;
-            gap: 1rem;
-            background: var(--theme-secondary-background-color);
-            padding: 1rem 1.5rem;
+            background: var(--md-surface);
             border-radius: 0.25rem;
             transition: background 0.2s;
         }
 
         .settings-item:hover {
-            background: var(--theme-secondary-background-color-variant);
+            background: var(--md-surface-variant);
         }
 
-        .settings-item,
         .settings-item > * {
             cursor: pointer;
+            padding: 1rem 0;
         }
 
-        .settings-item > label {
+        .settings-item > *:first-child {
+            padding-left: 1.5rem;
+        }
+
+        .settings-item > *:last-child {
+            padding-right: 1.5rem;
+        }
+
+        label {
             flex-grow: 1;
         }
 
-        md-checkbox {
+        .settings-item > md-checkbox {
             flex-shrink: 0;
+            padding-left: 1.5rem;
         }
 
         .first-item {