Skip to content

Commit b4841b7

Browse files
authored
Merge branch 'main' into loadgif
2 parents 885f75c + 87f5fa0 commit b4841b7

File tree

107 files changed

+8588
-10681
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+8588
-10681
lines changed

.editorconfig

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
root = true
22

33
[*]
4-
indent_style = tab
5-
indent_size = 4
64
end_of_line = lf
75
charset = utf-8
86
trim_trailing_whitespace = true
97
insert_final_newline = true
108

11-
[{package.json,*.yml}]
9+
[{*.css,*.html,*.js,*.json,*.ts}]
1210
indent_style = space
1311
indent_size = 2
14-
15-
[*.md]
16-
trim_trailing_whitespace = false

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,28 @@ about: Create a report to help us improve
44
---
55

66
**Describe the bug**
7+
78
<!-- A clear and concise description of what the bug is. -->
89

910
**To Reproduce**
11+
1012
<!-- Clear steps to reproduce the issue. -->
1113

1214
**Expected behavior**
15+
1316
<!-- A clear and concise description of what you expected to happen. -->
1417

1518
**Screenshots**
19+
1620
<!-- If applicable, add screenshots to help explain your problem. -->
1721

1822
**Desktop (please complete the following information):**
19-
- Operating System:
20-
<!-- (Platform and Version) e.g. macOS 10.13.6 / Windows 10 (1803) / Ubuntu 18.04 x64 -->
21-
- Zulip Desktop Version:
22-
<!-- e.g. 5.2.0 -->
23+
24+
- Operating System:
25+
<!-- (Platform and Version) e.g. macOS 10.13.6 / Windows 10 (1803) / Ubuntu 18.04 x64 -->
26+
- Zulip Desktop Version:
27+
<!-- e.g. 5.2.0 -->
2328

2429
**Additional context**
30+
2531
<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/custom.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,3 @@
22
name: Custom issue template
33
about: Describe this issue template's purpose here.
44
---
5-
6-

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@ about: Suggest an idea for this project
44
---
55

66
**Problem Description**
7+
78
<!-- Please add a clear and concise description of what the problem is. -->
89

910
**Proposed Solution**
11+
1012
<!-- Describe the solution you'd like in a clear and concise manner -->
1113

1214
**Describe alternatives you've considered**
15+
1316
<!-- A clear and concise description of any alternative solutions or features you've considered. -->
1417

1518
**Additional context**
19+
1620
<!-- Add any other context or screenshots about the feature request here. -->

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
---
2+
23
<!--
34
Remove the fields that are not appropriate
45
Please include:
@@ -11,6 +12,7 @@ Please include:
1112
**Screenshots?**
1213

1314
**You have tested this PR on:**
14-
- [ ] Windows
15-
- [ ] Linux/Ubuntu
16-
- [ ] macOS
15+
16+
- [ ] Windows
17+
- [ ] Linux/Ubuntu
18+
- [ ] macOS

.htmlhintrc

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
{
2-
"tagname-lowercase": true,
3-
"attr-lowercase": true,
4-
"attr-value-double-quotes": true,
52
"attr-value-not-empty": false,
63
"attr-no-duplication": true,
74
"doctype-first": true,
8-
"tag-pair": true,
9-
"empty-tag-not-self-closed": true,
105
"spec-char-escape": true,
116
"id-unique": true,
127
"src-not-empty": true,
@@ -17,9 +12,8 @@
1712
"style-disabled": false,
1813
"inline-style-disabled": false,
1914
"inline-script-disabled": false,
20-
"space-tab-mixed-disabled": "space4",
2115
"id-class-ad-disabled": false,
2216
"href-abs-or-rel": false,
2317
"attr-unsafe-chars": true,
2418
"head-script-disabled": true
25-
}
19+
}

.node-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/app/**/*.js
2+
/app/translations/*.json
3+
/dist

.prettierignore.non-js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
*.js
2+
*.ts
3+
/app/translations/*.json
4+
/dist

.stylelintrc

Lines changed: 5 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,9 @@
11
{
2+
"extends": ["stylelint-config-standard", "stylelint-config-prettier"],
23
"rules": {
3-
# Stylistic rules for CSS.
4-
"function-comma-space-after": "always",
5-
"function-comma-space-before": "never",
6-
"function-max-empty-lines": 0,
7-
"function-whitespace-after": "always",
8-
9-
"value-keyword-case": "lower",
10-
"value-list-comma-newline-after": "always-multi-line",
11-
"value-list-comma-space-after": "always-single-line",
12-
"value-list-comma-space-before": "never",
13-
"value-list-max-empty-lines": 0,
14-
15-
"unit-case": "lower",
16-
"property-case": "lower",
17-
"color-hex-case": "lower",
18-
19-
"declaration-bang-space-before": "always",
20-
"declaration-colon-newline-after": "always-multi-line",
21-
"declaration-colon-space-after": "always-single-line",
22-
"declaration-colon-space-before": "never",
23-
"declaration-block-semicolon-newline-after": "always",
24-
"declaration-block-semicolon-space-before": "never",
25-
"declaration-block-trailing-semicolon": "always",
26-
27-
"block-closing-brace-empty-line-before": "never",
28-
"block-closing-brace-newline-after": "always",
29-
"block-closing-brace-newline-before": "always",
30-
"block-opening-brace-newline-after": "always",
31-
"block-opening-brace-space-before": "always",
32-
33-
"selector-attribute-brackets-space-inside": "never",
34-
"selector-attribute-operator-space-after": "never",
35-
"selector-attribute-operator-space-before": "never",
36-
"selector-combinator-space-after": "always",
37-
"selector-combinator-space-before": "always",
38-
"selector-descendant-combinator-no-non-space": true,
39-
"selector-pseudo-class-parentheses-space-inside": "never",
40-
"selector-pseudo-element-case": "lower",
41-
"selector-pseudo-element-colon-notation": "double",
42-
"selector-type-case": "lower",
43-
"selector-list-comma-newline-after": "always",
44-
"selector-list-comma-space-before": "never",
45-
46-
"media-feature-colon-space-after": "always",
47-
"media-feature-colon-space-before": "never",
48-
"media-feature-name-case": "lower",
49-
"media-feature-parentheses-space-inside": "never",
50-
"media-feature-range-operator-space-after": "always",
51-
"media-feature-range-operator-space-before": "always",
52-
"media-query-list-comma-newline-after": "always",
53-
"media-query-list-comma-space-before": "never",
54-
55-
"at-rule-name-case": "lower",
56-
"at-rule-name-space-after": "always",
57-
"at-rule-semicolon-newline-after": "always",
58-
"at-rule-semicolon-space-before": "never",
59-
60-
"comment-whitespace-inside": "always",
61-
"indentation": 4,
62-
63-
# Limit language features
64-
"color-no-hex": true,
654
"color-named": "never",
5+
"color-no-hex": true,
6+
"font-family-no-missing-generic-family-keyword": [true, {"ignoreFontFamilies": ["Material Icons"]}],
7+
"selector-type-no-unknown": [true, {"ignoreTypes": ["send-feedback", "webview"]}],
668
}
67-
}
9+
}

0 commit comments

Comments
 (0)