Skip to content

Commit fa12bfa

Browse files
authored
DEV: Update linting (#635)
1 parent db60986 commit fa12bfa

File tree

6 files changed

+774
-196
lines changed

6 files changed

+774
-196
lines changed

Diff for: Gemfile.lock

+32-26
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (8.0.0)
4+
activesupport (8.0.1)
55
base64
66
benchmark (>= 0.3)
77
bigdecimal
@@ -17,40 +17,42 @@ GEM
1717
ast (2.4.2)
1818
base64 (0.2.0)
1919
benchmark (0.4.0)
20-
bigdecimal (3.1.8)
21-
concurrent-ruby (1.3.4)
22-
connection_pool (2.4.1)
20+
bigdecimal (3.1.9)
21+
concurrent-ruby (1.3.5)
22+
connection_pool (2.5.0)
2323
drb (2.2.1)
24-
i18n (1.14.6)
24+
i18n (1.14.7)
2525
concurrent-ruby (~> 1.0)
26-
json (2.8.2)
27-
language_server-protocol (3.17.0.3)
28-
logger (1.6.1)
29-
minitest (5.25.1)
26+
json (2.10.1)
27+
language_server-protocol (3.17.0.4)
28+
lint_roller (1.1.0)
29+
logger (1.6.6)
30+
minitest (5.25.4)
3031
parallel (1.26.3)
31-
parser (3.3.6.0)
32+
parser (3.3.7.1)
3233
ast (~> 2.4.1)
3334
racc
3435
prettier_print (1.2.1)
3536
racc (1.8.1)
3637
rack (3.1.10)
3738
rainbow (3.1.1)
38-
regexp_parser (2.9.2)
39-
rubocop (1.68.0)
39+
regexp_parser (2.10.0)
40+
rubocop (1.72.2)
4041
json (~> 2.3)
41-
language_server-protocol (>= 3.17.0)
42+
language_server-protocol (~> 3.17.0.2)
43+
lint_roller (~> 1.1.0)
4244
parallel (~> 1.10)
4345
parser (>= 3.3.0.2)
4446
rainbow (>= 2.2.2, < 4.0)
45-
regexp_parser (>= 2.4, < 3.0)
46-
rubocop-ast (>= 1.32.2, < 2.0)
47+
regexp_parser (>= 2.9.3, < 3.0)
48+
rubocop-ast (>= 1.38.0, < 2.0)
4749
ruby-progressbar (~> 1.7)
48-
unicode-display_width (>= 2.4.0, < 3.0)
49-
rubocop-ast (1.36.1)
50+
unicode-display_width (>= 2.4.0, < 4.0)
51+
rubocop-ast (1.38.0)
5052
parser (>= 3.3.1.0)
5153
rubocop-capybara (2.21.0)
5254
rubocop (~> 1.41)
53-
rubocop-discourse (3.8.6)
55+
rubocop-discourse (3.9.3)
5456
activesupport (>= 6.1)
5557
rubocop (>= 1.59.0)
5658
rubocop-capybara (>= 2.0.0)
@@ -60,23 +62,27 @@ GEM
6062
rubocop-rspec_rails (>= 2.30.0)
6163
rubocop-factory_bot (2.26.1)
6264
rubocop (~> 1.61)
63-
rubocop-rails (2.27.0)
65+
rubocop-rails (2.30.1)
6466
activesupport (>= 4.2.0)
67+
lint_roller (~> 1.1)
6568
rack (>= 1.1)
66-
rubocop (>= 1.52.0, < 2.0)
67-
rubocop-ast (>= 1.31.1, < 2.0)
68-
rubocop-rspec (3.2.0)
69-
rubocop (~> 1.61)
69+
rubocop (>= 1.72.1, < 2.0)
70+
rubocop-ast (>= 1.38.0, < 2.0)
71+
rubocop-rspec (3.5.0)
72+
lint_roller (~> 1.1)
73+
rubocop (~> 1.72, >= 1.72.1)
7074
rubocop-rspec_rails (2.30.0)
7175
rubocop (~> 1.61)
7276
rubocop-rspec (~> 3, >= 3.0.1)
7377
ruby-progressbar (1.13.0)
74-
securerandom (0.3.2)
78+
securerandom (0.4.1)
7579
syntax_tree (6.2.0)
7680
prettier_print (>= 1.2.0)
7781
tzinfo (2.0.6)
7882
concurrent-ruby (~> 1.0)
79-
unicode-display_width (2.6.0)
83+
unicode-display_width (3.1.4)
84+
unicode-emoji (~> 4.0, >= 4.0.4)
85+
unicode-emoji (4.0.4)
8086
uri (1.0.2)
8187

8288
PLATFORMS
@@ -87,4 +93,4 @@ DEPENDENCIES
8793
syntax_tree
8894

8995
BUNDLED WITH
90-
2.5.18
96+
2.6.4

Diff for: assets/stylesheets/assigns.scss

+8-11
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,12 @@
206206
width: 45px;
207207
margin-right: 0.5em;
208208
text-align: center;
209+
grid-area: avatar;
210+
211+
a {
212+
padding: 0;
213+
padding-right: 0.5em;
214+
}
209215

210216
svg {
211217
width: 40px;
@@ -214,7 +220,7 @@
214220
}
215221

216222
.assign-names {
217-
font-size: $font-down-1;
223+
font-size: var(--font-down-1);
218224
grid-area: names;
219225
overflow: hidden;
220226
line-height: normal;
@@ -231,18 +237,9 @@
231237
}
232238

233239
.assign-count {
234-
font-size: $font-up-2;
240+
font-size: var(--font-up-2);
235241
grid-area: count;
236242
}
237-
238-
.assign-image {
239-
grid-area: avatar;
240-
241-
a {
242-
padding: 0;
243-
padding-right: 0.5em;
244-
}
245-
}
246243
}
247244

248245
.search {

Diff for: assets/stylesheets/mobile/assigns.scss

+4-7
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
.assigned-topic-list-item {
99
.topic-list-data {
1010
max-width: unset;
11+
display: grid;
12+
grid-template-columns: 1fr 37px; // 37px is size of button
1113
}
1214

1315
.pull-right .num.activity {
@@ -41,11 +43,6 @@
4143
}
4244
}
4345

44-
.assigned-topic-list-item .topic-list-data {
45-
display: grid;
46-
grid-template-columns: 1fr 37px; // 37px is size of button
47-
}
48-
4946
.select-kit-row[data-value="unassign-mobile-header"] {
5047
background: rgba(var(--primary-low-rgb), 0.5);
5148
pointer-events: none;
@@ -64,7 +61,7 @@
6461
width: auto;
6562

6663
.username {
67-
font-size: $font-down-1;
64+
font-size: var(--font-down-1);
6865
color: var(--primary-medium);
6966
}
7067
}
@@ -100,7 +97,7 @@
10097
li > a {
10198
.assign-names,
10299
.assign-count {
103-
font-size: $font-0;
100+
font-size: var(--font-0);
104101
}
105102

106103
.assign-image,

Diff for: package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{
22
"private": true,
33
"devDependencies": {
4-
"@discourse/lint-configs": "2.4.0",
4+
"@discourse/lint-configs": "2.5.0",
55
"ember-template-lint": "6.1.0",
66
"eslint": "9.19.0",
7-
"prettier": "2.8.8"
7+
"prettier": "2.8.8",
8+
"stylelint": "16.14.1"
89
},
910
"engines": {
1011
"node": ">= 22",

0 commit comments

Comments
 (0)