KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2026-01-09 19:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added transition on playlistheight and fixes search add bug

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2015-01-31 12:34:32 +01:00
parent eef55ca12f
commit 7dbb364e49
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/admin.js
View File

@@ -6,7 +6,7 @@ function admin()
adminTogg = !adminTogg; adminTogg = !adminTogg;
if(adminTogg) $("#playlist").height($("#playlist").height()-210); //opening if(adminTogg) $("#playlist").height($("#playlist").height()-210); //opening
if(!adminTogg)setTimeout(function(){$("#playlist").height($("#playlist").height()+210);},501); //closing if(!adminTogg)$("#playlist").height($("#playlist").height()+210);; //closing
$("#adminPanel").toggleClass("hiddenAdmin"); $("#adminPanel").toggleClass("hiddenAdmin");
} }

9
js/search.js
View File

@@ -149,12 +149,19 @@ function submit(id,title){
data: "v="+id+"&n="+title+"&pass="+adminpass, data: "v="+id+"&n="+title+"&pass="+adminpass,
success: function() { success: function() {
//document.getElementById("search").value = ""; document.getElementById("search").value = "";
$("#results").html = "";
$(".main").removeClass("blurT");
$("#controls").removeClass("blurT");
//$("#search").addClass("success"); //$("#search").addClass("success");
}, },
error: function(){ error: function(){
console.log("error in adding"); console.log("error in adding");
document.getElementById("search").value = ""; document.getElementById("search").value = "";
$("#results").html = "";
$(".main").removeClass("blurT");
$("#controls").removeClass("blurT");
$("#search").addClass("error"); $("#search").addClass("error");
} }
}).responseText; }).responseText;

7
static/style.css
View File

@@ -1,4 +1,7 @@
body{background:#000; margin:0; } body{background:#000; margin:0; }
::selection {
background: grey; /* WebKit/Blink Browsers */
}
.top{ .top{
font-family: 'Open Sans', sans-serif; font-weight: 300; text-align: center; font-family: 'Open Sans', sans-serif; font-weight: 300; text-align: center;
animation: fadein .5s; -moz-animation: fadein .5s; -webkit-animation: fadein .5s; -o-animation: fadein .5s; animation: fadein .5s; -moz-animation: fadein .5s; -webkit-animation: fadein .5s; -o-animation: fadein .5s;
@@ -15,7 +18,7 @@ body{background:#000; margin:0; }
/*color:#f15;*/color:white; text-align: center;-webkit-transition:background 1s;-moz-transition:background 1s;-o-transition:background 1s; transition:background 1s; /*color:#f15;*/color:white; text-align: center;-webkit-transition:background 1s;-moz-transition:background 1s;-o-transition:background 1s; transition:background 1s;
background-color: rgba(255, 255, 255, 0.22); background-color: rgba(255, 255, 255, 0.22);
} }
.passbox{height: 24px;font-size: 15px;width: 42%;padding: 4px 0;margin: 5px 0;border-radius: 2px;border: none; text-align: center;background-color:rgba(255,255,255,0.2);} .passbox{color:white;height: 24px;font-size: 15px;width: 42%;padding: 4px 0;margin: 5px 0;border-radius: 2px;border: none; text-align: center;background-color:rgba(255,255,255,0.2);}
.success{animation: fadecol 1.5s; -moz-animation: fadecol 1.5s; -webkit-animation: fadecol 1.5s; -o-animation: fadecol 1.5s;} .success{animation: fadecol 1.5s; -moz-animation: fadecol 1.5s; -webkit-animation: fadecol 1.5s; -o-animation: fadecol 1.5s;}
.fadeerror {animation: fadered 1.5s; -moz-animation: fadered 1.5s; -webkit-animation: fadered 1.5s; -o-animation: fadered 1.5s;} .fadeerror {animation: fadered 1.5s; -moz-animation: fadered 1.5s; -webkit-animation: fadered 1.5s; -o-animation: fadered 1.5s;}
.small{font-size: 5vw; color:#E2E2E2; text-decoration: none; } .small{font-size: 5vw; color:#E2E2E2; text-decoration: none; }
@@ -74,7 +77,7 @@ body{background:#000; margin:0; }
#minus{display:none;} #minus{display:none;}
#player{height: 68%; height: calc(87% - 213px); width: 60%; border-radius: 3px; /*box-shadow: 0 8px 11px -4px black;*/} #player{height: 68%; height: calc(87% - 213px); width: 60%; border-radius: 3px; /*box-shadow: 0 8px 11px -4px black;*/}
#playlist{-webkit-transition: opacity 0.5s;transition: opacity 0.5s;} #playlist{-webkit-transition: height 0.5s;transition: height 0.5s;}
.nomargin{padding: 0;margin:0;} .nomargin{padding: 0;margin:0;}
#adminForm{text-align:left; padding-top: 15px;} #adminForm{text-align:left; padding-top: 15px;}