From 027afd15b12f2baa01a2d3dd00a8337bf62a88b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Sat, 31 Jan 2015 13:37:14 +0100 Subject: [PATCH] Fixed playlist transition on height and box shadow on search --- js/admin.js | 4 ++-- static/style.css | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/admin.js b/js/admin.js index 2a1ffa40..2954b81b 100755 --- a/js/admin.js +++ b/js/admin.js @@ -5,8 +5,8 @@ function admin() { adminTogg = !adminTogg; - if(adminTogg) $("#playlist").height($("#playlist").height()-210); //opening - if(!adminTogg)$("#playlist").height($("#playlist").height()+210);; //closing + if(adminTogg) $("#playlist").height($("#player").height()-210+30); //opening + if(!adminTogg)$("#playlist").height($("#player").height()+30);; //closing $("#adminPanel").toggleClass("hiddenAdmin"); } diff --git a/static/style.css b/static/style.css index c6b05e15..919f08e4 100755 --- a/static/style.css +++ b/static/style.css @@ -100,7 +100,7 @@ input[type="radio"]{display: none;} #loading{display:none;} #search{padding-left:50px;background: url(search2.png)no-repeat 10px 50%;background-color: rgba(255,255,255,0.2);background-size:2%;transition: box-shadow 0.5s;} -#search:focus{ box-shadow: 0px 0px 5px 2px #000;} +#search:focus{ box-shadow: 0px 0px 10px 0.5px #000;} @-webkit-keyframes fadein{from {opacity:0;}to{opacity:1;}}@keyframes fadein{from{opacity:0;}to{opacity:1;}}@-moz-keyframes fadein{from{opacity:0;}to{opacity:1;}}@-o-keyframes fadein{from{opacity:0;}to{opacity:1;}} @-webkit-keyframes fadecol{from {background-color:rgba(0,255,0,0.4);}to{background-color: rgba(255,255,255,0);}}@keyframes fadecol{background-color: rgba(0,255,0,0.4);}to{background-color: rgba(255,255,255,0);}}@-moz-keyframes fadecol{from{background-color: rgba(0,255,0,0.4);}to{background-color: rgba(255,255,255,0);}}@-o-keyframes fadecol{background-color: rgba(0,255,0,0.4);}to{background-color: rgba(255,255,255,0);}