Skip to content
This repository has been archived by the owner on Nov 12, 2021. It is now read-only.

Commit

Permalink
Merge branch '2.1-development'
Browse files Browse the repository at this point in the history
# Conflicts:
#	.gitignore
#	assets/css/style.css
#	assets/css/style.min.css
#	gulpfile.js
#	package.json
#	partials/footer.hbs
#	sass/02.tools/mixins.scss
#	sass/03.generic/generic.scss
#	sass/05.objects/grid.scss
#	sass/06.components/author.scss
#	sass/06.components/content.card.bookmark.scss
#	sass/06.components/content.card.embed.scss
#	sass/06.components/content.card.full.scss
#	sass/06.components/content.card.gallery.scss
#	sass/06.components/feed.post.scss
#	sass/06.components/feed.scss
#	sass/06.components/index.scss
#	sass/06.components/page.scss
#	sass/06.components/post.scss
#	sass/06.components/tag.scss
#	sass/07.overrides/animations.scss
#	sass/07.overrides/helpers.scss
#	sass/1.settings/variables.scss
#	sass/2.tools/mixins.scss
#	sass/3.generic/animations.scss
#	sass/3.generic/helpers.scss
#	sass/3.generic/normalize.scss
#	sass/3.generic/typography.scss
#	sass/4.elements/author.scss
#	sass/4.elements/base.scss
#	sass/4.elements/index.scss
#	sass/4.elements/page.scss
#	sass/4.elements/post.scss
#	sass/4.elements/tag.scss
#	sass/5.objects/footer.scss
#	sass/5.objects/grid.scss
#	sass/5.objects/header.scss
#	sass/6.components/content.images.scss
#	sass/6.components/content.koenig-card.bookmark.scss
#	sass/6.components/content.koenig-card.code-block.scss
#	sass/6.components/content.koenig-card.embed.scss
#	sass/6.components/content.koenig-card.full.scss
#	sass/6.components/content.koenig-card.gallery.scss
#	sass/6.components/content.koenig-card.image.scss
#	sass/6.components/content.koenig-card.scss
#	sass/6.components/content.koenig-card.wide.scss
#	sass/6.components/content.links.scss
#	sass/6.components/feed.post.scss
#	sass/6.components/feed.scss
#	sass/6.components/navigation.blog.scss
#	sass/6.components/navigation.pagination.scss
#	sass/6.components/read-more.scss
#	sass/7.overrides/shame.scss
#	sass/base/_base.scss
#	sass/components/_content--card-bookmark.scss
#	sass/components/_content--card-embed.scss
#	sass/components/_content--card-full.scss
#	sass/components/_content--card-gallery.scss
#	sass/components/_feed--post.scss
#	sass/components/_feed.scss
#	sass/layout/_grid.scss
#	sass/main.scss
#	sass/pages/_author.scss
#	sass/pages/_index.scss
#	sass/pages/_page.scss
#	sass/pages/_post.scss
#	sass/pages/_tag.scss
#	sass/utils/_animations.scss
#	sass/utils/_helpers.scss
#	sass/utils/_mixins.scss
  • Loading branch information
Reedyn committed Feb 23, 2021
2 parents 79ee77b + 88cc922 commit 98eaf61
Show file tree
Hide file tree
Showing 103 changed files with 3,057 additions and 2,468 deletions.
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ build/Release
# see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
node_modules

# GitHub
.github

Thumbs.db

.recognizer
Expand All @@ -37,4 +40,6 @@ Thumbs.db
.sass-cache
*.psd
.DS_Store
.csscomb
.csscomb

package-lock.json
89 changes: 89 additions & 0 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
{
"extends": [
"stylelint-config-standard",
"stylelint-config-idiomatic-order"
],
"fix": true,
"plugins": [
"stylelint-scss"
],
"ignoreFiles": [
"**/*.html"
],
"rules": {
"at-rule-no-unknown": null,
"scss/at-rule-no-unknown": true,
"indentation": 4,
"string-quotes": [
"double",
{
"severity": "warning"
}
],
"no-duplicate-selectors": true,
"color-hex-case": [
"lower",
{
"severity": "warning"
}
],
"color-hex-length": "short",
"color-named": [
"always-where-possible",
{
"severity": "warning"
}
],
"selector-combinator-space-after": "always",
"selector-attribute-quotes": "always",
"selector-attribute-operator-space-before": "never",
"selector-attribute-operator-space-after": "never",
"selector-attribute-brackets-space-inside": "never",
"declaration-block-trailing-semicolon": "always",
"declaration-colon-space-before": "never",
"declaration-colon-space-after": "always",
"number-leading-zero": "never",
"function-url-quotes": "never",
"font-weight-notation": "numeric",
"font-family-name-quotes": "always-where-recommended",
"comment-whitespace-inside": "always",
"comment-empty-line-before": "always",
"rule-empty-line-before": [
"always",
{
"ignore": [
"after-comment",
"first-nested",
"inside-block"
]
}
],
"selector-pseudo-element-colon-notation": "single",
"selector-pseudo-class-parentheses-space-inside": "never",
"media-feature-range-operator-space-before": "never",
"media-feature-range-operator-space-after": "always",
"media-feature-parentheses-space-inside": "never",
"media-feature-colon-space-before": "never",
"media-feature-colon-space-after": "always",
"no-descending-specificity": null,
"no-eol-whitespace": [
true,
{
"severity": "warning",
"ignore": [
"empty-lines"
]
}
],
"block-no-empty": [
true,
{
"severity": "warning",
"ignore": [
"comments"
]
}
]
},
"syntax": "scss"
}
Loading

0 comments on commit 98eaf61

Please sign in to comment.