Skip to content

Commit fc32c8a

Browse files
FabianWilmsFabianWilms
authored
Merge pull request #78 from it-at-m/beta
Release Merge
2 parents 7332ed0 + 51cbb4e commit fc32c8a

File tree

11 files changed

+113
-63
lines changed

11 files changed

+113
-63
lines changed

‎.storybook/main.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@ import { StorybookConfig } from "@storybook/vue3-vite";
66
const fs = require("fs");
77
const path = require("path");
88
const mucIconsSvg = fs.readFileSync(
9-
path.resolve(__dirname, "../public/assets/temporary/muc-icons.svg"),
10-
"utf8"
9+
path.resolve(__dirname, "../public/assets/temporary/muc-icons.svg"),
10+
"utf8"
11+
);
12+
const customIconsSvg = fs.readFileSync(
13+
path.resolve(__dirname, "../public/assets/temporary/custom-icons.svg"),
14+
"utf8"
1115
);
1216

1317
const config: StorybookConfig = {
@@ -27,6 +31,7 @@ const config: StorybookConfig = {
2731
previewBody: (body) => `
2832
${body}
2933
${mucIconsSvg}
34+
${customIconsSvg}
3035
`,
3136
docs: {
3237
autodocs: "tag",

‎.storybook/manager-head.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<link rel="shortcut icon" href="/favicon.ico">

‎docs/GettingStarted.mdx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,29 +32,29 @@ export default defineConfig({
3232
});
3333
```
3434

35-
In your Webcomponents root you should import the MDE5-CSS and SVG-Sprite for MDE5-Icons:
35+
In your Webcomponents root you should import the MDE5-CSS and SVG-Sprite for MDE5-Icons, as well as the optional custom-icons SVG-Sprite:
3636

3737
```html
3838
<script
3939
lang="ts"
4040
setup
4141
>
42-
import sprites from "@muenchen/muc-patternlab-vue/dist/assets/temporary/muc-icons.svg?raw";
42+
import mucIconsSprite from "@muenchen/muc-patternlab-vue/dist/assets/temporary/muc-icons.svg?raw";
43+
import customIconsSprite from "@muenchen/muc-patternlab-vue/dist/assets/temporary/custom-icons.svg?raw";
4344
</script>
4445

4546
<template>
4647
<div>
47-
<svg
48-
style="display: none;"
49-
v-html="sprites"
50-
></svg>
48+
<div v-html="mucIconsSprite"></div>
49+
<div v-html="customIconsSprite"></div>
5150
<...>
5251
</div>
5352
</template>
5453

5554
<style>
5655
@import "@muenchen/muc-patternlab-vue/dist/assets/temporary/muenchende-style.css";
5756
@import "@muenchen/muc-patternlab-vue/dist/assets/temporary/custom-style.css";
57+
@import "@muenchen/muc-patternlab-vue/dist/style.css";
5858
</style>
5959
```
6060

‎docs/Iconography.mdx‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import { Meta, IconGallery, IconItem } from '@storybook/blocks';
2+
3+
<Meta title="Iconography" />
4+
5+
# Iconography
6+
7+
This library already contains MDE5-Patternlabs iconset. The documentation to it can be found [here](https://patternlab.muenchen.space/?p=viewall-guidelines-icons).
8+
9+
Additionally, it adds some specialty icons from [Pictogrammers](https://pictogrammers.com/library/mdi) which can be accessed by embedding the SVG-Sprite `custom-icons.svg` as described in [the getting started guide](/docs/getting-started--docs#setup).
10+
11+
<IconGallery>
12+
<IconItem name="pencil">
13+
<svg fill="currentColor"><use href="#icon-pencil" /></svg>
14+
</IconItem>
15+
<IconItem name="dots-vertical">
16+
<svg fill="currentColor"><use href="#icon-dots-vertical" /></svg>
17+
</IconItem>
18+
<IconItem name="circle-off-outline">
19+
<svg fill="currentColor"><use href="#icon-circle-off-outline" /></svg>
20+
</IconItem>
21+
<IconItem name="account">
22+
<svg fill="currentColor"><use href="#icon-account" /></svg>
23+
</IconItem>
24+
</IconGallery>

‎docs/images/favicon.ico‎

254 KB
Binary file not shown.

‎package-lock.json‎

Lines changed: 39 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,12 @@
2121
"types": "./dist/types/index.d.ts",
2222
"import": "./dist/muc-patternlab-vue.es.js"
2323
},
24-
"./dist/assets/temporary/muc-icons.svg": "./dist/assets/temporary/muc-icons.svg",
24+
"./dist/style.css": "./dist/style.css",
25+
"./dist/assets/temporary/custom-style.css": "./dist/assets/temporary/custom-style.css",
26+
"./dist/assets/temporary/muenchende-style.css": "./dist/assets/temporary/muenchende-style.css",
2527
"./dist/assets/temporary/muenchende-fontface.css": "./dist/assets/temporary/muenchende-fontface.css",
26-
"./dist/assets/temporary/muenchende-style.css": "./dist/assets/temporary/muenchende-style.css"
28+
"./dist/assets/temporary/muc-icons.svg": "./dist/assets/temporary/muc-icons.svg",
29+
"./dist/assets/temporary/custom-icons.svg": "./dist/assets/temporary/custom-icons.svg"
2730
},
2831
"files": [
2932
"src",

‎public/assets/temporary/custom-icons.svg‎

Lines changed: 7 additions & 0 deletions
Loading

‎public/assets/temporary/muc-icons.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎src/components/Intro/MucIntro.vue‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,40 +16,39 @@ defineProps<{
1616
1717
defineSlots<{
1818
/**
19-
* Text-content of the Intro.
19+
* Body of the Intro.
2020
*/
2121
default(): any;
2222
}>();
2323
</script>
2424

2525
<template>
26-
<div class="m-intro m-intro-vertical">
27-
<div class="m-intro-vertical__body">
28-
<div class="container">
29-
<div class="m-intro-vertical__grid">
30-
<div class="m-intro-vertical__grid-inner">
31-
<span
26+
<div class="m-intro m-intro-static-image" style="background-color: var(--color-neutrals-blue-xlight);">
27+
<div
28+
class="container"
29+
>
30+
<div style="width: 66.6%">
31+
<div>
32+
<p
3233
v-if="tagline"
3334
class="m-intro-vertical__tagline"
34-
>
35-
{{ tagline }}
36-
</span>
37-
38-
<h1 class="m-intro-vertical__title">
39-
{{ title }}
40-
</h1>
35+
>
36+
{{ tagline }}
37+
</p>
38+
<h1 class="m-intro-vertical__title">
39+
{{ title }}
40+
</h1>
41+
</div>
4142

42-
<div
43-
v-if="divider"
44-
class="muc-divider"
45-
></div>
43+
<div
44+
v-if="divider"
45+
class="muc-divider"
46+
></div>
4647

47-
<div class="m-intro-vertical__content">
48-
<p>
49-
<slot></slot>
50-
</p>
51-
</div>
52-
</div>
48+
<div class="m-intro-vertical__content">
49+
<p style="padding-bottom: 32px;">
50+
<slot></slot>
51+
</p>
5352
</div>
5453
</div>
5554
</div>

0 commit comments

Comments
 (0)