diff options
author | OzoneGrif | 2020-04-04 04:37:24 +0200 |
---|---|---|
committer | GitHub | 2020-04-04 04:37:24 +0200 |
commit | 6a51cbe5bbb166f58cc7961091cc64328d0d2126 (patch) | |
tree | 3883160f30b4bc4d7ec54cefc5136c22e91a46b2 /viewer/src | |
parent | cd1a81f9ffc2662e4cb2d37414cd8331a27da504 (diff) | |
parent | e3a1566aca42190d486ee73612b9275560e17aa1 (diff) | |
download | ldgallery-6a51cbe5bbb166f58cc7961091cc64328d0d2126.tar.gz |
Merge pull request #178 from pacien/oz-overflowing-titles
viewer: items with long titles overflow
Diffstat (limited to 'viewer/src')
-rw-r--r-- | viewer/src/assets/scss/theme.scss | 3 | ||||
-rw-r--r-- | viewer/src/components/LdThumbnail.vue | 10 | ||||
-rw-r--r-- | viewer/src/main.ts | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/viewer/src/assets/scss/theme.scss b/viewer/src/assets/scss/theme.scss index feb8543..9e9cdc8 100644 --- a/viewer/src/assets/scss/theme.scss +++ b/viewer/src/assets/scss/theme.scss | |||
@@ -53,6 +53,7 @@ $button-border-color: $palette-500; | |||
53 | $button-focus-color: $button-color; | 53 | $button-focus-color: $button-color; |
54 | $button-focus-border-color: $link; | 54 | $button-focus-border-color: $link; |
55 | $button-focus-box-shadow-size: 0; | 55 | $button-focus-box-shadow-size: 0; |
56 | $body-line-height: 1.5; | ||
56 | 57 | ||
57 | // Custom components | 58 | // Custom components |
58 | 59 | ||
@@ -68,7 +69,7 @@ $loader-color: $palette-800; | |||
68 | $input-tag-delete-background-color: $palette-700; | 69 | $input-tag-delete-background-color: $palette-700; |
69 | $breadcrumb-margins: 12px; | 70 | $breadcrumb-margins: 12px; |
70 | $breadcrumb-overflow-mask-size: $breadcrumb-margins + 60px; | 71 | $breadcrumb-overflow-mask-size: $breadcrumb-margins + 60px; |
71 | $thumbnail-other-size: 120px; | 72 | $thumbnail-other-size: $body-line-height * 9em; |
72 | $proposed-category-bgcolor: $palette-700; | 73 | $proposed-category-bgcolor: $palette-700; |
73 | 74 | ||
74 | // Layout | 75 | // Layout |
diff --git a/viewer/src/components/LdThumbnail.vue b/viewer/src/components/LdThumbnail.vue index 3ef7fa8..f8343eb 100644 --- a/viewer/src/components/LdThumbnail.vue +++ b/viewer/src/components/LdThumbnail.vue | |||
@@ -28,7 +28,9 @@ | |||
28 | @load="loading=false" | 28 | @load="loading=false" |
29 | /> | 29 | /> |
30 | <div v-else class="thumbnail-other flex-column flex-center"> | 30 | <div v-else class="thumbnail-other flex-column flex-center"> |
31 | <fa-icon :icon="getIcon()" size="4x" /> | 31 | <div> |
32 | <fa-icon :icon="getIcon()" size="4x" /> | ||
33 | </div> | ||
32 | {{item.title}} | 34 | {{item.title}} |
33 | </div> | 35 | </div> |
34 | </div> | 36 | </div> |
@@ -65,7 +67,13 @@ export default class LdThumbnail extends Vue { | |||
65 | .thumbnail-other { | 67 | .thumbnail-other { |
66 | width: $thumbnail-other-size; | 68 | width: $thumbnail-other-size; |
67 | height: $thumbnail-other-size; | 69 | height: $thumbnail-other-size; |
70 | padding-top: $body-line-height * 2em; | ||
68 | text-align: center; | 71 | text-align: center; |
72 | word-break: break-word; | ||
73 | overflow: hidden; | ||
74 | > div { | ||
75 | min-height: $body-line-height * 3em; | ||
76 | } | ||
69 | } | 77 | } |
70 | 78 | ||
71 | .preload { | 79 | .preload { |
diff --git a/viewer/src/main.ts b/viewer/src/main.ts index bc005c5..1f77875 100644 --- a/viewer/src/main.ts +++ b/viewer/src/main.ts | |||
@@ -37,5 +37,3 @@ new Vue({ | |||
37 | store, | 37 | store, |
38 | render: h => h(MainLayout) | 38 | render: h => h(MainLayout) |
39 | }).$mount("#ldgallery") | 39 | }).$mount("#ldgallery") |
40 | |||
41 | |||