Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/hlxsites/danaher-ls-aem int…
Browse files Browse the repository at this point in the history
…o 1141-converter-logo-cloud
  • Loading branch information
wz914876 committed May 27, 2024
2 parents fdae33f + 1af6fe1 commit 0201a78
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module.exports = {
rules: {
// allow reassigning param
'no-param-reassign': [2, { props: false }],
'linebreak-style': ['error', 'unix'],
'linebreak-style': ['error', (process.platform === 'win32' ? 'windows' : 'unix')],
'import/extensions': ['error', {
js: 'always',
}],
Expand Down
3 changes: 2 additions & 1 deletion .hlxignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package.json
package-lock.json
test/*
styles/tailwind.css
blocks/**/*-dev.css
styles/proxy-tailwind.css
templates/**/*-dev.css
worker/*
*.toml
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "Starter project for Adobe Helix",
"scripts": {
"lint:js": "eslint .",
"lint:css": "stylelint blocks/**/*-dev.css styles/*.css",
"lint:css": "stylelint templates/**/*-dev.css styles/*.css",
"lint": "npm run lint:js && npm run lint:css",
"build": "npm-run-all build:css",
"build:css": "node ./build-css.js",
Expand Down
1 change: 1 addition & 0 deletions templates/brandHome/brandHome-dev.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.productbrandhome main .section {
@apply py-8 sm:py-8 px-5 xl:px-0 empty:hidden;
}

.productbrandhome .columns > div div > p:not(.button-container) {
@apply font-extralight text-base leading-5;
}
Expand Down

0 comments on commit 0201a78

Please sign in to comment.