From 4338229ae63b35b19bf8c7d01c4bbe9a4bbe45f7 Mon Sep 17 00:00:00 2001
From: Matthieu Lalonde <matth_web_git@lalonde.me>
Date: Fri, 9 Nov 2012 13:10:12 -0500
Subject: [PATCH] More CSS and selectors cleanup

---
 resources/css/player.css                      | 19 +++++++++++--------
 resources/templates/player/player-status.html |  8 ++++----
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/resources/css/player.css b/resources/css/player.css
index 07b6190..d38b758 100644
--- a/resources/css/player.css
+++ b/resources/css/player.css
@@ -53,26 +53,26 @@ body > div.ui-layout-north > div:last-child > h1 {
 	font-weight: bold;
 }
 
-#daaprProgressTimeRemain,
-#daaprProgressTimeElapsed {
+body > div.ui-layout-north > div:last-child > .playerProgressWrapper > span:first-child,
+body > div.ui-layout-north > div:last-child > .playerProgressWrapper > span:last-child {
 	font-size: 0.7em;
 }
 
-#daaprProgressTimeRemain {
+body > div.ui-layout-north > div:last-child > .playerProgressWrapper > span:last-child {
 	vertical-align: top;
 	height: 7px;
 	line-height: 7px;
 	padding-right: 5px;
 }
 
-#daaprProgressTimeElapsed {
+body > div.ui-layout-north > div:last-child > .playerProgressWrapper > span:first-child {
 	vertical-align: top;
 	height: 7px;
 	line-height: 7px;
 	padding-left: 5px;
 }
 
-.daaprProgressWrap {
+body > div.ui-layout-north > div:last-child > .playerProgressWrapper {
 	width: auto;
 	text-align: center;
 	margin: 0 auto;
@@ -135,10 +135,12 @@ progress::-webkit-progress-bar-value,
 progress::-webkit-progress-value,
 progress::-moz-progress-bar {
 	-webkit-appearance: progress-bar;
+	-moz-appearance: progress-bar;
+	/*appearance: progress-bar;*/
 	/*background-color: #BFBFBF;*/
 }
 
-progress#daaprPlayerProgress {
+body > div.ui-layout-north > div:last-child > .playerProgressWrapper > progress {
 	vertical-align: top;
 	/*-moz-border-radius: 7px;
 	-webkit-border-radius: 7px;*/
@@ -150,11 +152,12 @@ progress#daaprPlayerProgress {
 	/*border: 1px solid #393939;*/
 }
 /*
-progress#daaprPlayerProgress, progress#daaprPlayerProgress span {
+body > div.ui-layout-north > div:last-child > .playerProgressWrapper > progress,
+body > div.ui-layout-north > div:last-child > .playerProgressWrapper > progress span {
 	-moz-border-radius: 7px;
 	-webkit-border-radius: 7px;
 }
-progress#daaprPlayerProgress span {
+body > div.ui-layout-north > div:last-child > .playerProgressWrapper > progress span {
 	background: url('../img/progressbar_fg.png') repeat-x;
 	display: block;
 	height: 7px;
diff --git a/resources/templates/player/player-status.html b/resources/templates/player/player-status.html
index 63862f6..b2f2055 100644
--- a/resources/templates/player/player-status.html
+++ b/resources/templates/player/player-status.html
@@ -1,10 +1,10 @@
 <% if (typeof dmap_itemnname !== "undefined") { %>
 	<div class="daaprPlayerTitleIndicator">{{dmap_itemname}}</div>
 	<div class="daaprPlayerInfoIndicator">{{daap_songartist}}</div>
-	<div class="daaprProgressWrap">
-		<span id="daaprProgressTimeElapsed">0:00</span>
-		<progress min="0" max="1" value="0" id="daaprPlayerProgress"></progress>
-		<span id="daaprProgressTimeRemain">-0:00</span>
+	<div class="playerProgressWrapper">
+		<span>0:00</span>
+		<progress min="0" max="1" value="0"></progress>
+		<span>-0:00</span>
 	</div>
 <% } else { %>
 	<h1>DAAPr<sup>3</sup></h1>