Modify caption container CSS so min-height will accommodate two lines…

… of text
acri-jp · Mar 2, 2020 · c4445ea · c4445ea
1 parent 091af84
commit c4445ea
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/build/ableplayer.dist.js b/build/ableplayer.dist.js
@@ -10125,15 +10125,15 @@ if (thisObj.useTtml && (trackSrc.endsWith('.xml') || trackText.startsWith('<?xml
 				opacity = parseFloat(this.prefCaptionsOpacity) / 100.0;
 				$element.css({
 					'font-family': this.prefCaptionsFont,
-					'font-size': this.prefCaptionsSize,
 					'color': this.prefCaptionsColor,
 					'background-color': this.prefCaptionsBGColor,
 					'opacity': opacity
 				});
 				if ($element === this.$captionsDiv) {
 					if (typeof this.$captionsWrapper !== 'undefined') {
-						lineHeight = parseInt(this.prefCaptionsSize,10) + 25;
-						this.$captionsWrapper.css('line-height',lineHeight + '%');
+						this.$captionsWrapper.css({
+  						'font-size': this.prefCaptionsSize
+            });
 					}
 				}
 				if (this.prefCaptionsPosition === 'below') {

diff --git a/build/ableplayer.js b/build/ableplayer.js
@@ -10125,15 +10125,15 @@ if (thisObj.useTtml && (trackSrc.endsWith('.xml') || trackText.startsWith('<?xml
 				opacity = parseFloat(this.prefCaptionsOpacity) / 100.0;
 				$element.css({
 					'font-family': this.prefCaptionsFont,
-					'font-size': this.prefCaptionsSize,
 					'color': this.prefCaptionsColor,
 					'background-color': this.prefCaptionsBGColor,
 					'opacity': opacity
 				});
 				if ($element === this.$captionsDiv) {
 					if (typeof this.$captionsWrapper !== 'undefined') {
-						lineHeight = parseInt(this.prefCaptionsSize,10) + 25;
-						this.$captionsWrapper.css('line-height',lineHeight + '%');
+						this.$captionsWrapper.css({
+  						'font-size': this.prefCaptionsSize
+            });
 					}
 				}
 				if (this.prefCaptionsPosition === 'below') {

diff --git a/build/ableplayer.min.css b/build/ableplayer.min.css
diff --git a/build/ableplayer.min.js b/build/ableplayer.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ableplayer",
-  "version": "4.2.24",
+  "version": "4.2.25",
   "description": "fully accessible HTML5 media player",
   "homepage": "http://ableplayer.github.io/ableplayer",
   "bugs": "https://github.com/ableplayer/ableplayer/issues",

diff --git a/scripts/caption.js b/scripts/caption.js
@@ -366,15 +366,15 @@
 				opacity = parseFloat(this.prefCaptionsOpacity) / 100.0;
 				$element.css({
 					'font-family': this.prefCaptionsFont,
-					'font-size': this.prefCaptionsSize,
 					'color': this.prefCaptionsColor,
 					'background-color': this.prefCaptionsBGColor,
 					'opacity': opacity
 				});
 				if ($element === this.$captionsDiv) {
 					if (typeof this.$captionsWrapper !== 'undefined') {
-						lineHeight = parseInt(this.prefCaptionsSize,10) + 25;
-						this.$captionsWrapper.css('line-height',lineHeight + '%');
+						this.$captionsWrapper.css({
+  						'font-size': this.prefCaptionsSize
+            });
 					}
 				}
 				if (this.prefCaptionsPosition === 'below') {

diff --git a/styles/ableplayer.css b/styles/ableplayer.css
@@ -442,7 +442,7 @@ div.able-captions-overlay {
 }
 div.able-captions-below {
   position: relative;
-  min-height: 2.8em;
+  min-height: 3.2em;
 }
 div.able-descriptions {
   position: relative;