diff options
| author | Jules Laplace <julescarbon@gmail.com> | 2020-09-08 19:09:53 +0200 |
|---|---|---|
| committer | Jules Laplace <julescarbon@gmail.com> | 2020-09-08 19:09:53 +0200 |
| commit | 8e130b207f7bb71680fbd87a7c7bc3cf38832cd2 (patch) | |
| tree | a6b232d28209dfdf347060f1a9ce55048eb41c2f | |
| parent | e5610ad8d3c14dbf4cb8a8e0600c297e51986766 (diff) | |
vitrine size edits, fix form to not break on that one gallery with the missing display images...
4 files changed, 22 insertions, 12 deletions
diff --git a/animism-align/frontend/app/views/media/components/media.formGallery.js b/animism-align/frontend/app/views/media/components/media.formGallery.js index b2e0381..3b7cdd1 100644 --- a/animism-align/frontend/app/views/media/components/media.formGallery.js +++ b/animism-align/frontend/app/views/media/components/media.formGallery.js @@ -210,22 +210,22 @@ export default class MediaGalleryForm extends Component { let { image_order, image_lookup, thumbnail_lookup, display_lookup, caption_lookup } = this.props.data.settings const new_image_order = image_order.filter(n => n !== id) caption_lookup = caption_lookup || {} - const image_lookup_upload_id = (image_lookup[id] || {}).id + const image_lookup_upload_id = ((image_lookup && image_lookup[id]) || {}).id if (image_lookup_upload_id) { actions.upload.destroy({ id: image_lookup_upload_id }) } - const thumbnail_lookup_upload_id = (thumbnail_lookup[id] || {}).id + const thumbnail_lookup_upload_id = ((thumbnail_lookup && thumbnail_lookup[id]) || {}).id if (thumbnail_lookup_upload_id) { actions.upload.destroy({ id: thumbnail_lookup_upload_id }) } - const display_lookup_upload_id = (display_lookup[id] || {}).id + const display_lookup_upload_id = ((display_lookup && display_lookup[id]) || {}).id if (display_lookup_upload_id) { actions.upload.destroy({ id: display_lookup_upload_id }) } - delete image_lookup[id] - delete thumbnail_lookup[id] - delete display_lookup[id] - delete caption_lookup[id] + image_lookup && delete image_lookup[id] + thumbnail_lookup && delete thumbnail_lookup[id] + display_lookup && delete display_lookup[id] + caption_lookup && delete caption_lookup[id] this.handleSettingsChange('multiple', { image_order: new_image_order, image_lookup: { ...image_lookup }, diff --git a/animism-align/frontend/app/views/viewer/player/components.inline/inline.video.js b/animism-align/frontend/app/views/viewer/player/components.inline/inline.video.js index a1dc344..7165baa 100644 --- a/animism-align/frontend/app/views/viewer/player/components.inline/inline.video.js +++ b/animism-align/frontend/app/views/viewer/player/components.inline/inline.video.js @@ -14,7 +14,7 @@ export const MediaVideo = ({ paragraph, media, currentParagraph, currentAnnotati if (!item) return <div>Media not found: {annotation.settings.media_id}</div> const color = CURTAIN_COLOR_LOOKUP[annotation.settings.color] || CURTAIN_COLOR_LOOKUP.white const width = window.innerWidth - const height = window.innerHeight * 0.8 + const height = window.innerHeight - (17 * 16) const style = { backgroundColor: color.backgroundColor, color: color.textColor, diff --git a/animism-align/frontend/app/views/viewer/player/components.media/media.vitrine.js b/animism-align/frontend/app/views/viewer/player/components.media/media.vitrine.js index 4fc3964..ae0bfd7 100644 --- a/animism-align/frontend/app/views/viewer/player/components.media/media.vitrine.js +++ b/animism-align/frontend/app/views/viewer/player/components.media/media.vitrine.js @@ -6,7 +6,11 @@ import actions from 'app/actions' export const Vitrine = ({ media }) => { const { image_order, image_lookup, thumbnail_lookup } = media.settings - const width = (Math.floor(100 / image_order.length * 2) - 2) + '%' + let width = (Math.floor(100 / image_order.length * 2)) + if (image_order.length % 2) { + width -= 2 + } + const displayWidth = width + '%' // console.log(width) return ( <div className='vitrine-items'> @@ -18,7 +22,7 @@ export const Vitrine = ({ media }) => { media={media} id={id} image={thumbnail} - width={width} + width={displayWidth} /> ) })} diff --git a/animism-align/frontend/app/views/viewer/player/player.transcript.css b/animism-align/frontend/app/views/viewer/player/player.transcript.css index f8ec881..d2ea24d 100644 --- a/animism-align/frontend/app/views/viewer/player/player.transcript.css +++ b/animism-align/frontend/app/views/viewer/player/player.transcript.css @@ -75,9 +75,15 @@ } .player-transcript .blockquote { - padding-left: 2rem; + font-family: "Freight Text", serif; + font-size: 3rem; + line-height: 1.28; + width: 80%; + margin: 0 auto; + padding-bottom: 2rem; + /*padding-left: 2rem;*/ /*padding-right: 2rem;*/ - line-height: 1.45; + /*line-height: 1.45;*/ } /* sentences */ |
