Skip to content

Commit a0ca565

Browse files
authoredMar 13, 2025··
Merge pull request #216 from Legolass322/issue-83
scss files are not checked by a linter
2 parents 13c21a2 + 483b6e6 commit a0ca565

File tree

6 files changed

+29
-15
lines changed

6 files changed

+29
-15
lines changed
 

‎.stylelintrc.json

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"extends": [
3+
"stylelint-config-standard"
4+
],
5+
"rules": {
6+
"at-rule-no-unknown": null,
7+
"media-feature-range-notation": null
8+
}
9+
}

‎Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ RUN apt-get update -y --fix-missing \
3333

3434
WORKDIR /home
3535
COPY Makefile /home
36+
COPY .stylelintrc.json /home
3637
COPY Gemfile /home
3738
COPY judges /home/judges
3839
COPY sass /home/sass

‎Makefile

+7-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# SPDX-License-Identifier: MIT
33

44
.ONESHELL:
5-
.PHONY: clean all assets install rake
5+
.PHONY: clean all assets install rake stylelint
66
.SILENT:
77
.SECONDARY:
88
.SHELLFLAGS := -x -e -o pipefail -c
@@ -70,7 +70,10 @@ target/fb/%.fb: tests/%.yml Makefile | target/fb
7070
rake: $(SAXON)
7171
bundle exec rake
7272

73-
$(CSS): sass/*.scss Makefile | target/css
73+
stylelint: sass/*.scss
74+
stylelint sass/*.scss --fix
75+
76+
$(CSS): sass/*.scss stylelint Makefile | target/css
7477
sass --no-source-map --style=compressed --no-quiet --stop-on-error sass/main.scss "$@"
7578

7679
$(JS): js/*.js Makefile | target/js
@@ -99,8 +102,9 @@ install: $(SAXON) | target
99102
fi
100103
fi
101104
npm --no-color install -g eslint@9.22.0
102-
npm --no-color install -g uglify-js
105+
npm --no-color install -g uglify-js@3.19.3
103106
npm --no-color install -g sass@1.77.2
107+
npm --no-color install -g stylelint@16.15.0 stylelint-config-standard@37.0.0 stylelint-scss@6.11.1
104108

105109
entry: target/docker-image.txt target/fb/simple.fb
106110
img=$$(cat target/docker-image.txt)

‎sass/awards.scss

+9-9
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@ $hightlight: #f5f5f5;
1818
background-color: $hightlight;
1919
}
2020

21-
tr.p_ {
22-
font-size: 90%;
21+
tr.p-table {
22+
font-size: 90%;
2323
}
2424

2525
td.avatar {
26-
text-align: center;
27-
vertical-align: middle;
26+
text-align: center;
27+
vertical-align: middle;
2828

29-
img {
30-
height: 1.5em;
31-
vertical-align: middle;
32-
width: 1.5em;
33-
}
29+
img {
30+
height: 1.5em;
31+
vertical-align: middle;
32+
width: 1.5em;
33+
}
3434
}
3535
}

‎sass/main.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ header {
4444
font-size: 2em;
4545
font-weight: bolder;
4646
margin-left: 1em;
47-
padding: .0em .2em;
47+
padding: 0 .2em;
4848
vertical-align: middle;
4949
}
5050
}

‎xsl/awards.xsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@
320320
</xsl:if>
321321
</tr>
322322
<xsl:if test="$fb/f[what='reconciliation' and who=$id]">
323-
<tr class="sub tablesorter-childRow p_ p_{$name}" style="display: none;">
323+
<tr class="sub tablesorter-childRow p-table p_{$name}" style="display: none;">
324324
<td>
325325
<!-- Avatar -->
326326
<xsl:text> </xsl:text>
@@ -367,7 +367,7 @@
367367
<xsl:for-each select="$facts[who_name=$name]">
368368
<xsl:sort select="when" data-type="text"/>
369369
<xsl:variable name="fact" select="."/>
370-
<tr class="sub tablesorter-childRow p_ p_{$name}" style="display: none;">
370+
<tr class="sub tablesorter-childRow p-table p_{$name}" style="display: none;">
371371
<td>
372372
<!-- Avatar -->
373373
<xsl:text> </xsl:text>

0 commit comments

Comments
 (0)
Please sign in to comment.