Skip to content

Commit

Permalink
Merge branch 'dev' into refactor/updated-redux
Browse files Browse the repository at this point in the history
  • Loading branch information
mfranzke authored Nov 21, 2021
2 parents 760eacd + 1ebcd53 commit aa64967
Show file tree
Hide file tree
Showing 27 changed files with 309 additions and 361 deletions.
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.md]
trim_trailing_whitespace = false
208 changes: 208 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,208 @@
# Automatically normalize line endings for all text-based files
# https://git-scm.com/docs/gitattributes#_end_of_line_conversion
#
## GITATTRIBUTES FOR WEB PROJECTS
#
# These settings are for any web project.
#
# Details per file setting:
# text These files should be normalized (i.e. convert CRLF to LF).
# binary These files are binary and should be left untouched.
#
# Note that binary is a macro for -text -diff.
######################################################################

## AUTO-DETECT
## Handle line endings automatically for files detected as
## text and leave all files detected as binary untouched.
## This will handle all files NOT defined below.
* text=auto

# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

# For the following file types, normalize line endings to LF on
# checkin and prevent conversion to CRLF when they are checked out
# (this is required in order to prevent newline related issues like,
# for example, after the build script is run)

.* text eol=lf
*.css text eol=lf
*.html text eol=lf
*.js text eol=lf
*.json text eol=lf
*.md text eol=lf
*.sh text eol=lf
*.txt text eol=lf
*.xml text eol=lf

# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

## SOURCE CODE
*.bat text eol=crlf
*.coffee text
*.htm text
*.inc text
*.ini text
*.jsx text
*.less text
*.od text
*.onlydata text
*.php text
*.pl text
*.py text
*.rb text
*.sass text
*.scm text
*.scss text
*.sql text
*.styl text
*.tag text
*.ts text
*.tsx text
*.xhtml text

## DOCKER
*.dockerignore text
Dockerfile text

## DOCUMENTATION
*.markdown text
*.mdwn text
*.mdown text
*.mkd text
*.mkdn text
*.mdtxt text
*.mdtext text
AUTHORS text
CHANGELOG text
CHANGES text
CONTRIBUTING text
COPYING text
copyright text
*COPYRIGHT* text
INSTALL text
license text
LICENSE text
NEWS text
readme text
*README* text
TODO text

## TEMPLATES
*.dot text
*.ejs text
*.haml text
*.handlebars text
*.hbs text
*.hbt text
*.jade text
*.latte text
*.mustache text
*.njk text
*.phtml text
*.tmpl text
*.tpl text
*.twig text

## LINTERS
.babelrc text
.csslintrc text
.eslintrc text
.htmlhintrc text
.jscsrc text
.jshintrc text
.jshintignore text
.prettierrc text
.stylelintrc text

## CONFIGS
*.bowerrc text
*.cnf text
*.conf text
*.config text
.browserslistrc text
.editorconfig text
.gitattributes text
.gitconfig text
.gitignore text
.htaccess text
*.npmignore text
*.yaml text
*.yml text
browserslist text
Makefile text
makefile text

## HEROKU
Procfile text
.slugignore text

## GRAPHICS
*.ai binary
*.bmp binary
*.eps binary
*.gif binary
*.ico binary
*.jng binary
*.jp2 binary
*.jpg binary
*.jpeg binary
*.jpx binary
*.jxr binary
*.pdf binary
*.png binary
*.psb binary
*.psd binary
*.svg text
*.svgz binary
*.tif binary
*.tiff binary
*.wbmp binary
*.webp binary

## AUDIO
*.kar binary
*.m4a binary
*.mid binary
*.midi binary
*.mp3 binary
*.ogg binary
*.ra binary

## VIDEO
*.3gpp binary
*.3gp binary
*.as binary
*.asf binary
*.asx binary
*.fla binary
*.flv binary
*.m4v binary
*.mng binary
*.mov binary
*.mp4 binary
*.mpeg binary
*.mpg binary
*.ogv binary
*.swc binary
*.swf binary
*.webm binary

## ARCHIVES
*.7z binary
*.gz binary
*.jar binary
*.rar binary
*.tar binary
*.zip binary

## FONTS
*.ttf binary
*.eot binary
*.otf binary
*.woff binary
*.woff2 binary

## EXECUTABLES
*.exe binary
*.pyc binary
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ pattern_exports/
.DS_Store
Thumbs.db
.nyc_output/
.vscode/
.idea/
.env
packages/core/test/public
Expand All @@ -13,5 +12,5 @@ packages/*/public
lerna-debug.log
packages/edition-node-gulp/dependencyGraph.json
packages/uikit-workshop/dist

yarn-error.log

yarn-error.log
10 changes: 10 additions & 0 deletions .vscode/extensions.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
= Extensions configuration

See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
Extension identifier format: ${publisher}.${name}. Example: vscode.csharp

List of extensions which should be recommended for users of this workspace:
`"recommendations"``

List of extensions recommended by VS Code that should not be recommended for users of this workspace:
`"unwantedRecommendations"``
3 changes: 3 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"recommendations": ["editorconfig.editorconfig", "henrynguyen5-vsc.vsc-nvm"]
}
3 changes: 2 additions & 1 deletion packages/docs/src/docs/advanced-ecosystem-overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ Currently the following plugins are provided by the community:
* [plugin-node-minify-html](https://github.com/JosefBredereck/plugin-node-minify-html): Patternlab Node HTML tabs panel compressor/minifier/beautifier
* [patternlab-plugin-node-wrappable](https://github.com/networkteam/patternlab-plugin-node-wrappable): Configuration to wrap patterns styleguide HTML output (e.g. for inverse backgrounds)
* [plugin-node-patternlab-inline-assets](https://github.com/michaelworm/plugin-node-patternlab-inline-assets): Consume and inline assets (out of the file system) into your templates before compiling
* [plugin-node-uiextension](https://github.com/bmuenzenmeyer/plugin-node-uiextension): Provide a simple Patternlab chrome customization path versus forking the `StyleguideKit`
* [plugin-node-uiextension](https://github.com/bmuenzenmeyer/plugin-node-uiextension): Provide a simple Patternlab chrome customization path versus forking the `StyleguideKit` / `UIKit`
* [@mfranzke/plugin-node-uiextension](https://github.com/mfranzke/plugin-node-uiextension): A fork of the previous plugin that mainly ensures Pattern lab version 5 compability and enhances by some new features.

Please feel to contribute and [add your plugin to this list as well](https://github.com/pattern-lab/patternlab-node/edit/dev/packages/docs/src/docs/advanced-ecosystem-overview.md).

Expand Down
5 changes: 2 additions & 3 deletions packages/docs/src/scss/components/_tile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

.c-tile {
position: relative;
z-index: 100;
height: 100%;
display: flex;
flex-direction: column;
Expand All @@ -13,7 +12,7 @@
.c-tile__body {
padding: 2rem;
position: relative;
z-index: 1;
z-index: 1; // TODO: Evaluate whether this declaration is (still) necessary
flex: 1;

.c-tile--green & {
Expand All @@ -38,7 +37,7 @@
position: absolute;
right: -10px;
bottom: -10px;
z-index: 0;
z-index: 0; // TODO: Evaluate whether this declaration is (still) necessary
@include stripedBoxShadow('green');

.c-tile--orange & {
Expand Down
2 changes: 1 addition & 1 deletion packages/engine-twig/lib/engine_twig.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ var engine_twig = {
engineFileExtension: '.twig',

// regexes, stored here so they're only compiled once
findPartialsRE: /{%\s*(?:extends|include|embed)\s+('[^']+'|"[^"]+").*?%}/g,
findPartialsRE: /{%[-]?\s*(?:extends|include|embed|from|import|use)\s+('[^']+'|"[^"]+").*?%}/g,
findPartialKeyRE: /"((?:\\.|[^"\\])*)"/,
findListItemsRE:
/({{#( )?)(list(I|i)tems.)(one|two|three|four|five|six|seven|eight|nine|ten|eleven|twelve|thirteen|fourteen|fifteen|sixteen|seventeen|eighteen|nineteen|twenty)( )?}}/g, // TODO
Expand Down
2 changes: 1 addition & 1 deletion packages/starterkit-handlebars-demo/dist/_data/icons.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"iconPath" : "../../icons.svg",
"iconPath" : "../../images/icons/",
"icon" : "search",
"icons" : [
{ "icon" : "minus" },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
{
"label": false,
"navIcon": {
"iconPath": "../../icons.svg",
"iconPath": "../../images/icons/",
"navIcon": "shopping-cart"
},
"url" : "link.pages-cart"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<svg class="c-icon {{ styleModifier }}">
<use href="{{ iconPath }}#{{ icon }}"></use>
<use href="{{ iconPath }}{{ icon }}.svg#{{ icon }}"></use>
</svg><!--end c-icon-->
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
{{#if label }}{{ label }}{{/ if }}
{{#with navIcon }}
<svg class="c-icon c-primary-nav__icon">
<use xlink:href="{{ iconPath }}#{{ navIcon }}"></use>
<use xlink:href="{{ iconPath }}{{ navIcon }}.svg#{{ navIcon }}"></use>
</svg>
{{/ with }}
</a><!--end c-primary-nav__link-->
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/starterkit-handlebars-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"access": "public"
},
"scripts": {
"build": "cd dist/css && npx node-sass style.scss style.css"
"build": "cd dist/css && sass style.scss style.css"
}
}
Loading

0 comments on commit aa64967

Please sign in to comment.