Skip to content

Commit

Permalink
fix: Prepare to adopt newest version of StyleLint
Browse files Browse the repository at this point in the history
Previously, StyleLint had a problem that was preventing us from
using their library in our buildbot tests. To get around this, we
made a custom branch of their library.
Recently, they almost fixed the issue. There's just one minor change
left before we can use their master branch. In the meantime, this
CL changes Shaka Player to use a new fork of StyleLint that is based
on their current master branch, and makes the LESS modifications
that the newest versions ask for.

Change-Id: I78624b3d366e6c22c577ca6707f5a3311f8e808e
  • Loading branch information
theodab committed Sep 2, 2020
1 parent 509e7b0 commit de47829
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .csslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
}],
"selector-list-comma-newline-after": "always-multi-line",
"selector-pseudo-element-colon-notation": "single",
"unit-whitelist": ["em", "%", "px", "s", "deg", "vmin", "ms", "vh"]
"unit-allowed-list": ["em", "%", "px", "s", "deg", "vmin", "ms", "vh"]
}
}
6 changes: 0 additions & 6 deletions build/compiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -330,12 +330,6 @@ def lint(self, fix=False, force=False):

stylelint = shakaBuildHelpers.get_node_binary('stylelint')
cmd_line = stylelint + ['--config', self.config_path] + self.source_files
# Disables globbing, since that messes up our nightly tests, and we don't
# use it anyway.
# This is currently a flag added in a fork we maintain, but there is a pull
# request in progress for this.
# See: https://github.com/stylelint/stylelint/issues/4193
cmd_line += ['--disable-globbing'];

if fix:
cmd_line += ['--fix']
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"rimraf": "^2.6.3",
"sprintf-js": "^1.1.2",
"stylelint": "github:theodab/stylelint",
"stylelint-config-standard": "^18.3.0",
"stylelint-config-standard": "^20.0.0",
"tippy.js": "^4.3.1",
"ua-parser-js": "github:joeyparrish/ua-parser-js#develop",
"which": "^1.3.1"
Expand Down
4 changes: 2 additions & 2 deletions ui/less/general.less
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
}

.shaka-hidden {
// Make this override equally specific classes.
// If it's hidden, always hide it!
/* Make this override equally specific classes.
* If it's hidden, always hide it! */
display: none !important;
}

Expand Down

0 comments on commit de47829

Please sign in to comment.