-
-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
t Merge branch 'main' of https://github.com/SalamLang/Salam
- Loading branch information
Showing
27 changed files
with
16,518 additions
and
14,029 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,19 @@ | ||
| { | ||
| "items": [ | ||
| { | ||
| "id": "AST_BLOCK_TYPE_LAYOUT" | ||
| }, | ||
| { | ||
| "id": "AST_BLOCK_TYPE_FUNCTION" | ||
| }, | ||
| { | ||
| "id": "AST_BLOCK_TYPE_IF" | ||
| }, | ||
| { | ||
| "id": "AST_BLOCK_TYPE_ELSE_IF" | ||
| }, | ||
| { | ||
| "id": "AST_BLOCK_TYPE_ERROR" | ||
| } | ||
| ] | ||
| } | ||
| "items": [ | ||
| { | ||
| "id": "AST_BLOCK_TYPE_LAYOUT" | ||
| }, | ||
| { | ||
| "id": "AST_BLOCK_TYPE_FUNCTION" | ||
| }, | ||
| { | ||
| "id": "AST_BLOCK_TYPE_IF" | ||
| }, | ||
| { | ||
| "id": "AST_BLOCK_TYPE_ELSE_IF" | ||
| }, | ||
| { | ||
| "id": "AST_BLOCK_TYPE_ERROR" | ||
| } | ||
| ] | ||
| } |
96 changes: 58 additions & 38 deletions
96
config/yaml/json/layout/attribute/style/global_value.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,59 @@ | ||
| { | ||
| "items": [ | ||
| { | ||
| "id": "inherit", | ||
| "text": { | ||
| "en": ["inherit"], | ||
| "fa": ["ارث بری"] | ||
| } | ||
| }, | ||
| { | ||
| "id": "initial", | ||
| "text": { | ||
| "en": ["initial"], | ||
| "fa": ["ابتدایی"] | ||
| } | ||
| }, | ||
| { | ||
| "id": "revert", | ||
| "text": { | ||
| "en": ["revert"], | ||
| "fa": ["بازگردانی"] | ||
| } | ||
| }, | ||
| { | ||
| "id": "revert-layer", | ||
| "text": { | ||
| "en": ["revert-layer"], | ||
| "fa": ["بازگردانی لایه"] | ||
| } | ||
| }, | ||
| { | ||
| "id": "unset", | ||
| "text": { | ||
| "en": ["unset"], | ||
| "fa": ["حذف شده"] | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| "items": [ | ||
| { | ||
| "id": "inherit", | ||
| "text": { | ||
| "en": [ | ||
| "inherit" | ||
| ], | ||
| "fa": [ | ||
| "ارث بری" | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "id": "initial", | ||
| "text": { | ||
| "en": [ | ||
| "initial" | ||
| ], | ||
| "fa": [ | ||
| "ابتدایی" | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "id": "revert", | ||
| "text": { | ||
| "en": [ | ||
| "revert" | ||
| ], | ||
| "fa": [ | ||
| "بازگردانی" | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "id": "revert-layer", | ||
| "text": { | ||
| "en": [ | ||
| "revert-layer" | ||
| ], | ||
| "fa": [ | ||
| "بازگردانی لایه" | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "id": "unset", | ||
| "text": { | ||
| "en": [ | ||
| "unset" | ||
| ], | ||
| "fa": [ | ||
| "حذف شده" | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.