Skip to content

Commit

Permalink
Merge pull request #4 from symcon/fixes/upgrade-style-to-v3
Browse files Browse the repository at this point in the history
Update style
  • Loading branch information
Sunnyka98 committed Nov 16, 2023
2 parents 9483150 + bf2db26 commit 5e20913
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 38 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ jobs:
- name: Checkout module
uses: actions/checkout@master
- name: Check style
uses: symcon/action-style@master
uses: symcon/action-style@v3
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.DS_Store
.idea/
.phpunit.*
.php_cs.cache
.php_cs.cache
.php-cs-fixer.cache
2 changes: 1 addition & 1 deletion .style
Submodule .style updated 3 files
+36 −32 .php-cs-fixer.php
+10 −1 README.md
+85 −0 json-check.php
85 changes: 51 additions & 34 deletions LogikGatter/form.json
Original file line number Diff line number Diff line change
@@ -1,38 +1,55 @@
{
"elements": [{
"type": "Select",
"name": "Calculation",
"caption": "Calculation",
"options": [
{ "label": "OR", "value": 1 },
{ "label": "AND", "value": 2 },
{ "label": "NOR", "value": 3 },
{ "label": "NAND", "value": 4 }
]
}, {
"type": "List",
"name": "Input",
"caption": "Input",
"add": true,
"delete": true,
"columns": [{
"label": "Variable",
"name": "ID",
"width": "auto",
"add": 0,
"edit": {
"type": "SelectVariable"
}
"elements": [
{
"type": "Select",
"name": "Calculation",
"caption": "Calculation",
"options": [
{
"label": "OR",
"value": 1
},
{
"label": "AND",
"value": 2
},
{
"label": "NOR",
"value": 3
},
{
"label": "NAND",
"value": 4
}
]
},
{
"label": "Invert",
"name": "Invert",
"width": "100px",
"add": false,
"edit": {
"type": "CheckBox"
}
}],
"values": []
}]
"type": "List",
"name": "Input",
"caption": "Input",
"add": true,
"delete": true,
"columns": [
{
"label": "Variable",
"name": "ID",
"width": "auto",
"add": 0,
"edit": {
"type": "SelectVariable"
}
},
{
"label": "Invert",
"name": "Invert",
"width": "100px",
"add": false,
"edit": {
"type": "CheckBox"
}
}
],
"values": []
}
]
}
2 changes: 1 addition & 1 deletion LogikGatter/locale.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"translations": {
"de": {
"de": {
"Calculation": "Berechnung",
"OR": "OR",
"AND": "AND",
Expand Down

0 comments on commit 5e20913

Please sign in to comment.