[design] change theme control order

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "nightTab",
-  "version": "5.6.0",
+  "version": "5.7.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nightTab",
-  "version": "5.6.0",
+  "version": "5.7.0",
   "description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.",
   "main": "index.js",
   "scripts": {

src/html/menu/content/theme.html

@@ -4,9 +4,9 @@
 
   @@include("./theme/saved.html")
 
-  @@include("./theme/style.html")
-
   @@include("./theme/fonts.html")
+  
+  @@include("./theme/style.html")
 
   @@include("./theme/color.html")
 

src/html/menu/content/theme/color.html

@@ -82,7 +82,7 @@
       <p class="control-theme-color-helper form-helper-item">Text and form elements use shades from the right.</p>
     </div>
     <div class="form-helper">
-      <p class="control-theme-color-helper form-helper-item">For a light look switch to the Light Style and then select a Shade colour.</p>
+      <p class="control-theme-color-helper form-helper-item">For a light look switch to the Light Style and then select a Primary colour.</p>
     </div>
     <hr>
     <div class="form-wrap">

src/html/menu/nav.html

@@ -61,8 +61,8 @@
     <div class="menu-subnav menu-subnav-theme">
       <a href="#menu-content-theme-preset" class="menu-nav-sub button button-small" tabindex="-1">Preset</a>
       <a href="#menu-content-theme-saved" class="menu-nav-sub button button-small" tabindex="-1">Saved</a>
-      <a href="#menu-content-theme-style" class="menu-nav-sub button button-small" tabindex="-1">Style</a>
       <a href="#menu-content-theme-fonts" class="menu-nav-sub button button-small" tabindex="-1">Fonts</a>
+      <a href="#menu-content-theme-style" class="menu-nav-sub button button-small" tabindex="-1">Style</a>
       <a href="#menu-content-theme-color" class="menu-nav-sub button button-small" tabindex="-1">Colour</a>
       <a href="#menu-content-theme-accent" class="menu-nav-sub button button-small" tabindex="-1">Accent</a>
       <a href="#menu-content-theme-radius" class="menu-nav-sub button button-small" tabindex="-1">Radius</a>

src/js/control.js

@@ -4416,21 +4416,6 @@ var control = (function() {
             render.class();
           }
         }],
-        style: [{
-          element: ".control-theme-style-dark",
-          path: "theme.style",
-          type: "radio",
-          func: function() {
-            theme.style.dark();
-          }
-        }, {
-          element: ".control-theme-style-light",
-          path: "theme.style",
-          type: "radio",
-          func: function() {
-            theme.style.light();
-          }
-        }],
         fonts: [{
           element: ".control-theme-font-display-name",
           path: "theme.font.display.name",
@@ -4650,6 +4635,21 @@ var control = (function() {
             render.update.control.menu();
           }
         }],
+        style: [{
+          element: ".control-theme-style-dark",
+          path: "theme.style",
+          type: "radio",
+          func: function() {
+            theme.style.dark();
+          }
+        }, {
+          element: ".control-theme-style-light",
+          path: "theme.style",
+          type: "radio",
+          func: function() {
+            theme.style.light();
+          }
+        }],
         color: [{
           element: ".control-theme-color-rgb-color",
           path: "theme.color.rgb",

src/js/version.js

@@ -1,6 +1,6 @@
 var version = (function() {
 
-  var current = "5.6.0";
+  var current = "5.7.0";
 
   var name = "Zonked Tarsier";
 

src/manifest.json

@@ -2,7 +2,7 @@
   "name": "nightTab",
   "short_name": "nightTab",
   "description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.",
-  "version": "5.6.0",
+  "version": "5.7.0",
   "manifest_version": 2,
   "chrome_url_overrides": {
     "newtab": "index.html"