Merge remote-tracking branch 'origin/master' into develop

keyboards/setta21/info.json

@@ -1,9 +1,9 @@
 {
-    "keyboard_name": "setta21", 
-    "url": "https://salicylic-acid3.hatenablog.com/", 
-    "maintainer": "Salicylic_acid3", 
-    "width": 18.25, 
-    "height": 6.25, 
+    "keyboard_name": "setta21",
+    "url": "https://salicylic-acid3.hatenablog.com/",
+    "maintainer": "Salicylic_acid3",
+    "width": 4,
+    "height": 6.25,
     "layouts": {
         "LAYOUT_numpad_6x4": {
             "layout": [
@@ -11,23 +11,28 @@
                 {"label":"F2", "x":1, "y":0},
                 {"label":"\uff1d", "x":2, "y":0},
                 {"label":"Del", "x":3, "y":0},
+
                 {"label":"Num Lock", "x":0, "y":1.25},
                 {"label":"/", "x":1, "y":1.25},
                 {"label":"*", "x":2, "y":1.25},
                 {"label":"-", "x":3, "y":1.25},
+
                 {"label":"7", "x":0, "y":2.25},
                 {"label":"8", "x":1, "y":2.25},
                 {"label":"9", "x":2, "y":2.25},
-                {"label":"+", "x":3, "y":2.25, "h":2},
+
                 {"label":"4", "x":0, "y":3.25},
                 {"label":"5", "x":1, "y":3.25},
                 {"label":"6", "x":2, "y":3.25},
+                {"label":"+", "x":3, "y":2.25, "h":2},
+
                 {"label":"1", "x":0, "y":4.25},
                 {"label":"2", "x":1, "y":4.25},
                 {"label":"3", "x":2, "y":4.25},
-                {"label":"Enter", "x":3, "y":4.25, "h":2},
+
                 {"label":"0", "x":0, "y":5.25, "w":2},
-                {"label":".", "x":2, "y":5.25}
+                {"label":".", "x":2, "y":5.25},
+                {"label":"Enter", "x":3, "y":4.25, "h":2}
             ]
         }
     }