Permalink
Browse files

Added player controls, throbber, updated header area

  • Loading branch information...
1 parent 6fbe459 commit 16594ff7e771de83b846115dcb4a949bfd6e49d1 @KingMob committed Jun 5, 2012
Showing with 33 additions and 13 deletions.
  1. +15 −10 css/stylish-cdn.css
  2. +18 −3 index.html
View
@@ -1883,7 +1883,7 @@ ul.tabbernav li,
#header {
background: #83c441;
height: 42px;
- margin-bottom: 33px;
+ /*margin-bottom: 33px;*/
position: relative;
text-align: right;
z-index: 100;
@@ -2925,6 +2925,7 @@ ul.tabbernav li,
position: relative;
text-align: left;
width: 980px;
+ background-color: black;
}
#player-controls:hover #player-timebar {
@@ -3029,10 +3030,13 @@ ul.tabbernav li,
}
#player-controls {
- float: left;
+ float: none;
+ margin-left: auto;
+ margin-right: auto;
height: 32px;
- position: relative;
- width: 735px;
+ /*position: relative;*/
+ width: 660px;
+ clear: left;
}
#player-controls.disabled {
@@ -3248,6 +3252,7 @@ ul.tabbernav li,
#player-nowplaying a {
font-weight: 700;
+ color: #eee;
}
#player-nowplaying > * {
@@ -4270,30 +4275,30 @@ a:hover#soundcloud {
border-radius: 4px;
}
-.section .tools .share {
+/*.section .tools .share {
cursor: pointer;
float: right;
display: block;
width: 20px;
height: 20px;
background: url(http://static-ak.hypem.net/rev_1330987235/images/icon-share.png);
-}
+}*/
.section .tools .sparkdiv:hover {
cursor: pointer;
background: #fdf0c9;
border-color: #e0d4b2;
}
-.section .share {
+/*.section .share {
cursor: pointer;
display: inline-block;
margin-left: 10px;
-}
+}*/
-.section .share:hover {
+/*.section .share:hover {
opacity: 0.5;
-}
+}*/
.section .tools .favdiv a {
float: left;
View
@@ -6,15 +6,14 @@
@import url('sp://import/css/player.css');
@import url('sp://import/css/ui.css');
- @import url('sp://hypemachine/css/layout-wide.css');
+ /*@import url('sp://hypemachine/css/layout-wide.css');*/
@import url('sp://hypemachine/css/stylish-cdn.css');
h1, ul {margin:0 0 30px;}
a:hover {color:#83be20;}
/*#logo {background-color: #83C441;}*/
#content-left {float: none; margin-left: auto; margin-right: auto;}
-
</style>
<script type="text/javascript" src="sp://hypemachine/js/jquery-1.7.2.js"></script>
@@ -114,10 +113,26 @@ <h3 class="track_name">\
</script>
</head>
<body>
+ <div class="loading">
+ <div class="throbber"><div></div></div>
+ </div>
+ <!-- <div class=".sp-player"></div> -->
<div id="container" class="clearfix">
<div id="header">
- <a id="logo" href="/" title="The Hype Machine"></a>
+ <span id="logo" title="The Hype Machine"></span>
</div>
+ <div id="player-inner">
+ <div id="player-controls">
+ <!-- <a href="#" onclick="prevTrack(this);return false;" id="playerPrev"></a> -->
+ <a href="#" onclick="player.playing = !(player.playing);return false;" id="playerPlay" class=""></a>
+ <a href="#" id="playerFav" class="fav_item_1mkrw fav-off"></a>
+
+ <!-- <a href="#" onclick="nextTrack(this);return false;" id="playerNext"></a> -->
+
+ <!-- <div id="player-queue"></div> -->
+ <div id="player-nowplaying"><a id="player-nowplaying-artist" href="spotify:search:artist"></a><span> - </span><a id="player-nowplaying-track" href="spotify:search:track"></a><div class="share" id="player-share-button" style="opacity: 1; " onClick="application.showSharePopup(document.getElementById($(this).attr('id')),player.track.uri);"></div></div>
+ </div>
+ </div>
<div id="content-left">
</div>
</div>

0 comments on commit 16594ff

Please sign in to comment.