Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LM-150 Add collapse animation #17

Merged
merged 2 commits into from
Aug 8, 2023
Merged

LM-150 Add collapse animation #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5e23a8
LM-150 Add collapse animation
Aug 7, 2023
7d09cdb
LM-150 Fix image scaling with box height for instructions
Aug 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"register-service-worker": "^1.7.1",
"vite-plugin-require": "^1.1.10",
"vue": "^3.0.0",
"vue-collapsed": "^1.2.6",
"vue-markdown-render": "^2.0.1",
"vue-number-animation": "^1.1.2",
"vue-router": "^4.0.0-0",
Expand Down
71 changes: 51 additions & 20 deletions src/components/about-row.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,52 +1,54 @@
<template>
<div class="about-row">
<h3>{{ props.title }}</h3>
<vue-markdown
v-if="props.markdown"
class="about-row__markdown"
:source="expanded ? mdFullText : mdAbstract"
/>
<p v-else>
{{ expanded ? props.plain.fullText : props.plain.abstract }}
</p>
<div class="about-row__markdown">
<vue-markdown
v-if="props.markdown"
class="about-row__markdown__content"
:source="mdAbstract"
/>
<Collapse :when="isExpanded">
<vue-markdown
v-if="props.markdown"
class="about-row__markdown__content"
:source="mdDetails"
/>
</Collapse>
</div>

<atoms-expand-button class="about-text__expand-button" @expand="expand" @collapse="collapse" />
</div>
</template>

<script setup lang="ts">
import VueMarkdown from 'vue-markdown-render'
import { defineComponent } from 'vue'
import { Collapse } from 'vue-collapsed'
import VueMarkdown from 'vue-markdown-render'
import { useMarkdownImport } from '~/composables/use-requires'

const requireMarkdown = useMarkdownImport()

interface TextWithAbstract {
abstract: string,
fullText: string,
}

const props = defineProps<{
title: string,
markdown?: string,
plain?: TextWithAbstract,
}>()

const md = props.markdown ? requireMarkdown(props.markdown) : ''
const mdAbstract = md.split('\n\n')[0]
const mdFullText = md.split('\n\n').join(' ')
const mdDetails = md.split('\n\n').slice(1).join(' ')
</script>

<script lang="ts">
export default defineComponent({
data () {
return { expanded: false }
return { isExpanded: false }
},
methods: {
expand () {
this.expanded = true
this.isExpanded = true
},
collapse () {
this.expanded = false
this.isExpanded = false
}
}
})
Expand Down Expand Up @@ -77,7 +79,26 @@ export default defineComponent({
}
}

h3, p, .about-row__markdown {
.about-row__markdown {
display: flex;
flex-direction: column;
justify-content: flex-start;
align-items: flex-start;

margin: 0;
width: 90%;

@media #{$desk}, #{$big} {
width: 33%;
text-align: start;
}
}

.about-row__markdown__content {
margin: 0;
}

h3 {
width: 90%;

@media #{$desk}, #{$big} {
Expand All @@ -95,3 +116,13 @@ export default defineComponent({
}
}
</style>

<style lang="scss">
.about-row__markdown__content {
margin: 0;

p {
margin: 0;
}
}
</style>
41 changes: 32 additions & 9 deletions src/components/description-column.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,28 @@
<template>
<div class="description-column">
<h3>{{ title }}</h3>
<vue-markdown
class="description-column__markdown"
:class="{ expanded }"
:source="expanded ? mdFullText : mdAbstract"
/>

<div class="description-column__markdown">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Durch das Anfügen des zweiten Teils an das "abstract" entsteht hier eine ungewünschte newline.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed. Hab vergessen, dass dort auch wieder Standard-HTML Abstände gesetzt werden.

<vue-markdown
v-if="props.markdown"
class="description-column__markdown__content"
:source="mdAbstract"
/>
<Collapse :when="isExpanded">
<vue-markdown
v-if="props.markdown"
class="description-column__markdown__content"
:source="mdDetails"
/>
</Collapse>
</div>
<atoms-expand-link @expand="expand" @collapse="collapse" />
</div>
</template>

<script setup lang="ts">
import VueMarkdown from 'vue-markdown-render'
import { Collapse } from 'vue-collapsed'
import { defineComponent } from 'vue'
import { useMarkdownImport } from '~/composables/use-requires'

Expand All @@ -24,20 +35,20 @@ const props = defineProps<{

const md = props.markdown ? requireMarkdown(props.markdown) : ''
const mdAbstract = md.split('\n\n')[0]
const mdFullText = md.split('\n\n').join(' ')
const mdDetails = md.split('\n\n').slice(1).join(' ')
</script>

<script lang="ts">
export default defineComponent({
data () {
return { expanded: false }
return { isExpanded: false }
},
methods: {
expand () {
this.expanded = true
this.isExpanded = true
},
collapse () {
this.expanded = false
this.isExpanded = false
}
}
})
Expand Down Expand Up @@ -66,3 +77,15 @@ export default defineComponent({
}
}
</style>

<style lang="scss">
.description-column__markdown {
margin: 20px; // default p tag margin
}

.description-column__markdown__content {
ul {
margin: 0;
}
}
</style>
52 changes: 43 additions & 9 deletions src/components/instructions-row.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,20 @@
</atoms-lightbox>
</template>
<template v-else>
<vue-markdown class="manual-row__markdown" :source="expanded ? mdFullText : mdAbstract" />
<div class="manual-row__markdown">
<vue-markdown
v-if="props.markdown"
class="manual-row__markdown__content"
:source="mdAbstract"
/>
<Collapse :when="isExpanded">
<vue-markdown
v-if="props.markdown"
class="manual-row__markdown__content"
:source="mdDetails"
/>
</Collapse>
</div>
<atoms-expand-link
class="manual-row__expand-button"
@expand="expand"
Expand All @@ -23,6 +36,7 @@

<script setup lang="ts">
import VueMarkdown from 'vue-markdown-render'
import { Collapse } from 'vue-collapsed'
import { defineComponent } from 'vue'
import { useMarkdownImport } from '~/composables/use-requires'

Expand All @@ -37,20 +51,20 @@ const props = defineProps<{

const md = requireMarkdown(props.markdown)
const mdAbstract = md.split('\n\n')[0]
const mdFullText = md.split('\n\n').join(' ')
const mdDetails = md.split('\n\n').slice(1).join(' ')
</script>

<script lang="ts">
export default defineComponent({
data () {
return { expanded: false }
return { isExpanded: false }
},
methods: {
expand () {
this.expanded = true
this.isExpanded = true
},
collapse () {
this.expanded = false
this.isExpanded = false
}
}
})
Expand All @@ -77,12 +91,33 @@ export default defineComponent({

background-image: url('~/assets/img/manual-filler-right.svg');
background-repeat: no-repeat;

// fallback size and position
background-position: 90% 100px;
background-size: auto 80%;
background-position: 90% 100%;
@media #{$tab} {
// based on estimated row height (collapsed) for tablet
background-position: 100% 200px;
background-size: auto 300px;
}
@media #{$desk}, #{$big} {
// based on estimated row height (collapsed) for wider formats
background-position: 90% 100px;
background-size: auto 420px;
}

&.inverted {
background-image: url('~/assets/img/manual-filler-left.svg');
background-position: -0 100%;
background-position: -0 100%; // fallback position

@media #{$tab} {
// based on estimated row height (collapsed) for tablet
background-position: -0 200px;
}
@media #{$desk}, #{$big} {
// based on estimated row height (collapsed) for wider formats
background-position: -0 100px;
}
flex-direction: row-reverse;
}

Expand All @@ -92,8 +127,7 @@ export default defineComponent({
}

@media #{$tab} {
background-size: auto 50%;
background-position: 100% 100%;
// background-position: 100% 100%;
}
}

Expand Down
11 changes: 8 additions & 3 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -980,10 +980,10 @@
dependencies:
mime "^3.0.0"

"@esbuild/darwin-x64@0.17.14":
"@esbuild/darwin-arm64@0.17.14":
version "0.17.14"
resolved "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.14.tgz"
integrity sha512-zN0U8RWfrDttdFNkHqFYZtOH8hdi22z0pFm0aIJPsNC4QQZv7je8DWCX5iA4Zx6tRhS0CCc0XC2m7wKsbWEo5g==
resolved "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.14.tgz"
integrity sha512-eoSjEuDsU1ROwgBH/c+fZzuSyJUVXQTOIN9xuLs9dE/9HbV/A5IqdXHU1p2OfIMwBwOYJ9SFVGGldxeRCUJFyw==

"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.3.0":
version "4.4.0"
Expand Down Expand Up @@ -13128,6 +13128,11 @@ vue-bundle-renderer@^1.0.2:
dependencies:
ufo "^1.1.1"

vue-collapsed@^1.2.6:
version "1.2.6"
resolved "https://registry.npmjs.org/vue-collapsed/-/vue-collapsed-1.2.6.tgz"
integrity sha512-FNrq1l66JLSeod1VDczxMGlv8RAoPvh72qpA79rE8JFwrpuiEzIDo7GTwJoBmHpLI+t6betINy5kxW95AgebwQ==

vue-devtools-stub@^0.1.0:
version "0.1.0"
resolved "https://registry.npmjs.org/vue-devtools-stub/-/vue-devtools-stub-0.1.0.tgz"
Expand Down