Merge branch 'master' of github.com:kevinmcdonagh/mashbox

Conflicts: code/css/mashbox1.css
kevinmcdonagh · Sep 5, 2010 · 0d464f8 · 0d464f8
2 parents 6c2ae48 + 86f5668
commit 0d464f8
Showing 1 changed file with 39 additions and 0 deletions.
diff --git a/code/css/mashbox1.css b/code/css/mashbox1.css
@@ -453,6 +453,7 @@ table tr:nth-child(2n) {
     cursor:pointer;
 }
 
+<<<<<<< HEAD
 #choose-genre.active:hover span {
     border-color: transparent #F3A7B0 transparent transparent !important;
 }
@@ -499,6 +500,44 @@ ol.txt_mash	 li{
 	font-style:bold;
 }
 
+
+/* =TRACK MASH LOADING DIALOG
+--------------------------------------------------------------------------- */
+ol{
+	list-style: none;
+}
+.cover {
+	float:left;
+}
+ol.txt_mash	 li{
+	clear:both;	
+}
+
+.details{
+	display:block;
+	margin:0 0 0 108px;	
+}
+
+.details h3 {
+	font-size:2em;
+}
+
+.details p {
+	font-size:1.7em;
+}
+
+.plus {
+	text-align:center;
+	font-size:3em;
+	font-style:bold;
+}
+
+.equals {
+	text-align:center;
+	font-size:3em;
+	font-style:bold;
+}
+
 .loading {}