Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump trim-off-newlines from 1.0.1 to 1.0.3 #76

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ecrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"Exclude": ["node_modules", "^Packages", "^Data", "^Web", "^Build", "Configuration/README", ".yaml.example", ".ddev", "bin"]
"Exclude": [".ddev", ".git", "bin", "node_modules", "^Packages", "^Data", "^Web", "Build", "Configuration/README", ".yaml.example", ".css.fusion", ".js.fusion" ]
}
8 changes: 7 additions & 1 deletion .github/workflows/qa.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
name: QA

on: [push, pull_request]
on:
push:
branches:
- master
pull_request:
branches:
- master

jobs:
fe-build:
Expand Down
2 changes: 1 addition & 1 deletion DistributionPackages/Vendor.Site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@types/node": "^14.14.36",
"@types/terser-webpack-plugin": "^5.0.3",
"autoprefixer": "^10.2.5",
"concurrently": "^6.2.0",
"concurrently": "^6.2.1",
"css-loader": "^5.2.0",
"css-minimizer-webpack-plugin": "^1.3.0",
"eslint": "^7.22.0",
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default (el: HTMLElement): void => {
el.addEventListener("click", (e) => (console.log("to implement")));
};
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ prototype(Vendor.WheelInventor:Block.ScrollToTop) < prototype(Neos.Fusion:Compon
@propTypes {
id = ${PropTypes.string.isRequired}
title = ${PropTypes.string.isRequired}
content = ${PropTypes.string.isRequired}
}

renderer = afx`
<button
id={props.id}
class="min-h-[48px] min-w-[48px] opacity-0 pointer-events-none cursor-pointer fixed right-0 bottom-0 bg-info transition-opacity"
class="cursor-pointer bg-info"
type="button"
title={props.title}
x-data="{...ScrollToTop()}"
x-spread="button"
>
{props.content}
</button>
`
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,4 @@ prototype(Vendor.WheelInventor:Resource.BodyScripts) < prototype(Neos.Fusion:Arr
@process.addCacheBuster = ${value + '?cb=' + SitegeistKlarSchiffCacheBuster.get()}
}
}

alpine = '<script src="https://cdn.jsdelivr.net/gh/alpinejs/[email protected]/dist/alpine.min.js" defer></script>'
}
4 changes: 2 additions & 2 deletions DistributionPackages/Vendor.WheelInventor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
"devDependencies": {
"@sitegeist/eslint-config-es-neos-eslint": "^2.0.2",
"@tailwindcss/typography": "^0.4.1",
"@tailwindcss/typography": "^0.5.0",
"@types/classnames": "^2.3.1",
"@types/final-form-focus": "^1.1.1",
"@types/react": "^17.0.34",
Expand All @@ -44,7 +44,7 @@
"postcss-cli": "^8.3.1",
"postcss-discard-duplicates": "^5.0.1",
"postcss-selector-parser": "^6.0.6",
"tailwindcss": "^2.2.9",
"tailwindcss": "^3.0.0",
"ts-loader": "^9.2.5",
"ts-node": "^10.2.1",
"typescript": "^4.4.2",
Expand Down
15 changes: 5 additions & 10 deletions DistributionPackages/Vendor.WheelInventor/tailwind.config.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
const theme = require('tailwindcss/defaultTheme');

const colors = require('tailwindcss/colors')
module.exports = {
mode: 'jit',
purge: [
content: [
'./Resources/Private/Fusion/**/*'
],
darkMode: false,
theme: {
colors: {
brand: {
Expand All @@ -17,9 +15,9 @@ module.exports = {
contrast: '#000'
},
neutral: {
lighter: theme.colors.gray[200],
DEFAULT: theme.colors.gray[500],
darker: theme.colors.gray[900]
lighter: colors.gray[200],
DEFAULT: colors.gray[500],
darker: colors.gray[900]
},
info: {
DEFAULT: '#76bed0',
Expand All @@ -40,9 +38,6 @@ module.exports = {
},
extend: {},
},
variants: {
extend: {},
},
plugins: [
require('@tailwindcss/typography'),
],
Expand Down
Loading