From 1c258b455050e148ef398fcc146b77bf630332bf Mon Sep 17 00:00:00 2001 From: Thorn Walli Date: Mon, 24 Oct 2022 10:28:00 +0200 Subject: [PATCH] fix(update): update components & clean --- .stylelintrc | 20 +- src/components/atoms/Headline.vue | 19 +- src/components/base/ContentContainer.vue | 174 +++++++++++++ src/components/base/ContentHeadline.vue | 107 ++++++++ ...DefaultContainer.vue => LostContainer.vue} | 8 +- src/components/layouts/Modal.vue | 8 +- src/components/layouts/ScrollContainer.vue | 123 +++++++++ src/components/layouts/TwoColumnContainer.vue | 8 +- .../{ContentArticle.vue => Content.vue} | 23 +- .../{ArticleText.vue => FullText.vue} | 18 +- src/components/organisms/SinglePicture.vue | 8 +- src/components/organisms/SingleVideo.vue | 8 +- src/components/organisms/StagePicture.vue | 59 ++++- src/components/organisms/StageVideo.vue | 12 +- .../organisms/TestScrollContainerA.vue | 233 ++++++++++++++++++ .../{ArticleTextImage.vue => TextImage.vue} | 30 ++- src/components/page/Footer.vue | 8 +- src/components/page/Header.vue | 8 +- src/components/page/InfoLayer.vue | 8 +- src/content/de/index.json | 17 +- src/content/de/p/kontakt.json | 2 +- src/content/de/p/nutzungsbedingungen.json | 4 +- src/content/de/p/projekte/index.json | 6 +- src/content/de/p/projekte/projekt-1.json | 2 +- src/content/de/p/projekte/projekt-2.json | 2 +- src/content/de/p/rechtliche-hinweise.json | 4 +- src/content/de/p/ueber-uns.json | 2 +- src/content/en/index.json | 17 +- src/content/en/p/about.json | 2 +- src/content/en/p/contact.json | 2 +- src/content/en/p/legals.json | 4 +- src/content/en/p/projects/index.json | 6 +- src/content/en/p/projects/project-1.json | 2 +- src/content/en/p/projects/project-2.json | 2 +- src/content/en/p/terms.json | 4 +- src/extends/Components.vue | 4 +- src/extends/Content.vue | 19 +- src/layouts/default.vue | 45 ++-- src/layouts/error.vue | 2 +- src/service/scroll.js | 2 +- src/utils/dom.js | 10 + 41 files changed, 877 insertions(+), 165 deletions(-) create mode 100644 src/components/base/ContentContainer.vue create mode 100644 src/components/base/ContentHeadline.vue rename src/components/layouts/{DefaultContainer.vue => LostContainer.vue} (88%) create mode 100644 src/components/layouts/ScrollContainer.vue rename src/components/molecules/{ContentArticle.vue => Content.vue} (63%) rename src/components/organisms/{ArticleText.vue => FullText.vue} (55%) create mode 100644 src/components/organisms/TestScrollContainerA.vue rename src/components/organisms/{ArticleTextImage.vue => TextImage.vue} (71%) create mode 100644 src/utils/dom.js diff --git a/.stylelintrc b/.stylelintrc index c7f40f13a..730c20048 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -26,6 +26,7 @@ "max-empty-lines": null, "selector-class-pattern": null, "selector-id-pattern": null, + "no-descending-specificity": null, "value-keyword-case": [ "lower", { @@ -41,6 +42,23 @@ "vw" ] } - ] + ], + "selector-pseudo-class-no-unknown": [ + true, + { + "ignorePseudoClasses": [ + "global", + "deep" + ] + } + ], + "selector-pseudo-element-no-unknown": [ + true, + { + "ignorePseudoElements": [ + "v-deep" + ] + } + ], } } diff --git a/src/components/atoms/Headline.vue b/src/components/atoms/Headline.vue index 711d9c146..9dfa20f71 100644 --- a/src/components/atoms/Headline.vue +++ b/src/components/atoms/Headline.vue @@ -1,9 +1,5 @@ @@ -81,7 +72,7 @@ export default { /* empty */ } - &.headline--h2 { + &h2 { & .overline { font-size: calc(12 / 375 * 100vw); diff --git a/src/components/base/ContentContainer.vue b/src/components/base/ContentContainer.vue new file mode 100644 index 000000000..1a016c6c2 --- /dev/null +++ b/src/components/base/ContentContainer.vue @@ -0,0 +1,174 @@ + + + + + diff --git a/src/components/base/ContentHeadline.vue b/src/components/base/ContentHeadline.vue new file mode 100644 index 000000000..943629a1c --- /dev/null +++ b/src/components/base/ContentHeadline.vue @@ -0,0 +1,107 @@ + + + + + diff --git a/src/components/layouts/DefaultContainer.vue b/src/components/layouts/LostContainer.vue similarity index 88% rename from src/components/layouts/DefaultContainer.vue rename to src/components/layouts/LostContainer.vue index 44f67cee9..573f63fb2 100644 --- a/src/components/layouts/DefaultContainer.vue +++ b/src/components/layouts/LostContainer.vue @@ -1,7 +1,7 @@ diff --git a/src/components/organisms/SinglePicture.vue b/src/components/organisms/SinglePicture.vue index 5dcb7dfe1..a2ee89f15 100644 --- a/src/components/organisms/SinglePicture.vue +++ b/src/components/organisms/SinglePicture.vue @@ -1,20 +1,20 @@ + + diff --git a/src/components/organisms/StageVideo.vue b/src/components/organisms/StageVideo.vue index 192898407..937f3cbd7 100644 --- a/src/components/organisms/StageVideo.vue +++ b/src/components/organisms/StageVideo.vue @@ -1,5 +1,5 @@ + + diff --git a/src/components/organisms/ArticleTextImage.vue b/src/components/organisms/TextImage.vue similarity index 71% rename from src/components/organisms/ArticleTextImage.vue rename to src/components/organisms/TextImage.vue index 715a5811a..96e023bdb 100644 --- a/src/components/organisms/ArticleTextImage.vue +++ b/src/components/organisms/TextImage.vue @@ -1,27 +1,31 @@