From c95fc5f3e5b08d8ba60f2d3c400a5796cab62f5a Mon Sep 17 00:00:00 2001 From: "fabian.wilms" Date: Wed, 8 May 2024 09:13:40 +0200 Subject: [PATCH 1/6] :lipstick: expand custom-styles --- public/assets/temporary/custom-style.css | 52 ++++++++++++++++++++++++ src/components/Intro/MucIntro.vue | 7 +--- 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/public/assets/temporary/custom-style.css b/public/assets/temporary/custom-style.css index ab4ba8e8..da5ef837 100644 --- a/public/assets/temporary/custom-style.css +++ b/public/assets/temporary/custom-style.css @@ -16,4 +16,56 @@ background-color: #fff; -webkit-text-size-adjust: 100%; -webkit-tap-highlight-color: rgba(0, 0, 0, 0); +} + +h1 { + font-family: "Roboto Condensed",Arial,sans-serif; + font-size: 1.875rem; + font-weight: 700; + line-height: 1.25; +} +h2 { + font-family: "Roboto Condensed",Arial,sans-serif; + font-size: 1.5rem; + font-weight: 700; + line-height: 1.25; +} +h3 { + font-family: "Roboto Condensed",Arial,sans-serif; + font-size: 1.25rem; + font-weight: 700; + line-height: 1.25; +} +h4 { + font-family: "Roboto Condensed",Arial,sans-serif; + font-size: 1.125rem; + font-weight: 700; + line-height: 1.25; +} +h5 { + font-family: "Roboto Condensed",Arial,sans-serif; + font-size: 1rem; + font-weight: 700; + line-height: 1.5; +} + +@media all and (min-width:1200px) { + h1 { + font-size: 2.375rem; + } + h2 { + font-size: 1.75rem; + } + h3 { + font-size: 1.5rem; + } + h4 { + font-size: 1.25rem; + } +} + +.muc-divider { + align-self: stretch; + height: 0; + border: 1px var(--color-neutrals-blue) solid; } \ No newline at end of file diff --git a/src/components/Intro/MucIntro.vue b/src/components/Intro/MucIntro.vue index 20cf55cc..713d2f5f 100644 --- a/src/components/Intro/MucIntro.vue +++ b/src/components/Intro/MucIntro.vue @@ -37,7 +37,7 @@ defineSlots<{ {{ title }} -
+

@@ -52,10 +52,7 @@ defineSlots<{ diff --git a/src/components/Card/index.ts b/src/components/Card/index.ts new file mode 100644 index 00000000..b808ae79 --- /dev/null +++ b/src/components/Card/index.ts @@ -0,0 +1,3 @@ +import MucCard from "./MucCard.vue"; + +export { MucCard }; diff --git a/src/components/index.ts b/src/components/index.ts index 0ac34177..fc9e7977 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -1,6 +1,7 @@ import { MucBanner } from "./Banner"; import { MucButton } from "./Button"; import { MucCallout } from "./Callout"; +import { MucCard } from "./Card"; import { MucComment, MucCommentText } from "./Comment/"; import { MucIntro } from "./Intro"; @@ -9,6 +10,7 @@ export { MucBanner, MucIntro, MucCallout, + MucCard, MucComment, MucCommentText, }; From b4075217fa084629676dc3374bf921c30f43c2f3 Mon Sep 17 00:00:00 2001 From: "fabian.wilms" Date: Wed, 8 May 2024 09:14:45 +0200 Subject: [PATCH 3/6] :sparkles: create MucCardContainer component --- .../Card/MucCardContainer.stories.ts | 43 +++++++++++++++++++ src/components/Card/MucCardContainer.vue | 34 +++++++++++++++ src/components/Card/index.ts | 3 +- src/components/index.ts | 3 +- 4 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 src/components/Card/MucCardContainer.stories.ts create mode 100644 src/components/Card/MucCardContainer.vue diff --git a/src/components/Card/MucCardContainer.stories.ts b/src/components/Card/MucCardContainer.stories.ts new file mode 100644 index 00000000..1cba48d3 --- /dev/null +++ b/src/components/Card/MucCardContainer.stories.ts @@ -0,0 +1,43 @@ +import {fn} from "@storybook/test"; + +import MucCardContainer from "./MucCardContainer.vue"; +import MucCard from "./MucCard.vue"; + +export default { + components: {MucCardContainer}, + component: MucCardContainer, + title: "MucCardContainer", + tags: ["autodocs"], + // 👇 Use `fn` to spy on the onClick arg, which will appear in the actions panel once invoked + args: {onClick: fn()}, + parameters: { + docs: { + description: { + component: `A wrapping Layout to use with [MucCard](/docs/muccard--docs). + +🔗 Patternlab-Docs (not yet available) +`, + }, + } + }, +}; + +export const Template = () => ({ + components: {MucCardContainer, MucCard}, + template: ` + + + + + + `, +}); \ No newline at end of file diff --git a/src/components/Card/MucCardContainer.vue b/src/components/Card/MucCardContainer.vue new file mode 100644 index 00000000..d2ec2e31 --- /dev/null +++ b/src/components/Card/MucCardContainer.vue @@ -0,0 +1,34 @@ + + + + + diff --git a/src/components/Card/index.ts b/src/components/Card/index.ts index b808ae79..ab8fdf20 100644 --- a/src/components/Card/index.ts +++ b/src/components/Card/index.ts @@ -1,3 +1,4 @@ import MucCard from "./MucCard.vue"; +import MucCardContainer from "./MucCardContainer.vue"; -export { MucCard }; +export { MucCard, MucCardContainer }; diff --git a/src/components/index.ts b/src/components/index.ts index fc9e7977..c7e0f683 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -1,7 +1,7 @@ import { MucBanner } from "./Banner"; import { MucButton } from "./Button"; import { MucCallout } from "./Callout"; -import { MucCard } from "./Card"; +import { MucCard, MucCardContainer } from "./Card"; import { MucComment, MucCommentText } from "./Comment/"; import { MucIntro } from "./Intro"; @@ -11,6 +11,7 @@ export { MucIntro, MucCallout, MucCard, + MucCardContainer, MucComment, MucCommentText, }; From 477b4e1b7a82445cda9e8c3d144f828ec69a2c52 Mon Sep 17 00:00:00 2001 From: "jannik.lange" Date: Wed, 8 May 2024 11:55:24 +0200 Subject: [PATCH 4/6] :art: formated code #57 --- .../BuisnessHours/MucBuisnessHours.vue | 5 +++ src/components/BuisnessHours/index.ts | 3 ++ src/components/Card/MucCard.stories.ts | 42 +++++++++---------- src/components/Card/MucCard.vue | 27 ++++++------ .../Card/MucCardContainer.stories.ts | 34 +++++++-------- src/components/Card/MucCardContainer.vue | 4 +- src/components/Intro/MucIntro.vue | 13 ++++-- 7 files changed, 70 insertions(+), 58 deletions(-) create mode 100644 src/components/BuisnessHours/MucBuisnessHours.vue create mode 100644 src/components/BuisnessHours/index.ts diff --git a/src/components/BuisnessHours/MucBuisnessHours.vue b/src/components/BuisnessHours/MucBuisnessHours.vue new file mode 100644 index 00000000..d879ed07 --- /dev/null +++ b/src/components/BuisnessHours/MucBuisnessHours.vue @@ -0,0 +1,5 @@ + + + + + diff --git a/src/components/BuisnessHours/index.ts b/src/components/BuisnessHours/index.ts new file mode 100644 index 00000000..027c4439 --- /dev/null +++ b/src/components/BuisnessHours/index.ts @@ -0,0 +1,3 @@ +import MucBuisnessHours from "./MucBuisnessHours.vue"; + +export { MucBuisnessHours }; diff --git a/src/components/Card/MucCard.stories.ts b/src/components/Card/MucCard.stories.ts index f661421e..0372623f 100644 --- a/src/components/Card/MucCard.stories.ts +++ b/src/components/Card/MucCard.stories.ts @@ -1,39 +1,39 @@ -import {fn} from "@storybook/test"; +import { fn } from "@storybook/test"; import MucCard from "./MucCard.vue"; export default { - component: MucCard, - title: "MucCard", - tags: ["autodocs"], - // 👇 Use `fn` to spy on the onClick arg, which will appear in the actions panel once invoked - args: {onClick: fn()}, - parameters: { - docs: { - description: { - component: `A Card-Component in Patternlab-Style. + component: MucCard, + title: "MucCard", + tags: ["autodocs"], + // 👇 Use `fn` to spy on the onClick arg, which will appear in the actions panel once invoked + args: { onClick: fn() }, + parameters: { + docs: { + description: { + component: `A Card-Component in Patternlab-Style. Use inside [MucCardContainer](/docs/muccardcontainer--docs) for a automatically wrapping layout. 🔗 Patternlab-Docs (not yet available) `, - }, - }, + }, }, + }, }; export const Default = { - args: { - title: "Lorem Ipsum", - tagline: "Dolor", - content: "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.", - }, + args: { + title: "Lorem Ipsum", + tagline: "Dolor", + content: + "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.", + }, }; - export const WithHeaderPrefix = () => ({ - components: {MucCard}, - template: ` + components: { MucCard }, + template: ` ({ `, -}); \ No newline at end of file +}); diff --git a/src/components/Card/MucCard.vue b/src/components/Card/MucCard.vue index 4e3f25fd..019b42c5 100644 --- a/src/components/Card/MucCard.vue +++ b/src/components/Card/MucCard.vue @@ -1,14 +1,16 @@ \ No newline at end of file + From 3515f75046e8063b506a05cb3709f80d89256a56 Mon Sep 17 00:00:00 2001 From: langehm <38280183+langehm@users.noreply.github.com> Date: Wed, 8 May 2024 13:54:10 +0200 Subject: [PATCH 5/6] :poop: removed files from other branch #57 --- src/components/BuisnessHours/MucBuisnessHours.vue | 5 ----- src/components/BuisnessHours/index.ts | 3 --- 2 files changed, 8 deletions(-) delete mode 100644 src/components/BuisnessHours/MucBuisnessHours.vue delete mode 100644 src/components/BuisnessHours/index.ts diff --git a/src/components/BuisnessHours/MucBuisnessHours.vue b/src/components/BuisnessHours/MucBuisnessHours.vue deleted file mode 100644 index d879ed07..00000000 --- a/src/components/BuisnessHours/MucBuisnessHours.vue +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/components/BuisnessHours/index.ts b/src/components/BuisnessHours/index.ts deleted file mode 100644 index 027c4439..00000000 --- a/src/components/BuisnessHours/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import MucBuisnessHours from "./MucBuisnessHours.vue"; - -export { MucBuisnessHours }; From b2de5b3fa620bad093b66030122ac2188b69fe20 Mon Sep 17 00:00:00 2001 From: "fabian.wilms" Date: Wed, 8 May 2024 14:00:45 +0200 Subject: [PATCH 6/6] :ok_hand: FB_JL: order template > script > style --- src/components/Card/MucCardContainer.vue | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/components/Card/MucCardContainer.vue b/src/components/Card/MucCardContainer.vue index db49156f..c47f496a 100644 --- a/src/components/Card/MucCardContainer.vue +++ b/src/components/Card/MucCardContainer.vue @@ -1,18 +1,24 @@ - - + +