diff options
author | pacien | 2022-10-26 01:27:32 +0200 |
---|---|---|
committer | GitHub | 2022-10-26 01:27:32 +0200 |
commit | d229943925505aa1204d24c83ddc814cba2d578b (patch) | |
tree | fe3ecd643eb676bb77b54e94a28bfcc8fb8acad7 | |
parent | ffd5d78e9b3fc341e36467bd43bd6d22373de4ed (diff) | |
parent | 8335335bce93e88635edb5ab2215ee57ed365952 (diff) | |
download | ldgallery-d229943925505aa1204d24c83ddc814cba2d578b.tar.gz |
Merge pull request #335 from ldgallery/oz-fix-markdown-style
viewer: style of item description panel has changed
-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/layout/left/LayoutInformation.vue | 8 |
3 files changed, 10 insertions, 19 deletions
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/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 { |