Update forms styles

FPGAwars · Jul 19, 2018 · dacd461 · dacd461
1 parent 6e5d9c0
commit dacd461
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 17 deletions.
diff --git a/app/scripts/services/blocks.js b/app/scripts/services/blocks.js
@@ -261,11 +261,6 @@ angular.module('icestudio')
           title: gettextCatalog.getString('Enter the memory blocks'),
           value: ''
         },
-        {
-          type: 'checkbox',
-          label: gettextCatalog.getString('Local parameter'),
-          value: false
-        },
         {
           type: 'combobox',
           label: gettextCatalog.getString('Address format'),
@@ -275,12 +270,17 @@ angular.module('icestudio')
             { value: 10, label: gettextCatalog.getString('Decimal') },
             { value: 16, label: gettextCatalog.getString('Hexadecimal') }
           ]
+        },
+        {
+          type: 'checkbox',
+          label: gettextCatalog.getString('Local parameter'),
+          value: false
         }
       ];
       utils.renderForm(formSpecs, function(evt, values) {
         var labels = values[0].replace(/\s*,\s*/g, ',').split(',');
-        var local = values[1];
-        var format = parseInt(values[2]);
+        var local = values[2];
+        var format = parseInt(values[1]);
         if (resultAlert) {
           resultAlert.dismiss(false);
         }
@@ -1064,11 +1064,6 @@ angular.module('icestudio')
           title: gettextCatalog.getString('Update the block name'),
           value: block.data.name
         },
-        {
-          type: 'checkbox',
-          label: gettextCatalog.getString('Local parameter'),
-          value: block.data.local
-        },
         {
           type: 'combobox',
           label: gettextCatalog.getString('Address format'),
@@ -1078,12 +1073,17 @@ angular.module('icestudio')
             { value: 10, label: gettextCatalog.getString('Decimal') },
             { value: 16, label: gettextCatalog.getString('Hexadecimal') }
           ]
+        },
+        {
+          type: 'checkbox',
+          label: gettextCatalog.getString('Local parameter'),
+          value: block.data.local
         }
       ];
       utils.renderForm(formSpecs, function(evt, values) {
         var label = values[0];
-        var local = values[1];
-        var format = parseInt(values[2]);
+        var local = values[2];
+        var format = parseInt(values[1]);
         if (resultAlert) {
           resultAlert.dismiss(false);
         }

diff --git a/app/scripts/services/utils.js b/app/scripts/services/utils.js
@@ -433,9 +433,6 @@ angular.module('icestudio')
         var spec = specs[i];
         switch(spec.type) {
           case 'text':
-            if (i > 0) {
-              content.push('<br>');
-            }
             content.push('\
               <p>' + spec.title + '</p>\
               <input class="ajs-input" type="text" value="' + spec.value + '" id="form' + i.toString() + '"/>\

diff --git a/app/styles/main.css b/app/styles/main.css
@@ -70,15 +70,52 @@ body {
           animation-duration: 10ms;
 }
 
+.alertify .ajs-body .ajs-content p {
+  margin-top: 7px;
+}
+
+.alertify .ajs-body .ajs-content .ajs-input {
+  border-radius: 4px;
+}
+
 .ajs-header {
   display: none;
 }
 
 .ajs-footer {
+  padding: 8px !important;
   background: white !important;
   border-top: none !important;
 }
 
+.checkbox {
+  margin-top: 14px;
+}
+
+.checkbox+.checkbox {
+  margin-top: 0px;
+}
+
+.form-group {
+  margin: 12px 0 15px;
+}
+
+.form-group label {
+  margin-bottom: 0px;
+}
+
+.form-group select {
+  height: 38px;
+  margin: 4px;
+  border-radius: 4px;
+  color: inherit;
+  box-shadow: none !important;
+  border: 1px solid #ccc !important;
+}
+
+.form-group select:focus {
+  outline: #ccc solid 1px !important;
+}
 
 input:focus {
   outline: #ccc solid 1px;