aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaZderMind2014-12-26 01:43:33 +0100
committerMaZderMind2014-12-26 01:43:33 +0100
commitd76854a4800df84f325d89e499d70bb0b121e4a1 (patch)
tree715edbdfb43663640436fd19d360888b500a04c1
parenta2b8258e26ce48407bfbd2b12ca8f7aab6c82e86 (diff)
fix selectable subtitle block
Diffstat (limited to '')
-rw-r--r--assets/css/lustige-styles.css11
-rw-r--r--assets/css/src/lustige-styles.scss7
-rw-r--r--assets/js/lustiges-script.js5
3 files changed, 16 insertions, 7 deletions
diff --git a/assets/css/lustige-styles.css b/assets/css/lustige-styles.css
index f64383a..6a06dfb 100644
--- a/assets/css/lustige-styles.css
+++ b/assets/css/lustige-styles.css
@@ -5626,19 +5626,24 @@ a.inverted {
font-size: 65px;
text-align: center;
opacity: 0;
+ display: none;
padding: 5px 0;
overflow: hidden; }
.mejs-container .mejs-subs-line .silence {
font-size: 49%;
opacity: 0;
+ display: none;
color: #555; }
.mejs-container .mejs-subs-line.silence .silence {
- opacity: 1; }
+ opacity: 1;
+ display: block; }
.mejs-container .mejs-subs-line .error {
color: red;
- opacity: 0; }
+ opacity: 0;
+ display: none; }
.mejs-container .mejs-subs-line.error .error {
- opacity: 1; }
+ opacity: 1;
+ display: block; }
.mejs-container .mejs-controls {
visibility: visible !important;
height: 39px; }
diff --git a/assets/css/src/lustige-styles.scss b/assets/css/src/lustige-styles.scss
index c26de97..b4491ad 100644
--- a/assets/css/src/lustige-styles.scss
+++ b/assets/css/src/lustige-styles.scss
@@ -467,21 +467,24 @@ a.inverted {
font-size: 65px;
text-align: center;
opacity: 0;
+ display: none;
padding: 5px 0;
overflow: hidden;
.silence {
font-size: 49%;
opacity: 0;
+ display: none;
color: #555;
}
- &.silence .silence { opacity: 1; }
+ &.silence .silence { opacity: 1; display: block; }
.error {
color: red;
opacity: 0;
+ display: none;
}
- &.error .error { opacity: 1; }
+ &.error .error { opacity: 1; display: block; }
}
.mejs-controls {
diff --git a/assets/js/lustiges-script.js b/assets/js/lustiges-script.js
index 26d68b9..322c69e 100644
--- a/assets/js/lustiges-script.js
+++ b/assets/js/lustiges-script.js
@@ -5,10 +5,11 @@ $.fn.pulseSubsLine = function(klass) {
.hide()
.end()
.addClass(klass)
+ .css({display: 'block'})
.animate({opacity: 1, duration: .75}, function() {
setTimeout(function() {
e.animate({opacity: 0, duration: .5}, function() {
- e.removeClass(klass);
+ e.css({display: 'none'}).removeClass(klass);
})
}, 5000);
});
@@ -103,7 +104,7 @@ MediaElementPlayer.prototype.buildsubs = function(player, controls, layers, medi
var socket = io(host);
socket.on('connect', function() {
- $line.animate({opacity: 1}, t);
+ $line.show().animate({opacity: 1}, t);
socket.emit('join', room);
});