From a31cc6c7592ab3136606568546f62ba9fcf7d76e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Tue, 31 Oct 2017 13:34:12 +0100 Subject: [PATCH] Added colorpicker polyfill --- server/public/assets/css/style.css | 9 +++++++++ server/public/assets/js/listeners.js | 9 +++++++++ server/public/layouts/main.handlebars | 2 ++ server/public/partials/channel/header.handlebars | 2 +- 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/server/public/assets/css/style.css b/server/public/assets/css/style.css index c8a7a5ca..0f75f1bc 100755 --- a/server/public/assets/css/style.css +++ b/server/public/assets/css/style.css @@ -1927,6 +1927,15 @@ nav ul li:hover, nav ul li.active { border-top-left-radius: 4px; } +.sp-replacer { + border: none; + background: none; +} + +#embed.modal.open { + overflow-y: visible; +} + #top-button, #bottom-button{ color: white; position: absolute; diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js index baa8c54f..3cf45956 100755 --- a/server/public/assets/js/listeners.js +++ b/server/public/assets/js/listeners.js @@ -386,6 +386,15 @@ function init(){ position: "top", tooltip: "Cast Zoff to TV" }); + + $("#color_embed").spectrum({ + color: "#808080", + change: function(c) { + color = c.toHexString().substring(1); // #ff0000 + $("#embed-area").val(embed_code(embed_autoplay, embed_width, embed_height, color)); + }, + appendTo: "#embed", + }); } $("#results" ).hover( function() { $("div.result").removeClass("hoverResults"); i = 0; }, function(){ }); diff --git a/server/public/layouts/main.handlebars b/server/public/layouts/main.handlebars index 0745e632..3c074486 100644 --- a/server/public/layouts/main.handlebars +++ b/server/public/layouts/main.handlebars @@ -27,6 +27,7 @@ + @@ -46,6 +47,7 @@ + diff --git a/server/public/partials/channel/header.handlebars b/server/public/partials/channel/header.handlebars index 0aea7cf1..b1e21cce 100644 --- a/server/public/partials/channel/header.handlebars +++ b/server/public/partials/channel/header.handlebars @@ -131,7 +131,7 @@ - +