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

This commit is contained in:
QMK Bot 2021-01-15 08:26:36 +00:00
commit fef4ed568e

View File

@ -8,274 +8,76 @@
"layouts": {
"LAYOUT": {
"layout": [
{
"x": 3,
"y": 0
},
{
"x": 11.75,
"y": 0
},
{
"x": 2,
"y": 0.125
},
{
"x": 4,
"y": 0.125
},
{
"x": 10.75,
"y": 0.125
},
{
"x": 12.75,
"y": 0.125
},
{
"x": 5,
"y": 0.25
},
{
"x": 9.75,
"y": 0.25
},
{
"x": 0,
"y": 0.375
},
{
"x": 1,
"y": 0.375
},
{
"x": 13.75,
"y": 0.375
},
{
"x": 14.75,
"y": 0.375
},
{
"x": 16,
"y": 0.375
},
{
"x": 17,
"y": 0.375
},
{
"x": 18,
"y": 0.375
},
{
"x": 3,
"y": 1
},
{
"x": 11.75,
"y": 1
},
{
"x": 2,
"y": 1.125
},
{
"x": 4,
"y": 1.125
},
{
"x": 10.75,
"y": 1.125
},
{
"x": 12.75,
"y": 1.125
},
{
"x": 5,
"y": 1.25
},
{
"x": 9.75,
"y": 1.25
},
{
"x": 0,
"y": 1.375
},
{
"x": 1,
"y": 1.375
},
{
"x": 13.75,
"y": 1.375
},
{
"x": 14.75,
"y": 1.375
},
{
"x": 16,
"y": 1.375
},
{
"x": 17,
"y": 1.375
},
{
"x": 18,
"y": 1.375
},
{
"x": 3,
"y": 2
},
{
"x": 11.75,
"y": 2
},
{
"x": 2,
"y": 2.125
},
{
"x": 4,
"y": 2.125
},
{
"x": 10.75,
"y": 2.125
},
{
"x": 12.75,
"y": 2.125
},
{
"x": 5,
"y": 2.25
},
{
"x": 9.75,
"y": 2.25
},
{
"x": 0,
"y": 2.375
},
{
"x": 1,
"y": 2.375
},
{
"x": 13.75,
"y": 2.375
},
{
"x": 14.75,
"y": 2.375
},
{
"x": 17,
"y": 2.375
},
{
"x": 3,
"y": 3
},
{
"x": 11.75,
"y": 3
},
{
"x": 2,
"y": 3.125
},
{
"x": 4,
"y": 3.125
},
{
"x": 10.75,
"y": 3.125
},
{
"x": 12.75,
"y": 3.125
},
{
"x": 5,
"y": 3.25
},
{
"x": 9.75,
"y": 3.25
},
{
"x": 0,
"y": 3.375
},
{
"x": 1,
"y": 3.375
},
{
"x": 13.75,
"y": 3.375
},
{
"x": 14.75,
"y": 3.375
},
{
"x": 16,
"y": 3.375
},
{
"x": 17,
"y": 3.375
},
{
"x": 18,
"y": 3.375
},
{
"x": 2.5,
"y": 4.25
},
{
"x": 3.5,
"y": 4.25
},
{
"x": 11.25,
"y": 4.25
},
{
"x": 12.25,
"y": 4.25
},
{
"x": 4.5,
"y": 4.5
},
{
"x": 10.25,
"y": 4.5
},
{
"x": 8.5,
"y": 3.75,
"h": 2,
"r": -30
},
{
"x": 6.25,
"y": 3.75,
"h": 2,
"r": 30
}
{"x":0, "y":0.375},
{"x":1, "y":0.375},
{"x":2, "y":0.125},
{"x":3, "y":0},
{"x":4, "y":0.125},
{"x":5, "y":0.25},
{"x":9.75, "y":0.25},
{"x":10.75, "y":0.125},
{"x":11.75, "y":0},
{"x":12.75, "y":0.125},
{"x":13.75, "y":0.375},
{"x":14.75, "y":0.375},
{"x":16, "y":0.375},
{"x":17, "y":0.375},
{"x":18, "y":0.375},
{"x":0, "y":1.375},
{"x":1, "y":1.375},
{"x":2, "y":1.125},
{"x":3, "y":1},
{"x":4, "y":1.125},
{"x":5, "y":1.25},
{"x":9.75, "y":1.25},
{"x":10.75, "y":1.125},
{"x":11.75, "y":1},
{"x":12.75, "y":1.125},
{"x":13.75, "y":1.375},
{"x":14.75, "y":1.375},
{"x":16, "y":1.375},
{"x":17, "y":1.375},
{"x":18, "y":1.375},
{"x":0, "y":2.375},
{"x":1, "y":2.375},
{"x":2, "y":2.125},
{"x":3, "y":2},
{"x":4, "y":2.125},
{"x":5, "y":2.25},
{"x":9.75, "y":2.25},
{"x":10.75, "y":2.125},
{"x":11.75, "y":2},
{"x":12.75, "y":2.125},
{"x":13.75, "y":2.375},
{"x":14.75, "y":2.375},
{"x":17, "y":2.375},
{"x":0, "y":3.375},
{"x":1, "y":3.375},
{"x":2, "y":3.125},
{"x":3, "y":3},
{"x":4, "y":3.125},
{"x":5, "y":3.25},
{"x":9.75, "y":3.25},
{"x":10.75, "y":3.125},
{"x":11.75, "y":3},
{"x":12.75, "y":3.125},
{"x":13.75, "y":3.375},
{"x":14.75, "y":3.375},
{"x":16, "y":3.375},
{"x":17, "y":3.375},
{"x":18, "y":3.375},
{"x":2.5, "y":4.25},
{"x":3.5, "y":4.25},
{"x":4.5, "y":4.5},
{"x":6.25, "y":3.75, "h":2, "r":30},
{"x":8.5, "y":3.75, "h":2, "r":-30},
{"x":10.25, "y":4.5},
{"x":11.25, "y":4.25},
{"x":12.25, "y":4.25}
]
}
}