Skip to content

Loading…

fix bugs #36

Merged
merged 2 commits into from

1 participant

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Apr 4, 2013
  1. fix bugs

    committed
  2. fix bugs

    committed
Showing with 7 additions and 7 deletions.
  1. +1 −1 fuel/app/views/stream/index.php
  2. +2 −1 public/assets/css/common.css
  3. +4 −5 public/assets/js/player.js
View
2 fuel/app/views/stream/index.php
@@ -21,7 +21,7 @@
<a tabindex='1' id="cont-prev" class="btn btn-large play-prev">PREV</a>
<a tabindex='1' id="cont-pause" class="btn btn-large switch-pause btn-inverse" state="0">PLAY</a>
<a tabindex='1' id="cont-next" class="btn btn-large play-next">NEXT</a>
- <a tabindex='1' id="cont-hide" class="btn btn-large hide-cont" state="1">hide</a>
+ <!--a tabindex='1' id="cont-hide" class="btn btn-large hide-cont" state="1">hide</a-->
</div>
</div>
<div class="row streaming-contents">
View
3 public/assets/css/common.css
@@ -22,7 +22,8 @@ div#logo>h1>a:hover {
#header{
height: 75px;
- background-color: #2a2a2a;
+ background: -moz-linear-gradient(top, #2a2a2a, #2a2a2a);
+ background: -webkit-gradient(linear, left top, left bottom, from(#2a2a2a), color-stop(0.8, #2a2a2a), to(#3a3a3a));
width: 100%;
margin-bottom: 40px;
}
View
9 public/assets/js/player.js
@@ -52,10 +52,10 @@ function registControleBtns(){
switchPause();
});
- var toggleHideBtn = document.getElementById('cont-hide');
- toggleHideBtn.addEventListener('click', function(){
- toggleHide();
- });
+ //var toggleHideBtn = document.getElementById('cont-hide');
+ //toggleHideBtn.addEventListener('click', function(){
+ // toggleHide();
+ //});
}
function initPlaylist(__playlist, is_sub){
@@ -208,7 +208,6 @@ function playDirect(seq){
function toggleHide(){
var btn = document.getElementById('cont-hide');
- console.log(__player.style);
switch(btn.getAttribute('state')){
case "1":
__player.style.position = "fixed";
Something went wrong with that request. Please try again.