Merge pull request #191 from zoff-music/feature/polyfill-color

Feature/polyfill color
This commit is contained in:
Kasper Rynning-Tønnesen
2017-10-31 13:55:55 +01:00
committed by GitHub
4 changed files with 55 additions and 1 deletions

View File

@@ -1927,6 +1927,36 @@ nav ul li:hover, nav ul li.active {
border-top-left-radius: 4px;
}
.polyfill-color {
border: none;
background: white;
border-radius: 2px;
padding: 12px 12px 0px 12px;
}
.sp-picker-container {
width: auto;
}
.sp-container button, .sp-container button:hover, .sp-container button:active {
background: none;
border: none;
border-radius: 0;
color: black;
font-size: inherit;
line-height: inherit;
box-shadow: none;
}
.sp-replacer {
border: none;
background: none;
}
#embed.modal.open {
overflow-y: visible;
}
#top-button, #bottom-button{
color: white;
position: absolute;

View File

@@ -386,8 +386,30 @@ 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",
containerClassName: 'polyfill-color z-depth-4',
show: function(color) {
},
});
$(".sp-choose").addClass("hide");
$(".sp-cancel").addClass("btn-flat waves-effect waves-red");
$(".sp-cancel").removeClass("sp-cancel");
$(".sp-button-container").append("<a href='#' class='btn-flat waves-effect waves-green sp-choose-link'>CHOOSE</a>");
}
$(".sp-choose-link").on("click", function(e) {
e.preventDefault();
$(".sp-choose").trigger("click");
});
$("#results" ).hover( function() { $("div.result").removeClass("hoverResults"); i = 0; }, function(){ });
$("#search").focus();
$("#embed-button").css("display", "inline-block");

View File

@@ -27,6 +27,7 @@
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link type="text/css" rel="stylesheet" href="https://swisnl.github.io/jQuery-contextMenu/dist/jquery.contextMenu.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css">
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/spectrum/1.8.0/spectrum.min.css">
<link rel="stylesheet" type="text/css" href="/assets/css/style.css" title="Default" />
<link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/assets/images/favicon-32x32.png">
@@ -46,6 +47,7 @@
<script type="text/javascript" src="/assets/dist/lib/jquery-ui.min.js"></script>
<script type="text/javascript" src="https://swisnl.github.io/jQuery-contextMenu/dist/jquery.contextMenu.js"></script>
<script type="text/javascript" src="https://swisnl.github.io/jQuery-contextMenu/dist/jquery.ui.position.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/spectrum/1.8.0/spectrum.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui-touch-punch/0.2.3/jquery.ui.touch-punch.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.0.3/socket.io.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/color-thief/2.0.1/color-thief.min.js"></script>

View File

@@ -131,7 +131,7 @@
<label for="height_embed" class="padding_left_6 embed-label">Height</label>
<input type="number" value="300" id="height_embed" class="settings_embed" min="1" />
<label for="color_embed" class="padding_left_6 embed-label">Color</label>
<input type="color" id="color_embed" class="settings_embed" value="#808080" />
<input type="text" id="color_embed" class="settings_embed" value="#808080" />
</p>
<textarea id="embed-area"></textarea>
</div>