Commit 8e28b73b by Jonathan Thomas

Truncate long file names, remove white border around image previews, and improve…

Truncate long file names, remove white border around image previews, and improve clip # badge to be more readable.
parent b8bce0af
...@@ -333,10 +333,11 @@ export default { ...@@ -333,10 +333,11 @@ export default {
position: absolute; position: absolute;
bottom: 5%; bottom: 5%;
left: 5%; left: 5%;
padding: 8px;
opacity: 0.75; opacity: 0.75;
background-color: #000000; background-color: #000000;
border-radius: 4px; border-radius: 11px;
z-index: 1000;
border: 1px solid rgba(255, 255, 255, 0.85);
} }
video { video {
background-color: #000000; background-color: #000000;
...@@ -359,4 +360,4 @@ export default { ...@@ -359,4 +360,4 @@ export default {
filter: none; filter: none;
color: #e3e3e3; color: #e3e3e3;
} }
</style> </style>
\ No newline at end of file
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<figure class="file-figure"> <figure class="file-figure">
<!-- File thumbnail image --> <!-- File thumbnail image -->
<img @click="toggleSelection(file)" :class="getSelectedClass(file)" class="file-thumbnail img-fluid img-thumbnail" :title="file.name" :src="file.thumbnail"/> <img @click="toggleSelection(file)" :class="getSelectedClass(file)" class="file-thumbnail img-fluid img-thumbnail" :title="file.name" :src="file.thumbnail"/>
<figcaption class="figure-caption">{{ getFileName(file) }}</figcaption> <figcaption class="figure-caption" :title="getBaseFileName(file)">{{ getBaseFileName(file) }}</figcaption>
</figure> </figure>
</div> </div>
...@@ -114,13 +114,8 @@ export default { ...@@ -114,13 +114,8 @@ export default {
return '' return ''
} }
}, },
getFileName(fileObject) { getBaseFileName(fileObject) {
let base = path.basename(fileObject.media) return path.basename(fileObject.media)
if (base.length < 20) {
return base
} else {
return `${base.substr(0, 18)}...`
}
}, },
...mapActions(['loadFiles', 'createFile', 'deleteFile']), ...mapActions(['loadFiles', 'createFile', 'deleteFile']),
...mapMutations((['setPreviewFile', 'setPreviewClip', 'setFiles'])) ...mapMutations((['setPreviewFile', 'setPreviewClip', 'setFiles']))
...@@ -157,6 +152,11 @@ export default { ...@@ -157,6 +152,11 @@ export default {
} }
.figure-caption { .figure-caption {
font-size: 0.8em; font-size: 0.8em;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
display: block;
width: 100%;
} }
.file-thumbnail { .file-thumbnail {
cursor: pointer; cursor: pointer;
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<video ref="video" v-if="!isImage && hasPreviewFile" v-show="media_loaded" @loadeddata="videoLoaded" @timeupdate="videoTimeUpdate" @pause="togglePause" @play="togglePause" loop preload="" poster="" class="preview-media"> <video ref="video" v-if="!isImage && hasPreviewFile" v-show="media_loaded" @loadeddata="videoLoaded" @timeupdate="videoTimeUpdate" @pause="togglePause" @play="togglePause" loop preload="" poster="" class="preview-media">
<source :type="previewFormat" :src="preview.file.media" @error="mediaError"> <source :type="previewFormat" :src="preview.file.media" @error="mediaError">
</video> </video>
<img v-if="isImage && hasPreviewFile" v-show="media_loaded" :src="preview.file.media" @load="imageLoaded" @error="mediaError" class="preview-media img-thumbnail" /> <img v-if="isImage && hasPreviewFile" v-show="media_loaded" :src="preview.file.media" @load="imageLoaded" @error="mediaError" class="preview-media" />
<button type="button" class="preview-stage-resizer" title="Resize preview height" aria-label="Resize preview height" <button type="button" class="preview-stage-resizer" title="Resize preview height" aria-label="Resize preview height"
@mousedown.prevent="startStageResize" @mousedown.prevent="startStageResize"
@touchstart.prevent="startStageResize" @touchstart.prevent="startStageResize"
...@@ -677,6 +677,8 @@ export default { ...@@ -677,6 +677,8 @@ export default {
height: 100%; height: 100%;
object-fit: contain; object-fit: contain;
background-color: #000000; background-color: #000000;
border: none;
box-shadow: none;
} }
.preview-stage-resizer { .preview-stage-resizer {
position: absolute; position: absolute;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment