Skip to content

Commit

Permalink
Merge pull request #2696 from archivesspace/upgrade-eslintv8-stylelin…
Browse files Browse the repository at this point in the history
…tv14

Chore: Upgrade ESLint and Stylelint major versions
  • Loading branch information
Brian Hoffman committed Jun 13, 2022
2 parents af12e7c + 27ca909 commit e6ee732
Show file tree
Hide file tree
Showing 9 changed files with 741 additions and 2,677 deletions.
33 changes: 25 additions & 8 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
{
"extends": [
"stylelint-config-standard",
"stylelint-config-prettier"
"stylelint-config-standard-scss",
"stylelint-config-prettier-scss"
],
"plugins": [
"stylelint-scss"
"overrides": [
{
"files": "{frontend,public}/**/*.less",
"customSyntax": "postcss-less"
}
],
"rules": {
"alpha-value-notation": null,
"at-rule-no-unknown": null,
"scss/at-rule-no-unknown": true,
"no-descending-specificity": null,
"no-duplicate-selectors": null,
"color-function-notation": null,
"declaration-block-no-redundant-longhand-properties": null,
"font-family-no-missing-generic-family-keyword": [
true,
{
Expand All @@ -19,6 +22,20 @@
"icomoon"
]
}
]
],
"no-descending-specificity": null,
"no-duplicate-selectors": null,
"property-no-vendor-prefix": null,
"rule-empty-line-before": null,
"selector-class-pattern": null,
"selector-id-pattern": null,
"shorthand-property-no-redundant-values": null,
"value-no-vendor-prefix": null,
"scss/at-import-partial-extension": null,
"scss/at-rule-no-unknown": true,
"scss/dollar-variable-empty-line-before": null,
"scss/dollar-variable-pattern": null,
"scss/double-slash-comment-empty-line-before": null,
"scss/no-global-function-names": null
}
}
2 changes: 1 addition & 1 deletion frontend/app/assets/stylesheets/archivesspace/form.less
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ ul.subrecord-form-list {
}
}

//make date help appear inline
// make date help appear inline

.date-field {
float: left;
Expand Down
2 changes: 1 addition & 1 deletion frontend/app/assets/stylesheets/archivesspace/icons.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@font-face {
font-family: 'icomoon';
font-family: icomoon;
src: asset-url('icomoon/icomoon.eot?-z7cehr');
src: asset-url('icomoon/icomoon.eot?#iefix-z7cehr')
format('embedded-opentype'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@

// Don't change this without also changing largetree.js.erb ->
// appendWaypoints to match.
//
// We rely on rows having heights known in advance to do our
// height calculations.
height: 2em;
Expand Down
2 changes: 1 addition & 1 deletion frontend/app/assets/stylesheets/archivesspace/mixins.less
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
}

.alt-icomoon() {
font-family: 'icomoon';
font-family: icomoon;
margin: 0 4px 0 0;
}

Expand Down
1 change: 1 addition & 0 deletions frontend/app/assets/stylesheets/archivesspace/tree.less
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
max-width: 400px;
}

/* stylelint-disable-next-line at-rule-no-vendor-prefix */
@-webkit-keyframes spin2 {
from {
-webkit-transform: rotate(0deg);
Expand Down

0 comments on commit e6ee732

Please sign in to comment.