settings: remove colorBlindMode setting and move theme to the top

AdamNowotny · Aug 18, 2024 · 9fd0cc1 · 9fd0cc1
1 parent 1e234e6
commit 9fd0cc1
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 46 deletions.
diff --git a/src/common/__mocks__/core.mock.views.js b/src/common/__mocks__/core.mock.views.js
@@ -5,7 +5,6 @@ export default {
     showCommits: true,
     showCommitsWhenGreen: true,
     theme: 'dark',
-    colorBlindMode: true,
     notifications: {
         enabled: true,
         buildBroken: true,

diff --git a/src/common/types.ts b/src/common/types.ts
@@ -92,7 +92,6 @@ export interface ViewConfig {
     showCommits?: boolean;
     showCommitsWhenGreen?: boolean;
     theme?: string;
-    colorBlindMode?: boolean;
     notifications?: {
         enabled: boolean;
         buildBroken: boolean;

diff --git a/src/service-worker/storage/view-config.test.ts b/src/service-worker/storage/view-config.test.ts
@@ -22,7 +22,6 @@ beforeEach(() => {
         showCommits: true,
         showCommitsWhenGreen: false,
         theme: 'dark',
-        colorBlindMode: true,
         notifications: {
             enabled: true,
             buildBroken: true,

diff --git a/src/service-worker/storage/view-config.ts b/src/service-worker/storage/view-config.ts
@@ -8,7 +8,6 @@ const defaultConfiguration: ViewConfig = {
     showCommits: true,
     showCommitsWhenGreen: true,
     theme: 'dark',
-    colorBlindMode: true,
     notifications: {
         enabled: true,
         buildBroken: true,

diff --git a/src/settings/view/view.html b/src/settings/view/view.html
@@ -1,5 +1,26 @@
 <div class="col-md-12">
     <form class="form-horizontal col-md-4" role="form">
+        <div class="form-group">
+            <label class="col-md-6 control-label">Theme</label>
+            <div class="col-md-6">
+                <ul class="nav nav-pills">
+                    <li
+                        role="presentation"
+                        ng-class="{ active: viewConfig.theme === 'dark' }"
+                        ng-click="setField('theme', 'dark')"
+                    >
+                        <a>Dark</a>
+                    </li>
+                    <li
+                        role="presentation"
+                        ng-class="{ active: viewConfig.theme === 'light' }"
+                        ng-click="setField('theme', 'light')"
+                    >
+                        <a>Light</a>
+                    </li>
+                </ul>
+            </div>
+        </div>
         <div class="form-group">
             <label class="col-md-6 control-label">Number of columns</label>
             <div class="col-md-6">
@@ -97,48 +118,6 @@
                 </ul>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-md-6 control-label">Theme</label>
-            <div class="col-md-6">
-                <ul class="nav nav-pills">
-                    <li
-                        role="presentation"
-                        ng-class="{ active: viewConfig.theme === 'dark' }"
-                        ng-click="setField('theme', 'dark')"
-                    >
-                        <a>Dark</a>
-                    </li>
-                    <li
-                        role="presentation"
-                        ng-class="{ active: viewConfig.theme === 'light' }"
-                        ng-click="setField('theme', 'light')"
-                    >
-                        <a>Light</a>
-                    </li>
-                </ul>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-md-6 control-label">Color-blind mode</label>
-            <div class="col-md-6">
-                <ul class="nav nav-pills">
-                    <li
-                        role="presentation"
-                        ng-class="{ active: viewConfig.colorBlindMode }"
-                        ng-click="setField('colorBlindMode', true)"
-                    >
-                        <a>On</a>
-                    </li>
-                    <li
-                        role="presentation"
-                        ng-class="{ active: !viewConfig.colorBlindMode }"
-                        ng-click="setField('colorBlindMode', false)"
-                    >
-                        <a>Off</a>
-                    </li>
-                </ul>
-            </div>
-        </div>
     </form>
     <div id="settings-dashboard" class="col-md-8"></div>
 </div>