Merge branch 'hotfix/theme-and-js-lint'

buttflattery · Apr 2, 2019 · e449af5 · e449af5
2 parents cac6f40 + d8977c9
commit e449af5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/assets/css/theme/smart_wizard_theme_material-v.css b/src/assets/css/theme/smart_wizard_theme_material-v.css
@@ -86,7 +86,7 @@
     float: none;
     display: block;
     padding: 0;
-    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2);
+    box-shadow: 0 0px 1px rgba(0, 0, 0, 0.2);
 }
 
 .sw-theme-material-v .step-anchor a {
@@ -107,10 +107,10 @@
 }
 
 .sw-theme-material-v ul.step-anchor>li.active a {
-    background-color: #4caf50 !important;
+    background-color: rgb(76, 117, 175) !important;
     color: #fff !important;
     cursor: default;
-    padding: 15px 130px 10px 10px;
+    padding: 20px 30px 20px 10px;
 }
 
 .sw-theme-material-v ul.step-anchor li.done a {

diff --git a/src/assets/css/theme/smart_wizard_theme_material-v.min.css b/src/assets/css/theme/smart_wizard_theme_material-v.min.css
@@ -86,7 +86,7 @@
     float: none;
     display: block;
     padding: 0;
-    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2);
+    box-shadow: 0 0px 1px rgba(0, 0, 0, 0.2);
 }
 
 .sw-theme-material-v .step-anchor a {
@@ -107,10 +107,10 @@
 }
 
 .sw-theme-material-v ul.step-anchor>li.active a {
-    background-color: #4caf50 !important;
+    background-color: rgb(76, 117, 175) !important;
     color: #fff !important;
     cursor: default;
-    padding: 15px 130px 10px 10px;
+    padding: 20px 30px 20px 10px;
 }
 
 .sw-theme-material-v ul.step-anchor li.done a {

diff --git a/src/assets/js/formwizard.js b/src/assets/js/formwizard.js
@@ -483,8 +483,9 @@ $.formwizard = {
             lastKeyIndex = keyPath.length - 1;
             for (var i = 0; i < lastKeyIndex; ++i) {
                 key = keyPath[i];
-                if (!(key in obj))
-                    obj[key] = {}
+                if (!(key in obj)) {
+                    obj[key] = {};
+                }
                 obj = obj[key];
             }
             obj[keyPath[lastKeyIndex]] = value;