From 669e31b69caa47917904c68ff80b2583094d8628 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sat, 17 Mar 2018 01:02:12 +0100 Subject: [PATCH] Remove some workarounds for old CEF (in particular, we have flexbox now). --- score.css | 5 +++++ score.js | 18 +----------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/score.css b/score.css index ba0981a..f61df50 100644 --- a/score.css +++ b/score.css @@ -131,6 +131,8 @@ body { background-image: url(lowerthird-bg.png); color: black; /* padding-top: 20px; */ + display: flex; + align-items: center; } .lowerthird-headline-hidden { width: 0px; @@ -156,6 +158,7 @@ body { .lowerthird-headline-content-animate-out { -webkit-animation: wipe-in 2.0s ease; clip: rect(0px,0px,200px,0px); + -webkit-animation-fill-mode: both; } .lowerthird-subheading { position: fixed; @@ -171,6 +174,8 @@ body { align-items: center; */ /*background: linear-gradient(to right, #44c, #33a 15px); */ background-image: url(lowerthird-bg2.png); + display: flex; + align-items: center; } .lowerthird-subheading-hidden { clip: rect(0px,0px,200px,0px); diff --git a/score.js b/score.js index 85ab488..1d28e4c 100644 --- a/score.js +++ b/score.js @@ -110,19 +110,6 @@ function showlowerthird() { if (lowerthird_visible) return; - // With no flexbox, this is how it has to be... - let f = document.getElementById('lowerthird-headline'); - let g = document.getElementById('lowerthird-headline-content'); - f.style.paddingTop = Math.round((f.clientHeight - g.clientHeight) / 2) + 'px'; - - f = document.getElementById('lowerthird-subheading'); - g = document.getElementById('lowerthird-subheading-content'); - f.style.paddingTop = Math.round((f.clientHeight - g.clientHeight) / 2) + 'px'; - - f = document.getElementById('lowerthird-picture'); - g = document.getElementById('lowerthird-picture-content'); - f.style.paddingTop = Math.round((f.clientHeight - g.clientHeight) / 2) + 'px'; - document.getElementById('lowerthird-headline').className = 'lowerthird-headline lowerthird-headline-animate-in'; document.getElementById('lowerthird-headline-content').className = 'lowerthird-headline-content lowerthird-headline-content-animate-in'; document.getElementById('lowerthird-subheading').className = 'lowerthird-subheading lowerthird-subheading-animate-in'; @@ -153,7 +140,7 @@ function hidelowerthird() document.getElementById('lowerthird-headline-content').className = 'lowerthird-headline-content lowerthird-headline-content-animate-out'; document.getElementById('lowerthird-subheading').className = 'lowerthird-subheading lowerthird-subheading-animate-out'; document.getElementById('lowerthird-subheading-content').className = 'lowerthird-subheading-content lowerthird-subheading-content-animate-out'; - document.getElementById('lowerthird-picture').className = 'lowerthird-picture lowerthird-picture-hidden lowerthird-picture-animate-out'; + document.getElementById('lowerthird-picture').className = 'lowerthird-picture lowerthird-picture-animate-out'; document.getElementById('lowerthird-picture-content').className = 'lowerthird-picture-content lowerthird-picture-content-animate-out'; lowerthird_visible = false; } @@ -220,9 +207,6 @@ function play() { document.getElementById('manualcontrols').style.display = 'none'; document.getElementById('area').style.display = 'none'; - - // Old CEF workaround - document.getElementById('lowerthird-subheading').style.top = '638px'; } function update(v) -- 2.39.2