Merge pull request #5951 from avalonmediasystem/develop

v7.8 RC2

Gemfile

@@ -53,7 +53,7 @@ gem 'avalon-about', git: 'https://github.com/avalonmediasystem/avalon-about.git'
 #gem 'bootstrap-sass', '< 3.4.1' # Pin to less than 3.4.1 due to change in behavior with popovers
 gem 'bootstrap-toggle-rails'
 gem 'bootstrap_form'
-gem 'iiif_manifest', git: 'https://github.com/samvera/iiif_manifest.git', branch: 'main'
+gem 'iiif_manifest', '~> 1.6'
 gem 'rack-cors', require: 'rack/cors'
 gem 'rails_same_site_cookie'
 gem 'recaptcha', require: 'recaptcha/rails'

Gemfile.lock

@@ -65,14 +65,6 @@ GIT
       ims-lti
       omniauth
 
-GIT
-  remote: https://github.com/samvera/iiif_manifest.git
-  revision: 75a3702d58982b37bb9ce327dcd6686273a6ccbb
-  branch: main
-  specs:
-    iiif_manifest (1.5.0)
-      activesupport (>= 4)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -502,6 +494,8 @@ GEM
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     iconv (1.0.8)
+    iiif_manifest (1.6.0)
+      activesupport (>= 4)
     ims-lti (1.1.13)
       builder
       oauth (>= 0.4.5, < 0.6)
@@ -1045,7 +1039,7 @@ DEPENDENCIES
   httpx
   hydra-head (~> 12.0)
   iconv (~> 1.0.6)
-  iiif_manifest!
+  iiif_manifest (~> 1.6)
   ims-lti (~> 1.1.13)
   jbuilder (~> 2.0)
   jquery-datatables

app/javascript/components/PlaylistRamp.jsx

@@ -223,9 +223,9 @@ const Ramp = ({
               </div>
             </Col>
           </Row>
-          <Row>
+          <Row className="ramp--playlist-desc-tags">
             {comment && (
-              <div style={{position: 'relative'}}>
+              <div style={{ position: 'relative' }}>
                 <h4>{comment_label}</h4>
                 <div className='ramp--playlist-description' onScroll={handleScrollableDescription}>
                   <span dangerouslySetInnerHTML={{ __html: description }} />

app/javascript/components/Ramp.scss

@@ -38,9 +38,6 @@
         min-height: 2.9em;
       }
     }
-    .vjs-volume-horizontal .vjs-volume-level .vjs-svg-icon>svg {
-      vertical-align: top;
-    }
   }
 
   .ramp--structured-nav {
@@ -367,6 +364,10 @@
     flex-basis: auto;
     height: 70vh;
 
+    .ramp--playlist-desc-tags {
+      flex-direction: column;
+    }
+
     .ramp--playlist-description {
       overflow: auto;
       max-height: 25vh;

app/javascript/components/embeds/Ramp.scss

@@ -38,16 +38,13 @@
     .video-js .vjs-control-bar {
       font-size: 90% !important;
     }
-    
+
     // reduce player height to match with adjusted font-size
     // for smaller screens
     .video-js.vjs-audio {
       min-height: 2.9em;
     }
   }
-  .vjs-volume-horizontal .vjs-volume-level .vjs-svg-icon>svg {
-    vertical-align: top;
-  }
   .video-js .vjs-title-bar .vjs-title-link {
     font-size: 125%;
   }