Skip to content

Commit e1d4e60

Browse files
CvXCvX
authored
DEV: Update linting (#47)
1 parent 89d92df commit e1d4e60

File tree

8 files changed

+1213
-1303
lines changed

8 files changed

+1213
-1303
lines changed

‎Gemfile.lock

Lines changed: 53 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (7.2.1.1)
4+
activesupport (8.0.2)
55
base64
6+
benchmark (>= 0.3)
67
bigdecimal
78
concurrent-ruby (~> 1.0, >= 1.3.1)
89
connection_pool (>= 2.2.5)
@@ -12,68 +13,81 @@ GEM
1213
minitest (>= 5.1)
1314
securerandom (>= 0.3)
1415
tzinfo (~> 2.0, >= 2.0.5)
16+
uri (>= 0.13.1)
1517
ast (2.4.2)
1618
base64 (0.2.0)
17-
bigdecimal (3.1.8)
18-
concurrent-ruby (1.3.4)
19-
connection_pool (2.4.1)
19+
benchmark (0.4.0)
20+
bigdecimal (3.1.9)
21+
concurrent-ruby (1.3.5)
22+
connection_pool (2.5.0)
2023
drb (2.2.1)
21-
i18n (1.14.6)
24+
i18n (1.14.7)
2225
concurrent-ruby (~> 1.0)
23-
json (2.7.2)
24-
language_server-protocol (3.17.0.3)
25-
logger (1.6.1)
26-
minitest (5.25.1)
26+
json (2.10.2)
27+
language_server-protocol (3.17.0.4)
28+
lint_roller (1.1.0)
29+
logger (1.6.6)
30+
minitest (5.25.5)
2731
parallel (1.26.3)
28-
parser (3.3.5.0)
32+
parser (3.3.7.1)
2933
ast (~> 2.4.1)
3034
racc
3135
prettier_print (1.2.1)
3236
racc (1.8.1)
33-
rack (3.1.10)
37+
rack (3.1.12)
3438
rainbow (3.1.1)
35-
regexp_parser (2.9.2)
36-
rubocop (1.67.0)
39+
regexp_parser (2.10.0)
40+
rubocop (1.74.0)
3741
json (~> 2.3)
38-
language_server-protocol (>= 3.17.0)
42+
language_server-protocol (~> 3.17.0.2)
43+
lint_roller (~> 1.1.0)
3944
parallel (~> 1.10)
4045
parser (>= 3.3.0.2)
4146
rainbow (>= 2.2.2, < 4.0)
42-
regexp_parser (>= 2.4, < 3.0)
43-
rubocop-ast (>= 1.32.2, < 2.0)
47+
regexp_parser (>= 2.9.3, < 3.0)
48+
rubocop-ast (>= 1.38.0, < 2.0)
4449
ruby-progressbar (~> 1.7)
45-
unicode-display_width (>= 2.4.0, < 3.0)
46-
rubocop-ast (1.32.3)
50+
unicode-display_width (>= 2.4.0, < 4.0)
51+
rubocop-ast (1.39.0)
4752
parser (>= 3.3.1.0)
48-
rubocop-capybara (2.21.0)
49-
rubocop (~> 1.41)
50-
rubocop-discourse (3.8.2)
53+
rubocop-capybara (2.22.1)
54+
lint_roller (~> 1.1)
55+
rubocop (~> 1.72, >= 1.72.1)
56+
rubocop-discourse (3.12.1)
5157
activesupport (>= 6.1)
52-
rubocop (>= 1.59.0)
53-
rubocop-capybara (>= 2.0.0)
54-
rubocop-factory_bot (>= 2.0.0)
55-
rubocop-rails (>= 2.25.0)
58+
lint_roller (>= 1.1.0)
59+
rubocop (>= 1.73.2)
60+
rubocop-capybara (>= 2.22.0)
61+
rubocop-factory_bot (>= 2.27.0)
62+
rubocop-rails (>= 2.30.3)
5663
rubocop-rspec (>= 3.0.1)
57-
rubocop-rspec_rails (>= 2.30.0)
58-
rubocop-factory_bot (2.26.1)
59-
rubocop (~> 1.61)
60-
rubocop-rails (2.26.2)
64+
rubocop-rspec_rails (>= 2.31.0)
65+
rubocop-factory_bot (2.27.1)
66+
lint_roller (~> 1.1)
67+
rubocop (~> 1.72, >= 1.72.1)
68+
rubocop-rails (2.30.3)
6169
activesupport (>= 4.2.0)
70+
lint_roller (~> 1.1)
6271
rack (>= 1.1)
63-
rubocop (>= 1.52.0, < 2.0)
64-
rubocop-ast (>= 1.31.1, < 2.0)
65-
rubocop-rspec (3.1.0)
66-
rubocop (~> 1.61)
67-
rubocop-rspec_rails (2.30.0)
68-
rubocop (~> 1.61)
69-
rubocop-rspec (~> 3, >= 3.0.1)
72+
rubocop (>= 1.72.1, < 2.0)
73+
rubocop-ast (>= 1.38.0, < 2.0)
74+
rubocop-rspec (3.5.0)
75+
lint_roller (~> 1.1)
76+
rubocop (~> 1.72, >= 1.72.1)
77+
rubocop-rspec_rails (2.31.0)
78+
lint_roller (~> 1.1)
79+
rubocop (~> 1.72, >= 1.72.1)
80+
rubocop-rspec (~> 3.5)
7081
ruby-progressbar (1.13.0)
71-
securerandom (0.3.1)
82+
securerandom (0.4.1)
7283
syntax_tree (6.2.0)
7384
prettier_print (>= 1.2.0)
7485
tzinfo (2.0.6)
7586
concurrent-ruby (~> 1.0)
76-
unicode-display_width (2.6.0)
87+
unicode-display_width (3.1.4)
88+
unicode-emoji (~> 4.0, >= 4.0.4)
89+
unicode-emoji (4.0.4)
90+
uri (1.0.3)
7791

7892
PLATFORMS
7993
arm64-darwin-23
@@ -84,4 +98,4 @@ DEPENDENCIES
8498
syntax_tree
8599

86100
BUNDLED WITH
87-
2.5.21
101+
2.6.6

‎common/common.scss

Lines changed: 39 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,30 +28,39 @@
2828
.custom-homepage-columns {
2929
margin: 2em 0 2em 0;
3030
padding: 0;
31+
display: none;
32+
3133
.col {
3234
position: relative;
3335
border-radius: var(--mint-border-radius);
34-
@include mint-card-bg;
3536
padding: 2em 2em 1em;
3637
border-top: 8px solid var(--tertiary);
37-
box-shadow: 0 8px 60px 0 rgba(103, 151, 255, 0.1),
38+
box-shadow:
39+
0 8px 60px 0 rgba(103, 151, 255, 0.1),
3840
0 12px 90px 0 rgba(133, 255, 103, 0.1);
41+
42+
@include mint-card-bg;
43+
3944
.header-wrapper {
4045
background-color: transparent;
46+
4147
a h2 {
4248
color: var(--primary);
4349
}
50+
4451
.btn-primary {
4552
display: none;
4653
}
4754
}
55+
4856
.btn-more {
4957
color: var(--secondary);
5058
background: var(--tertiary);
5159
transition: all 0.3s linear;
5260
border-radius: var(--mint-border-radius);
5361
text-transform: uppercase;
5462
border: 1px solid var(--tertiary);
63+
5564
&:hover {
5665
color: var(--secondary);
5766
background: var(--tertiary-hover);
@@ -80,12 +89,14 @@
8089
.navigation-topics {
8190
.container.list-container {
8291
border-radius: var(--mint-border-radius);
83-
box-shadow: 0 8px 60px 0 rgba(103, 151, 255, 0.1),
92+
box-shadow:
93+
0 8px 60px 0 rgba(103, 151, 255, 0.1),
8494
0 12px 90px 0 rgba(133, 255, 103, 0.1);
8595
padding: 2em;
86-
@include mint-card-bg;
8796
border-top: 8px solid var(--tertiary);
8897
margin-top: 0.8em;
98+
99+
@include mint-card-bg;
89100
}
90101
}
91102

@@ -114,6 +125,7 @@ a {
114125
.category-boxes {
115126
grid-gap: 2em;
116127
border-radius: var(--mint-border-radius);
128+
117129
.category-box {
118130
width: 100%;
119131
margin: 0;
@@ -122,16 +134,19 @@ a {
122134
border-top: 8px solid;
123135
background: var(--secondary);
124136
border-radius: var(--mint-border-radius);
125-
box-shadow: 0px 2px 3px 0px rgba(2, 47, 57, 0.14);
137+
box-shadow: 0 2px 3px 0 rgba(2, 47, 57, 0.14);
138+
126139
.category-box-inner {
127140
border: none;
128141
padding: 0;
142+
129143
.category-details {
130144
padding: 2em;
131145
}
132146
}
147+
133148
&:hover {
134-
box-shadow: 0px 40px 30px 0px rgba(2, 47, 57, 0.1);
149+
box-shadow: 0 40px 30px 0 rgba(2, 47, 57, 0.1);
135150
transform: translateY(-2px);
136151
}
137152
}
@@ -158,15 +173,18 @@ a {
158173
border-radius: var(--mint-border-radius);
159174
text-transform: uppercase;
160175
border: 2px solid var(--tertiary);
176+
161177
.fa {
162178
color: var(--secondary);
163179
}
180+
164181
&:hover {
165182
background: var(--tertiary);
166183
color: var(--secondary);
167184
box-shadow: var(--mint-hover-shadow);
168185
transition: all 0.3s linear;
169186
border-radius: var(--mint-border-radius);
187+
170188
.fa {
171189
color: var(--secondary);
172190
}
@@ -182,6 +200,7 @@ a {
182200
background: transparent;
183201
border-radius: none;
184202
border: none;
203+
185204
&:hover {
186205
background: var(--tertiary);
187206
border-radius: 0;
@@ -192,13 +211,15 @@ a {
192211
.list-controls .combo-box .combo-box-header {
193212
border: none;
194213
border-radius: var(--mint-border-radius);
214+
195215
@include mint-card-bg;
196216
}
197217

198218
.menu-panel .panel-body-bottom .btn {
199219
svg {
200220
color: var(--tertiary);
201221
}
222+
202223
&:hover {
203224
background: var(--tertiary);
204225
color: var(--secondary);
@@ -208,13 +229,15 @@ a {
208229
.nav-pills li a {
209230
border: 1px solid transparent;
210231
border-radius: var(--mint-border-radius);
232+
211233
&:hover {
212234
border-radius: var(--mint-border-radius);
213235
transition: all 0.3s linear;
214236
background-color: transparent;
215237
color: var(--tertiary);
216238
border: 1px dashed var(--tertiary);
217239
}
240+
218241
&.active {
219242
border-radius: var(--mint-border-radius);
220243
transition: all 0.3s linear;
@@ -229,8 +252,10 @@ a {
229252
border-radius: var(--mint-border-radius);
230253
border: 1px solid var(--tertiary);
231254
color: var(--secondary);
255+
232256
svg {
233257
color: var(--secondary);
258+
234259
&:hover {
235260
color: var(--secondary);
236261
}
@@ -244,9 +269,11 @@ a {
244269
color: var(--primary-medium);
245270
border: 1px solid transparent;
246271
border-radius: 0;
272+
247273
svg {
248-
color: currentColor;
274+
color: currentcolor;
249275
}
276+
250277
&:hover {
251278
color: var(--secondary);
252279
background: var(--tertiary-hover);
@@ -265,6 +292,7 @@ a {
265292
color: var(--secondary);
266293
background: var(--tertiary-hover);
267294
border-radius: 5px;
295+
268296
.fa {
269297
color: var(--secondary);
270298
}
@@ -284,6 +312,7 @@ a {
284312
border-radius: var(--mint-border-radius);
285313
text-transform: uppercase;
286314
border: 1px solid var(--tertiary);
315+
287316
.fa {
288317
color: var(--secondary);
289318
}
@@ -322,6 +351,7 @@ a:hover {
322351

323352
.image-upload-controls .btn-default {
324353
border: 1px solid var(--secondary);
354+
325355
.fa {
326356
color: var(--secondary);
327357
}
@@ -334,6 +364,7 @@ a:hover {
334364
background: var(--tertiary);
335365
color: var(--secondary);
336366
}
367+
337368
.btn-primary {
338369
border-radius: var(--mint-border-radius);
339370
}
@@ -366,6 +397,7 @@ summary.select-kit-header.single-select-header.dropdown-select-box-header {
366397
background: var(--tertiary);
367398
color: var(--secondary);
368399
}
400+
369401
.search-advanced-filters {
370402
border: 1px dashed var(--tertiary);
371403
}
@@ -376,10 +408,6 @@ summary.select-kit-header.single-select-header.dropdown-select-box-header {
376408
display: none;
377409
}
378410

379-
.custom-homepage-columns {
380-
display: none;
381-
}
382-
383411
.mint-component-extensions {
384412
.search-banner {
385413
display: block;

‎desktop/desktop.scss

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
@import "variables";
22

3-
body:not(.navigation-categories):not(.navigation-topics) #main-outlet {
3+
body:not(.navigation-categories, .navigation-topics) #main-outlet {
44
border-radius: var(--mint-border-radius);
5-
box-shadow: 0 8px 60px 0 rgba(103, 151, 255, 0.1),
5+
box-shadow:
6+
0 8px 60px 0 rgba(103, 151, 255, 0.1),
67
0 12px 90px 0 rgba(133, 255, 103, 0.1);
78
padding: 2em;
8-
@include mint-card-bg;
99
border-top: 8px solid $tertiary;
1010
margin-top: 1em;
11+
12+
@include mint-card-bg;
1113
}
1214

1315
.boxed {
@@ -16,7 +18,7 @@ body:not(.navigation-categories):not(.navigation-topics) #main-outlet {
1618
}
1719
}
1820

19-
#main-outlet:after {
21+
#main-outlet::after {
2022
content: "";
2123
display: block;
2224
position: fixed;
@@ -29,7 +31,7 @@ body:not(.navigation-categories):not(.navigation-topics) #main-outlet {
2931
top: -57px;
3032
}
3133

32-
#main-outlet:before {
34+
#main-outlet::before {
3335
content: "";
3436
display: block;
3537
position: fixed;

0 commit comments

Comments
 (0)