From 97de993055d1a42671589a8e42a076daca70aa91 Mon Sep 17 00:00:00 2001 From: Calvin Montgomery Date: Mon, 23 Jan 2017 22:00:18 -0800 Subject: [PATCH] Rename shit to avoid breaking backwards compat of currenttitle --- templates/channel.pug | 4 ++-- www/css/cytube.css | 2 +- www/css/themes/bootstrap-theme.min.css | 4 ++-- www/css/themes/cyborg.css | 2 +- www/css/themes/light.css | 4 ++-- www/css/themes/modern.css | 2 +- www/css/themes/slate.css | 2 +- www/js/callbacks.js | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/templates/channel.pug b/templates/channel.pug index 4e8904e2..9fb6e24e 100644 --- a/templates/channel.pug +++ b/templates/channel.pug @@ -50,10 +50,10 @@ html(lang="en") span.input-group-addon Guest login input#guestname.form-control(type="text", placeholder="Name") #videowrap.col-lg-7.col-md-7 - p#currenttitle + p#videowrap-header span#resize-video-smaller.glyphicon.glyphicon-minus.pointer(title="Make the video smaller") span#resize-video-larger.glyphicon.glyphicon-plus.pointer(title="Make the video larger") - span#currenttitle-text Nothing Playing + span#currenttitle Nothing Playing .embed-responsive.embed-responsive-16by9 #ytapiplayer.embed-responsive-item #controlsrow.row diff --git a/www/css/cytube.css b/www/css/cytube.css index 916aae8d..e3084997 100644 --- a/www/css/cytube.css +++ b/www/css/cytube.css @@ -90,7 +90,7 @@ font-weight: bold; } -#chatheader > p, #currenttitle { +#chatheader > p, #videowrap-header { margin: 0; } diff --git a/www/css/themes/bootstrap-theme.min.css b/www/css/themes/bootstrap-theme.min.css index b9bb2375..b34fe86d 100644 --- a/www/css/themes/bootstrap-theme.min.css +++ b/www/css/themes/bootstrap-theme.min.css @@ -20,7 +20,7 @@ body { background-color: #000000; } -#chatheader, #currenttitle, #userlist, #messagebuffer, #plmeta { +#chatheader, #videowrap-header, #userlist, #messagebuffer, #plmeta { background-color: #ffffff; } @@ -57,7 +57,7 @@ footer { border: 1px solid #aaaaaa; } -#chatheader, #currenttitle { +#chatheader, #videowrap-header { border: 1px solid #cccccc; border-bottom-width: 0; border-radius: 5px; diff --git a/www/css/themes/cyborg.css b/www/css/themes/cyborg.css index cfaee1fb..40e63d74 100644 --- a/www/css/themes/cyborg.css +++ b/www/css/themes/cyborg.css @@ -65,7 +65,7 @@ input.form-control[type="email"], textarea.form-control { border: 1px solid #aaaaaa; } -#chatheader, #currenttitle { +#chatheader, #videowrap-header { border: 1px solid #cccccc; border-bottom-width: 0; border-radius: 5px; diff --git a/www/css/themes/light.css b/www/css/themes/light.css index c3f70a4e..7707132b 100644 --- a/www/css/themes/light.css +++ b/www/css/themes/light.css @@ -14,7 +14,7 @@ body { background-color: #000000; } -#chatheader, #currenttitle, #userlist, #messagebuffer, #plmeta { +#chatheader, #videowrap-header, #userlist, #messagebuffer, #plmeta { background-color: #ffffff; } @@ -51,7 +51,7 @@ footer { border: 1px solid #aaaaaa; } -#chatheader, #currenttitle { +#chatheader, #videowrap-header { border: 1px solid #cccccc; border-bottom-width: 0; border-radius: 5px; diff --git a/www/css/themes/modern.css b/www/css/themes/modern.css index b1523314..2f4f0b87 100644 --- a/www/css/themes/modern.css +++ b/www/css/themes/modern.css @@ -120,7 +120,7 @@ input.form-control[type="email"], textarea.form-control { } -#chatheader, #currenttitle { +#chatheader, #videowrap-header { border: 1px solid #000000; height: 30px; background-color: rgba(20, 22, 26, 0.7); diff --git a/www/css/themes/slate.css b/www/css/themes/slate.css index d48d0e5b..6f480fc5 100644 --- a/www/css/themes/slate.css +++ b/www/css/themes/slate.css @@ -81,7 +81,7 @@ input.form-control[type="email"], textarea.form-control { border: 1px solid #aaaaaa; } -#chatheader, #currenttitle { +#chatheader, #videowrap-header { border: 1px solid #cccccc; border-bottom-width: 0; border-radius: 5px; diff --git a/www/js/callbacks.js b/www/js/callbacks.js index 3ee9935f..025fce2b 100644 --- a/www/js/callbacks.js +++ b/www/js/callbacks.js @@ -837,7 +837,7 @@ Callbacks = { $("#voteskip").attr("disabled", false); } - $("#currenttitle-text").text("Currently Playing: " + data.title); + $("#currenttitle").text("Currently Playing: " + data.title); }, mediaUpdate: function(data) {