Skip to content

Commit 252f9fc

Browse files
author
catch
committed
Issue #3444587 by alexpott: Add CSS to prettier command and fix core/misc/jquery.form.js to be ignored
1 parent ae329a7 commit 252f9fc

File tree

6 files changed

+10
-5
lines changed

6 files changed

+10
-5
lines changed

.eslintignore

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ node_modules/**/*
33
**/js_test_files/**/*
44
**/build/**/*
55
modules/locale/tests/locale_test.js
6+
misc/jquery.form.js
67

78
# Ignore deliberately malformed YAML files.
89
modules/system/tests/fixtures/HtaccessTest/access_test.yml

.prettierignore

+3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@ assets/vendor/**/*
22
node_modules/**/*
33
**/build/**/*
44
**/js_test_files/**/*
5+
**/css_test_files/**/*.css
56
modules/locale/tests/locale_test.js
67
*.yml
8+
themes/stable9/css/core/assets/vendor/**/*.css
9+
misc/jquery.form.js
710

811
# Temporary until they are brought up to standards
912
scripts/**/*

misc/jquery.form.js

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
*/
2222
/* global ActiveXObject */
2323

24-
/* eslint-disable */
2524
(function (factory) {
2625
if (typeof define === 'function' && define.amd) {
2726
// AMD. Register as an anonymous module.

modules/navigation/css/base/variables.css

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
*/
77
/* This is a universal size that helps in the case of themes with a size of 10 pixels.
88
We need it root to calculate the size of the displace in .dialog-off-canvas-main-canvas */
9+
/* prettier-ignore */
910
:root {
10-
/* stylelint-disable-next-line prettier/prettier */
11-
--admin-toolbar-rem: max(1rem, 16px); /* Workaround until postcss-px-to-rem is removed so this is not converted to rems. */
11+
/* stylelint-disable-next-line */
12+
--admin-toolbar-rem: max(1rem, 16PX); /* Workaround until postcss-px-to-rem is removed so this is not converted to rems. */
1213
}
1314
[data-drupal-admin-styles] {
1415
/*

modules/navigation/css/base/variables.pcss.css

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
/* This is a universal size that helps in the case of themes with a size of 10 pixels.
44
We need it root to calculate the size of the displace in .dialog-off-canvas-main-canvas */
5+
/* prettier-ignore */
56
:root {
6-
/* stylelint-disable-next-line prettier/prettier */
7+
/* stylelint-disable-next-line */
78
--admin-toolbar-rem: max(1rem, 16PX); /* Workaround until postcss-px-to-rem is removed so this is not converted to rems. */
89
}
910

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"lint:css-checkstyle": "stylelint \"**/*.css\" --custom-formatter ./node_modules/stylelint-checkstyle-formatter/index.js",
2020
"lint:yaml": "node ./node_modules/eslint/bin/eslint.js --ext .yml .",
2121
"test:nightwatch": "node -r dotenv-safe/config ./node_modules/.bin/nightwatch --config ./tests/Drupal/Nightwatch/nightwatch.conf.js",
22-
"prettier": "prettier --write \"./**/*.js\"",
22+
"prettier": "prettier --write \"./**/*.css\" \"./**/*.js\"",
2323
"spellcheck": "cspell -c .cspell.json --cache",
2424
"spellcheck:make-dict": "rm -f misc/cspell/dictionary.txt && touch misc/cspell/dictionary.txt && yarn spellcheck:core --unique --words-only | perl -Mopen=locale -pe '$_=lc$_' | LC_ALL=en_US.UTF-8 tr -d \\\\\\\\ | LC_ALL=C sort -u -o misc/cspell/dictionary.txt",
2525
"spellcheck:core": "cspell -c .cspell.json --root .. --cache --cache-location core/.cspellcache \"core/**/*\" \"composer/**/*\" \"composer.json\" \".gitlab-ci/*\" \".gitlab-ci.yml\"",

0 commit comments

Comments
 (0)