Skip to content

Commit c672676

Browse files
ykztsGargron
authored andcommitted
Fix sass-lint config (#10982)
1 parent fe3bf3b commit c672676

14 files changed

+84
-310
lines changed

.sass-lint.yml

+31-258
Original file line numberDiff line numberDiff line change
@@ -4,261 +4,34 @@
44
files:
55
include: app/javascript/styles/**/*.scss
66
ignore:
7-
- app/javascript/styles/reset.scss
8-
9-
linters:
10-
# Reports when you use improper spacing around ! (the "bang") in !default,
11-
# !global, !important, and !optional flags.
12-
BangFormat:
13-
enabled: false
14-
15-
# Whether or not to prefer `border: 0` over `border: none`.
16-
BorderZero:
17-
enabled: false
18-
19-
# Reports when you define a rule set using a selector with chained classes
20-
# (a.k.a. adjoining classes).
21-
ChainedClasses:
22-
enabled: false
23-
24-
# Prefer hexadecimal color codes over color keywords.
25-
# (e.g. `color: green` is a color keyword)
26-
ColorKeyword:
27-
enabled: false
28-
29-
# Prefer color literals (keywords or hexadecimal codes) to be used only in
30-
# variable declarations. They should be referred to via variables everywhere
31-
# else.
32-
ColorVariable:
33-
enabled: true
34-
35-
# Which form of comments to prefer in CSS.
36-
Comment:
37-
enabled: false
38-
39-
# Reports @debug statements (which you probably left behind accidentally).
40-
DebugStatement:
41-
enabled: false
42-
43-
# Rule sets should be ordered as follows:
44-
# - @extend declarations
45-
# - @include declarations without inner @content
46-
# - properties, @include declarations with inner @content
47-
# - nested rule sets.
48-
DeclarationOrder:
49-
enabled: false
50-
51-
# `scss-lint:disable` control comments should be preceded by a comment
52-
# explaining why these linters are being disabled for this file.
53-
# See https://github.com/brigade/scss-lint#disabling-linters-via-source for
54-
# more information.
55-
DisableLinterReason:
56-
enabled: true
57-
58-
# Reports when you define the same property twice in a single rule set.
59-
DuplicateProperty:
60-
enabled: false
61-
62-
# Separate rule, function, and mixin declarations with empty lines.
63-
EmptyLineBetweenBlocks:
64-
enabled: true
65-
66-
# Reports when you have an empty rule set.
67-
EmptyRule:
68-
enabled: true
69-
70-
# Reports when you have an @extend directive.
71-
ExtendDirective:
72-
enabled: false
73-
74-
# Files should always have a final newline. This results in better diffs
75-
# when adding lines to the file, since SCM systems such as git won't
76-
# think that you touched the last line.
77-
FinalNewline:
78-
enabled: false
79-
80-
# HEX colors should use three-character values where possible.
81-
HexLength:
82-
enabled: false
83-
84-
# HEX color values should use lower-case colors to differentiate between
85-
# letters and numbers, e.g. `#E3E3E3` vs. `#e3e3e3`.
86-
HexNotation:
87-
enabled: true
88-
89-
# Avoid using ID selectors.
90-
IdSelector:
91-
enabled: false
92-
93-
# The basenames of @imported SCSS partials should not begin with an
94-
# underscore and should not include the filename extension.
95-
ImportPath:
96-
enabled: false
97-
98-
# Avoid using !important in properties. It is usually indicative of a
99-
# misunderstanding of CSS specificity and can lead to brittle code.
100-
ImportantRule:
101-
enabled: false
102-
103-
# Indentation should always be done in increments of 2 spaces.
104-
Indentation:
105-
enabled: true
106-
width: 2
107-
108-
# Don't write leading zeros for numeric values with a decimal point.
109-
LeadingZero:
110-
enabled: false
111-
112-
# Reports when you define the same selector twice in a single sheet.
113-
MergeableSelector:
114-
enabled: false
115-
116-
# Functions, mixins, variables, and placeholders should be declared
117-
# with all lowercase letters and hyphens instead of underscores.
118-
NameFormat:
119-
enabled: false
120-
121-
# Avoid nesting selectors too deeply.
122-
NestingDepth:
123-
enabled: false
124-
125-
# Always use placeholder selectors in @extend.
126-
PlaceholderInExtend:
127-
enabled: false
128-
129-
# Sort properties in a strict order.
130-
PropertySortOrder:
131-
enabled: false
132-
133-
# Reports when you use an unknown or disabled CSS property
134-
# (ignoring vendor-prefixed properties).
135-
PropertySpelling:
136-
enabled: false
137-
138-
# Configure which units are allowed for property values.
139-
PropertyUnits:
140-
enabled: false
141-
142-
# Pseudo-elements, like ::before, and ::first-letter, should be declared
143-
# with two colons. Pseudo-classes, like :hover and :first-child, should
144-
# be declared with one colon.
145-
PseudoElement:
146-
enabled: true
147-
148-
# Avoid qualifying elements in selectors (also known as "tag-qualifying").
149-
QualifyingElement:
150-
enabled: false
151-
152-
# Don't write selectors with a depth of applicability greater than 3.
153-
SelectorDepth:
154-
enabled: false
155-
156-
# Selectors should always use hyphenated-lowercase, rather than camelCase or
157-
# snake_case.
158-
SelectorFormat:
159-
enabled: false
160-
convention: hyphenated_lowercase
161-
162-
# Prefer the shortest shorthand form possible for properties that support it.
163-
Shorthand:
164-
enabled: true
165-
166-
# Each property should have its own line, except in the special case of
167-
# single line rulesets.
168-
SingleLinePerProperty:
169-
enabled: true
170-
allow_single_line_rule_sets: true
171-
172-
# Split selectors onto separate lines after each comma, and have each
173-
# individual selector occupy a single line.
174-
SingleLinePerSelector:
175-
enabled: true
176-
177-
# Commas in lists should be followed by a space.
178-
SpaceAfterComma:
179-
enabled: false
180-
181-
# Properties should be formatted with a single space separating the colon
182-
# from the property's value.
183-
SpaceAfterPropertyColon:
184-
enabled: true
185-
186-
# Properties should be formatted with no space between the name and the
187-
# colon.
188-
SpaceAfterPropertyName:
189-
enabled: true
190-
191-
# Variables should be formatted with a single space separating the colon
192-
# from the variable's value.
193-
SpaceAfterVariableColon:
194-
enabled: true
195-
196-
# Variables should be formatted with no space between the name and the
197-
# colon.
198-
SpaceAfterVariableName:
199-
enabled: false
200-
201-
# Operators should be formatted with a single space on both sides of an
202-
# infix operator.
203-
SpaceAroundOperator:
204-
enabled: true
205-
206-
# Opening braces should be preceded by a single space.
207-
SpaceBeforeBrace:
208-
enabled: true
209-
210-
# Parentheses should not be padded with spaces.
211-
SpaceBetweenParens:
212-
enabled: false
213-
214-
# Enforces that string literals should be written with a consistent form
215-
# of quotes (single or double).
216-
StringQuotes:
217-
enabled: false
218-
219-
# Property values, @extend, @include, and @import directives, and variable
220-
# declarations should always end with a semicolon.
221-
TrailingSemicolon:
222-
enabled: true
223-
224-
# Reports lines containing trailing whitespace.
225-
TrailingWhitespace:
226-
enabled: true
227-
228-
# Don't write trailing zeros for numeric values with a decimal point.
229-
TrailingZero:
230-
enabled: false
231-
232-
# Don't use the `all` keyword to specify transition properties.
233-
TransitionAll:
234-
enabled: false
235-
236-
# Numeric values should not contain unnecessary fractional portions.
237-
UnnecessaryMantissa:
238-
enabled: false
239-
240-
# Do not use parent selector references (&) when they would otherwise
241-
# be unnecessary.
242-
UnnecessaryParentReference:
243-
enabled: false
244-
245-
# URLs should be valid and not contain protocols or domain names.
246-
UrlFormat:
247-
enabled: true
248-
249-
# URLs should always be enclosed within quotes.
250-
UrlQuotes:
251-
enabled: true
252-
253-
# Properties, like color and font, are easier to read and maintain
254-
# when defined using variables rather than literals.
255-
VariableForProperty:
256-
enabled: false
257-
258-
# Avoid vendor prefixes. Or rather: don't write them yourself.
259-
VendorPrefix:
260-
enabled: false
261-
262-
# Omit length units on zero values, e.g. `0px` vs. `0`.
263-
ZeroUnit:
264-
enabled: true
7+
- app/javascript/styles/mastodon/reset.scss
8+
9+
rules:
10+
# Disallows
11+
no-color-literals: 0
12+
no-css-comments: 0
13+
no-duplicate-properties: 0
14+
no-ids: 0
15+
no-important: 0
16+
no-mergeable-selectors: 0
17+
no-misspelled-properties: 0
18+
no-qualifying-elements: 0
19+
no-transition-all: 0
20+
no-vendor-prefixes: 0
21+
22+
# Nesting
23+
force-element-nesting: 0
24+
force-attribute-nesting: 0
25+
force-pseudo-nesting: 0
26+
27+
# Name Formats
28+
class-name-format: 0
29+
leading-zero: 0
30+
31+
# Style Guide
32+
attribute-quotes: 0
33+
hex-length: 0
34+
indentation: 0
35+
nesting-depth: 0
36+
property-sort-order: 0
37+
quotes: 0

app/javascript/styles/contrast/diff.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
&-description {
66
input {
77
&::placeholder {
8-
opacity: 1.0;
8+
opacity: 1;
99
}
1010
}
1111
}

app/javascript/styles/contrast/variables.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ $highlight-text-color: $classic-highlight-color !default;
2020
$action-button-color: #8d9ac2;
2121

2222
$inverted-text-color: $black !default;
23-
$lighter-text-color: darken($ui-base-color,6%) !default;
23+
$lighter-text-color: darken($ui-base-color, 6%) !default;
2424
$light-text-color: darken($ui-primary-color, 40%) !default;

app/javascript/styles/mailer.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -279,15 +279,15 @@ h5 {
279279
}
280280

281281
.hero-with-button {
282+
padding-bottom: 16px;
283+
282284
h1 {
283285
margin-bottom: 4px;
284286
}
285287

286288
p.lead {
287289
margin-bottom: 32px;
288290
}
289-
290-
padding-bottom: 16px;
291291
}
292292

293293
.header {

app/javascript/styles/mastodon/_mixins.scss

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
@mixin avatar-radius() {
1+
@mixin avatar-radius {
22
border-radius: 4px;
33
background: transparent no-repeat;
44
background-position: 50%;
55
background-clip: padding-box;
66
}
77

8-
@mixin avatar-size($size:48px) {
8+
@mixin avatar-size($size: 48px) {
99
width: $size;
1010
height: $size;
1111
background-size: $size $size;
1212
}
1313

14-
@mixin search-input() {
14+
@mixin search-input {
1515
outline: 0;
1616
box-sizing: border-box;
1717
width: 100%;
18-
border: none;
18+
border: 0;
1919
box-shadow: none;
2020
font-family: inherit;
2121
background: $ui-base-color;
@@ -42,7 +42,7 @@
4242
}
4343
}
4444

45-
@mixin search-popout() {
45+
@mixin search-popout {
4646
background: $simple-background-color;
4747
border-radius: 4px;
4848
padding: 10px 14px;

app/javascript/styles/mastodon/admin.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ $content-width: 840px;
171171
text-transform: none;
172172
padding-bottom: 0;
173173
margin-bottom: 0;
174-
border-bottom: none;
174+
border-bottom: 0;
175175
}
176176

177177
& > p {

app/javascript/styles/mastodon/basics.scss

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
@if type-of($color) == 'color' {
33
$color: str-slice(ie-hex-str($color), 4);
44
}
5-
@return '%23' + unquote($color)
5+
6+
@return '%23' + unquote($color);
67
}
78

89
body {
@@ -15,7 +16,7 @@ body {
1516
text-rendering: optimizelegibility;
1617
font-feature-settings: "kern";
1718
text-size-adjust: none;
18-
-webkit-tap-highlight-color: rgba(0,0,0,0);
19+
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
1920
-webkit-tap-highlight-color: transparent;
2021

2122
&.system-font {

0 commit comments

Comments
 (0)