diff --git a/index.php b/index.php
index 150d4470..71cdcc59 100755
--- a/index.php
+++ b/index.php
@@ -43,7 +43,7 @@
diff --git a/js/admin.js b/js/admin.js
index c5e6db04..604463b1 100755
--- a/js/admin.js
+++ b/js/admin.js
@@ -5,13 +5,22 @@ function admin()
{
adminTogg = !adminTogg;
if(adminTogg)
-
- if(find) extraHeight = 0;
- else extraHeight = 30;
-
- if(adminTogg) $("#playlist").height($("#player").height()-270+extraHeight); //opening
- if(!adminTogg)$("#playlist").height($("#player").height()+extraHeight);; //closing
-
+ {
+ if(find)
+ {
+ eH = -10;
+ }else
+ eH = 30;
+ $("#playlist").height($("#player").height()-270+eH); //opening
+ }else if(!adminTogg)
+ {
+ if(find)
+ {
+ eH = -10;
+ }else
+ eH = 30;
+ $("#playlist").height($("#player").height()+eH); //closing
+ }
$("#adminPanel").toggleClass("hiddenAdmin");
}
diff --git a/js/list.js b/js/list.js
index 70daa8a6..b01e71eb 100755
--- a/js/list.js
+++ b/js/list.js
@@ -58,7 +58,7 @@ function updateList()
{
if(!window.mobilecheck())
{
- $("#playlist").css({height: $("#player").height()-$("#adminPanel").outerHeight(true)+30});
+ $("#playlist").css({height: $("#player").height()-$("#adminPanel").outerHeight(true)-$("#findform").outerHeight(true)+30});
$("#playlist").css({overflow: "hidden"});
if(scroller === false)
{
diff --git a/js/searchlist.js b/js/searchlist.js
index 20b68ba5..4c346d66 100644
--- a/js/searchlist.js
+++ b/js/searchlist.js
@@ -25,11 +25,30 @@ $(document).ready(function()
if(find) $("#playlist").height($("#player").height()-30+30);
if(!find)$("#playlist").height($("#player").height()+30);; //closing
*/
- if(adminTogg) extraHeight = -300;
- else extraHeight = -30;
+ /*if(adminTogg) extraHeight = -300;
+ else extraHeight = -30;*/
- if(find) $("#playlist").height($("#player").height()+extraHeight+30); //opening
- if(!find)$("#playlist").height($("#player").height()+extraHeight+60);; //closing
+ if(find)
+ {
+ if($("#adminPanel").height() != 0)
+ {
+ extraHeight = $("#adminPanel").height()+30;
+ }else
+ {
+ extraHeight = 10;
+ }
+ $("#playlist").height($("#player").height()-extraHeight); //opening
+ }else if(!find)
+ {
+ if($("#adminPanel").height() != 0)
+ {
+ extraHeight = $("#adminPanel").height()-10;
+ }else
+ {
+ extraHeight = -30;
+ }
+ $("#playlist").height($("#player").height()-extraHeight);; //closing
+ }
myScroll.refresh();
setTimeout(function(){myScroll.refresh();}, 505);
@@ -54,8 +73,11 @@ $(document).ready(function()
{
//found[0].style.backgroundColor = "rgba(0,0,0,0.5)";
//found[0].setAttribute("style", "-webkit-filter:brightness(100%)");
- found[0].className = found[0].className + " fullbrightness";
- bright = found[0].className.split(" ")[0];
+ for(i = 0; i < found.length; i++)
+ {
+ found[i].className = found[i].className + " fullbrightness";
+ bright = found[i].className.split(" ")[i];
+ }
//found[0].style.backgroundColor = "red";
myScroll.scrollToElement(found[0], 10, 0, -30);
}else
diff --git a/static/style.css b/static/style.css
index 717220b4..a54d9ae6 100755
--- a/static/style.css
+++ b/static/style.css
@@ -17,7 +17,7 @@ body {
.fullbrightness {
-webkit-filter:brightness(100%);
filter:brightness(100%);
- background-color:rgba(0,0,0,0.5);
+ /*background-color:rgba(0,0,0,0.2);*/
}
#findform {
@@ -46,7 +46,7 @@ body {
}
.display {
- height:30px !important;
+ height:40px !important;
}
.top {