From e5279f1a0a0eb58ea8734e42068a76d09d03e1c6 Mon Sep 17 00:00:00 2001 From: Mason Ballengee Date: Tue, 31 Oct 2023 16:03:25 -0400 Subject: [PATCH 1/2] Add nowrap css rule for .btn --- app/assets/stylesheets/avalon.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/avalon.scss b/app/assets/stylesheets/avalon.scss index 2abcb58e3f..37aca27d2e 100644 --- a/app/assets/stylesheets/avalon.scss +++ b/app/assets/stylesheets/avalon.scss @@ -67,6 +67,10 @@ h2 { font-family: $museoSlab; } +.btn { + white-space: nowrap; +} + .btn-info { color: $primary; } From b6f085f5aa1c3cb97500aa08fc5f3af85f789bc4 Mon Sep 17 00:00:00 2001 From: Mason Ballengee Date: Wed, 1 Nov 2023 11:23:49 -0400 Subject: [PATCH 2/2] Limit nowrap to item page buttons --- app/assets/stylesheets/avalon.scss | 4 ---- app/javascript/components/Ramp.jsx | 10 +++++----- app/views/media_objects/_administrative_links.html.erb | 4 ++-- app/views/media_objects/_thumbnail.html.erb | 2 +- app/views/media_objects/_timeline.html.erb | 6 +++--- 5 files changed, 11 insertions(+), 15 deletions(-) diff --git a/app/assets/stylesheets/avalon.scss b/app/assets/stylesheets/avalon.scss index 37aca27d2e..2abcb58e3f 100644 --- a/app/assets/stylesheets/avalon.scss +++ b/app/assets/stylesheets/avalon.scss @@ -67,10 +67,6 @@ h2 { font-family: $museoSlab; } -.btn { - white-space: nowrap; -} - .btn-info { color: $primary; } diff --git a/app/javascript/components/Ramp.jsx b/app/javascript/components/Ramp.jsx index 32e7df27c1..d8ddbe59c0 100644 --- a/app/javascript/components/Ramp.jsx +++ b/app/javascript/components/Ramp.jsx @@ -66,8 +66,8 @@ const Ramp = ({
{ timeline.canCreate &&
} - { playlist.canCreate && -
diff --git a/app/views/media_objects/_timeline.html.erb b/app/views/media_objects/_timeline.html.erb index c40fc2f603..08517047f8 100644 --- a/app/views/media_objects/_timeline.html.erb +++ b/app/views/media_objects/_timeline.html.erb @@ -15,7 +15,7 @@ Unless required by applicable law or agreed to in writing, software distributed %>
-
@@ -74,7 +74,7 @@ $(document).ready(function() { scopes = timelineScopes.scopes; streamId = timelineScopes.streamId; let currentPlayer = document.getElementById('iiif-media-player').player; - + for (let index = 0; index < scopes.length; index++) { scope = scopes[index]; label = scope.label @@ -130,7 +130,7 @@ $(document).ready(function() { $('#new-timeline-source')[0].value = '/master_files/'+ id + '?' + t; $('#new-timeline-form')[0].submit(); }); - } + } });