diff --git a/customize.dist/main.js b/customize.dist/main.js index 2622eef1b..d73bd2fe4 100644 --- a/customize.dist/main.js +++ b/customize.dist/main.js @@ -5,6 +5,7 @@ define([ '/common/cryptpad-common.js', '/bower_components/lil-uri/uri.min.js', '/bower_components/jquery/dist/jquery.min.js', + '/common/jscolor.js', ], function (Messages, DecorateToolbar, Config, Cryptpad, LilUri) { var $ = window.$; diff --git a/www/slide/main.js b/www/slide/main.js index 9342bac5a..9ec4f060b 100644 --- a/www/slide/main.js +++ b/www/slide/main.js @@ -438,11 +438,11 @@ define([ console.log(jscolor); var $background = $('', { value: 'BACKGROUND', + style: "position:absolute; top:100px; left: 50px; z-index:1000" }); - $rightside[0].appendChild($background[0]); var picker = new jscolor($background[0]); + $('body').append($background); console.log($background); - $background.addClass('jscolor-active'); // $rightside[0].appendChild($background[0]); //console.log($pad.contents().find('#cryptpad-bg-color'));