diff --git a/package.json b/package.json index e88d4eeee..6f2602421 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@ohrm/oxd", "license": "GPL-3.0", - "version": "2.0.2", + "version": "2.0.3", "private": true, "scripts": { "dev": "storybook dev -p 6006", diff --git a/src/components/Icon/map.ts b/src/components/Icon/map.ts index 6f771843a..b62e1afa2 100644 --- a/src/components/Icon/map.ts +++ b/src/components/Icon/map.ts @@ -62,3 +62,4 @@ export {default as bolt} from './svg/bolt-svg.vue'; export {default as timeAlt} from './svg/time-alt-svg.vue'; export {default as edit} from './svg/edit-svg.vue'; export {default as claim} from './svg/claim-svg.vue'; +export {default as upgrade} from './svg/upgrade-svg.vue'; diff --git a/src/components/Icon/svg/upgrade-svg.vue b/src/components/Icon/svg/upgrade-svg.vue new file mode 100644 index 000000000..9c60806dd --- /dev/null +++ b/src/components/Icon/svg/upgrade-svg.vue @@ -0,0 +1,31 @@ + + + diff --git a/src/components/Layout/Layout.vue b/src/components/Layout/Layout.vue index 99d2ad62f..4a37e0e51 100644 --- a/src/components/Layout/Layout.vue +++ b/src/components/Layout/Layout.vue @@ -38,6 +38,9 @@ :menu-items="topbarMenuItems" @collapse="onCollapse" > + diff --git a/src/components/Layout/stories/Layout.stories.js b/src/components/Layout/stories/Layout.stories.js index fdcfa1738..23a839734 100644 --- a/src/components/Layout/stories/Layout.stories.js +++ b/src/components/Layout/stories/Layout.stories.js @@ -18,6 +18,7 @@ */ import LayoutSimple from './LayoutSimple.story.vue'; import LayoutComplex from './LayoutComplex.story.vue'; +import LayoutWithButton from '@/components/Layout/stories/LayoutWithButton.vue'; export default { title: 'Example/Layout', @@ -42,3 +43,13 @@ Complex.parameters = { iframeHeight: 720, }, }; + +export const Button = () => LayoutWithButton; + +Button.parameters = { + layout: 'fullscreen', + docs: { + inlineStories: false, + iframeHeight: 720, + }, +}; diff --git a/src/components/Layout/stories/LayoutWithButton.vue b/src/components/Layout/stories/LayoutWithButton.vue new file mode 100644 index 000000000..3b1dbe761 --- /dev/null +++ b/src/components/Layout/stories/LayoutWithButton.vue @@ -0,0 +1,151 @@ + + + + + + + diff --git a/src/components/Topbar/Topbar.vue b/src/components/Topbar/Topbar.vue index 8c96e7b2f..fb644c1ae 100644 --- a/src/components/Topbar/Topbar.vue +++ b/src/components/Topbar/Topbar.vue @@ -42,6 +42,7 @@ +