Skip to content

Commit

Permalink
Merge pull request #7 from jonnitto/feature/next
Browse files Browse the repository at this point in the history
Next Version
  • Loading branch information
jonnitto authored Oct 30, 2021
2 parents 01c7928 + 4a5aa84 commit 40e3635
Show file tree
Hide file tree
Showing 36 changed files with 891 additions and 489 deletions.
13 changes: 3 additions & 10 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,11 @@ indent_style = space
indent_size = 4

# Exceptions
[{*.{yaml,yml,sh,jscsrc,scss},package.json,.*rc}]
[{*.{yaml,pcss},package.json,.*rc}]
indent_size = 2

[*.{json,scss}]
[*.{json,pcss}]
max_line_length = 1000

[Sites.xml]
indent_size = 1

[*.{note,md,edit,read}]
[*.md]
trim_trailing-whitespace = false

[Makefile]
indent_style = tab
indent_size = 1
6 changes: 0 additions & 6 deletions .eslintignore

This file was deleted.

20 changes: 0 additions & 20 deletions .eslintrc

This file was deleted.

5 changes: 0 additions & 5 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
/.editorconfig export-ignore
/.eslintignore export-ignore
/.eslintrc export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.github export-ignore
/.jshintrc export-ignore
/.nvmrc export-ignore
/.prettierignore export-ignore
/.prettierrc export-ignore
/.stylelintrc export-ignore
/.yarnclean export-ignore
/CODE_OF_CONDUCT.md export-ignore
/gulp_global.yaml export-ignore
/package.json export-ignore
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
/node_modules
/Build
/yarn.lock
/gulp_local.yaml
14 changes: 0 additions & 14 deletions .jshintrc

This file was deleted.

2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
11
16
32 changes: 0 additions & 32 deletions .prettierrc

This file was deleted.

101 changes: 63 additions & 38 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,48 +1,73 @@
{
"extends": "stylelint-config-recommended-scss",
"ignoreFiles": [
"**/Public/**",
"**/Private/Templates/**",
"node_modules/**",
"**/*.noLinter.*"
],
"extends": "stylelint-config-standard",
"plugins": [
"stylelint-scss"
],
"rules": {
"block-closing-brace-newline-after": ["always", {
ignoreAtRules: ["if", "else"]
}],
"declaration-colon-newline-after": null,
"at-rule-empty-line-before": null,
"at-rule-no-unknown": null,
"no-descending-specificity": null,
"no-duplicate-selectors": [ true, { "severity": "warning" }],
"max-empty-lines": 3,
"max-nesting-depth": 5,
"no-invalid-double-slash-comments": true,
"font-family-no-missing-generic-family-keyword": null,
"property-no-unknown": [true, {
ignoreProperties: [
"box","box-item",
"grid-kiss",
"font-range","min-font-size","max-font-size","lower-font-range","upper-font-range",
"font-awesome",
"size","min-size","max-size",
"border-top-radius","border-right-radius","border-bottom-radius","border-left-radius",
"tap-highlight-color","touch-callout"
]
}],
"selector-pseudo-class-no-unknown": [true, {
"ignorePseudoClasses": [
"at-least","at-most","between","exactly"
]
}],
"selector-pseudo-element-no-unknown": [true, {
"ignorePseudoElements": [
"track","thumb"
]
}],
"selector-type-no-unknown": null
"scss/at-rule-no-unknown": [
true,
{
"ignoreAtRules": [
"tailwind",
"apply",
"screen",
"responsive",
"variants"
]
}
],
"at-rule-no-unknown": [
true,
{
"ignoreAtRules": [
"tailwind",
"apply",
"screen",
"responsive",
"variants"
]
}
],
"property-no-unknown": [
true,
{
"ignoreProperties": [
"font-range",
"min-font-size",
"max-font-size",
"lower-font-range",
"upper-font-range",
"font-awesome",
"tap-highlight-color",
"touch-callout"
]
}
],
"selector-pseudo-class-no-unknown": [
true,
{
"ignorePseudoClasses": [
"at-least",
"at-most",
"between",
"exactly",
"global"
]
}
],
"selector-pseudo-element-no-unknown": [
true,
{
"ignorePseudoElements": [
"track",
"thumb"
]
}
],
"selector-type-no-unknown": null,
"no-descending-specificity": null
}
}
2 changes: 1 addition & 1 deletion Configuration/NodeTypes.Container.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
'Neos.Neos:Content': true
'Neos.Neos:ContentCollection': true
'Jonnitto.ImagesInARow:Mixin.CreationDialog.Assets': true
# 'Jonnitto.ImagesInARow:Mixin.CreationDialog.Items': true
#'Jonnitto.ImagesInARow:Mixin.CreationDialog.Items': true
label: "${(q(node).children().count() ? q(node).children().count() + ' ' : '') + (I18n.translate(node.nodeType.label) || node.nodeType.name)}"
ui:
label: i18n
Expand Down
2 changes: 1 addition & 1 deletion Configuration/NodeTypes.Image.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'Jonnitto.ImagesInARow:Image':
superTypes:
'Carbon.Image:Image': true
'Neos.Neos:Content': true
'Carbon.Image:Image': true
'Carbon.Image:Title': true
'Carbon.Image:AlternativeText': true
'Carbon.Image:Lightbox': true
Expand Down
2 changes: 0 additions & 2 deletions Configuration/NodeTypes.Mixin.CreationDialog.Assets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
editorOptions:
multiple: true
accept: 'image/*'
features:
mediaBrowser: false
options:
template:
childNodes:
Expand Down
7 changes: 7 additions & 0 deletions Configuration/Settings.Carbon.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Carbon:
IncludeAssets:
Packages:
"Jonnitto.ImagesInARow":
Package: Jonnitto.ImagesInARow
Backend:
Head: Backend.css[inline]
7 changes: 7 additions & 0 deletions Configuration/Settings.Jonnitto.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Jonnitto:
ImagesInARow:
baseWidth: 800
gutter: 10
container: false
lazy: false
renderAsPicture: true
10 changes: 10 additions & 0 deletions Configuration/Settings.Neos.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Neos:
Neos:
userInterface:
translation:
autoInclude:
Jonnitto.ImagesInARow:
- "NodeTypes/*"
fusion:
autoInclude:
Jonnitto.ImagesInARow: true
32 changes: 0 additions & 32 deletions Configuration/Settings.yaml

This file was deleted.

Loading

0 comments on commit 40e3635

Please sign in to comment.