diff options
-rw-r--r-- | .github/PULL_REQUEST_TEMPLATE/pull_request_template.md | 20 | ||||
-rw-r--r-- | example/src/Misc Media/A Trip to the Moon.mp4.yaml | 7 | ||||
-rw-r--r-- | viewer/src/components/async/AsyncLdMarkdown.vue | 14 | ||||
-rw-r--r-- | viewer/src/views/MainLayout.vue | 5 | ||||
-rw-r--r-- | viewer/src/views/layout/left/LayoutInformation.vue | 8 |
5 files changed, 34 insertions, 20 deletions
diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md new file mode 100644 index 0000000..7c48653 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md | |||
@@ -0,0 +1,20 @@ | |||
1 | --- | ||
2 | name: Generic pull request | ||
3 | about: Create a pull request to propose some changes. | ||
4 | title: '' | ||
5 | labels: '' | ||
6 | assignees: '' | ||
7 | --- | ||
8 | |||
9 | ### What changed | ||
10 | |||
11 | |||
12 | ### Why the changes | ||
13 | |||
14 | |||
15 | ### Before-merge checklist | ||
16 | |||
17 | - [ ] Changes are tested. | ||
18 | - [ ] Documentation is up to date with the changes. | ||
19 | - [ ] Commit history is clean and descriptive. | ||
20 | |||
diff --git a/example/src/Misc Media/A Trip to the Moon.mp4.yaml b/example/src/Misc Media/A Trip to the Moon.mp4.yaml new file mode 100644 index 0000000..48ec714 --- /dev/null +++ b/example/src/Misc Media/A Trip to the Moon.mp4.yaml | |||
@@ -0,0 +1,7 @@ | |||
1 | description: | | ||
2 | From the 1902 short film « Le Voyage dans la Lune » by Georges Méliès. | ||
3 | |||
4 | It was based on: | ||
5 | - From the Earth to the Moon, and | ||
6 | - Around the Moon by Jules Verne. | ||
7 | |||
diff --git a/viewer/src/components/async/AsyncLdMarkdown.vue b/viewer/src/components/async/AsyncLdMarkdown.vue index 213c11c..c3f368a 100644 --- a/viewer/src/components/async/AsyncLdMarkdown.vue +++ b/viewer/src/components/async/AsyncLdMarkdown.vue | |||
@@ -40,7 +40,6 @@ const html = computed(() => marked(props.markdown)); | |||
40 | <style lang="scss" module> | 40 | <style lang="scss" module> |
41 | .markdown { | 41 | .markdown { |
42 | color: white; | 42 | color: white; |
43 | line-height: 1.7; | ||
44 | word-wrap: break-word; | 43 | word-wrap: break-word; |
45 | 44 | ||
46 | a { | 45 | a { |
@@ -52,19 +51,10 @@ const html = computed(() => marked(props.markdown)); | |||
52 | background-color: #666; | 51 | background-color: #666; |
53 | } | 52 | } |
54 | 53 | ||
55 | p, | ||
56 | blockquote, | ||
57 | ul, | ||
58 | ol, | ||
59 | dl, | ||
60 | table, | ||
61 | pre { | ||
62 | margin: 15px 0; | ||
63 | } | ||
64 | |||
65 | ul, | 54 | ul, |
66 | ol { | 55 | ol { |
67 | padding-left: 30px; | 56 | list-style-type: disc; |
57 | padding-left: 1em; | ||
68 | } | 58 | } |
69 | 59 | ||
70 | h1 { | 60 | h1 { |
diff --git a/viewer/src/views/MainLayout.vue b/viewer/src/views/MainLayout.vue index d8b3300..30bfe97 100644 --- a/viewer/src/views/MainLayout.vue +++ b/viewer/src/views/MainLayout.vue | |||
@@ -26,7 +26,10 @@ | |||
26 | /> | 26 | /> |
27 | <template v-else-if="galleryStore.config && galleryStore.galleryIndex"> | 27 | <template v-else-if="galleryStore.config && galleryStore.galleryIndex"> |
28 | <LayoutTop :class="[$style.layout, $style.layoutTop]" /> | 28 | <LayoutTop :class="[$style.layout, $style.layoutTop]" /> |
29 | <LayoutLeft :class="[$style.layout, $style.layoutLeft]" /> | 29 | <LayoutLeft |
30 | v-show="!uiStore.fullWidth" | ||
31 | :class="[$style.layout, $style.layoutLeft]" | ||
32 | /> | ||
30 | <router-view | 33 | <router-view |
31 | ref="content" | 34 | ref="content" |
32 | :class="[$style.layout, $style.layoutContent]" | 35 | :class="[$style.layout, $style.layoutContent]" |
diff --git a/viewer/src/views/layout/left/LayoutInformation.vue b/viewer/src/views/layout/left/LayoutInformation.vue index 780a458..9dfb311 100644 --- a/viewer/src/views/layout/left/LayoutInformation.vue +++ b/viewer/src/views/layout/left/LayoutInformation.vue | |||
@@ -67,6 +67,7 @@ const formatDate = computed(() => { | |||
67 | .infopanel { | 67 | .infopanel { |
68 | padding: 2px 2px 7px 7px; | 68 | padding: 2px 2px 7px 7px; |
69 | overflow-wrap: break-word; | 69 | overflow-wrap: break-word; |
70 | max-height: 50%; | ||
70 | 71 | ||
71 | .title { | 72 | .title { |
72 | font-weight: bold; | 73 | font-weight: bold; |
@@ -80,13 +81,6 @@ const formatDate = computed(() => { | |||
80 | > * { | 81 | > * { |
81 | margin-top: 5px; | 82 | margin-top: 5px; |
82 | } | 83 | } |
83 | ul, | ||
84 | ol { | ||
85 | margin-left: 1em; | ||
86 | } | ||
87 | ul { | ||
88 | list-style-type: disc; | ||
89 | } | ||
90 | a { | 84 | a { |
91 | color: $palette-200; | 85 | color: $palette-200; |
92 | &:hover { | 86 | &:hover { |