From 892b01ecffc753addeebeee20cdafaf7f8805d60 Mon Sep 17 00:00:00 2001
From: Jordan Lee <jordan@transmissionbt.com>
Date: Fri, 4 Jan 2013 05:59:18 +0000
Subject: [PATCH] (web) #4873 -- fix the margins of the toolbar buttons in
 mobile css

---
 web/style/transmission/common.css  | 19 ++++++++++---------
 web/style/transmission/common.scss | 17 +++++++++--------
 web/style/transmission/mobile.css  | 26 ++++++++++++++------------
 web/style/transmission/mobile.scss | 24 +++++++++++++-----------
 4 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/web/style/transmission/common.css b/web/style/transmission/common.css
index 6b7634ba7..39fbfadaf 100644
--- a/web/style/transmission/common.css
+++ b/web/style/transmission/common.css
@@ -69,7 +69,9 @@ div#toolbar {
     height: 34px;
     float: left;
     border: none;
-    padding: 0px 3px; }
+    padding: 0px 3px;
+    background-position: center center;
+    background-repeat: no-repeat; }
   div#toolbar > div#toolbar-separator {
     height: 25px;
     margin-top: 8px;
@@ -77,20 +79,19 @@ div#toolbar {
     border-left: 1px solid #aaa;
     width: 3px; }
   div#toolbar > div#toolbar-open {
-    background: url("images/toolbar-folder.png") no-repeat;
-    margin-left: 4px; }
+    background-image: url("images/toolbar-folder.png"); }
   div#toolbar > div#toolbar-remove {
-    background: url("images/toolbar-close.png") no-repeat; }
+    background-image: url("images/toolbar-close.png"); }
   div#toolbar > div#toolbar-start {
-    background: url("images/toolbar-start.png") no-repeat; }
+    background-image: url("images/toolbar-start.png"); }
   div#toolbar > div#toolbar-pause {
-    background: url("images/toolbar-pause.png") no-repeat; }
+    background-image: url("images/toolbar-pause.png"); }
   div#toolbar > div#toolbar-start-all {
-    background: url("images/toolbar-start-all.png") no-repeat; }
+    background-image: url("images/toolbar-start-all.png"); }
   div#toolbar > div#toolbar-pause-all {
-    background: url("images/toolbar-pause-all.png") no-repeat; }
+    background-image: url("images/toolbar-pause-all.png"); }
   div#toolbar > div#toolbar-inspector {
-    background: url("images/toolbar-info.png") no-repeat;
+    background-image: url("images/toolbar-info.png");
     float: right;
     margin-right: 4px; }
   div#toolbar > *.disabled {
diff --git a/web/style/transmission/common.scss b/web/style/transmission/common.scss
index d2a0cc003..cf4f7b6b1 100644
--- a/web/style/transmission/common.scss
+++ b/web/style/transmission/common.scss
@@ -143,6 +143,8 @@ div#toolbar
 		float: left;
 		border: none;
 		padding: 0px 3px;
+		background-position: center center;
+		background-repeat: no-repeat;
 	}
 
         >div#toolbar-separator {
@@ -154,27 +156,26 @@ div#toolbar
         }
 
 	> div#toolbar-open {
-		background: url('images/toolbar-folder.png') no-repeat;
-		margin-left: 4px;
+		background-image: url('images/toolbar-folder.png');
 	}
 	> div#toolbar-remove {
-		background: url('images/toolbar-close.png') no-repeat;
+		background-image: url('images/toolbar-close.png');
 	}
 	> div#toolbar-start {
-		background: url('images/toolbar-start.png') no-repeat;
+		background-image: url('images/toolbar-start.png');
 	}
 	> div#toolbar-pause {
-		background: url('images/toolbar-pause.png') no-repeat;
+		background-image: url('images/toolbar-pause.png');
 	}
 	> div#toolbar-start-all {
-		background: url('images/toolbar-start-all.png') no-repeat;
+		background-image: url('images/toolbar-start-all.png');
 	}
 	> div#toolbar-pause-all {
-		background: url('images/toolbar-pause-all.png') no-repeat;
+		background-image: url('images/toolbar-pause-all.png');
 	}
 
 	> div#toolbar-inspector {
-		background: url('images/toolbar-info.png') no-repeat;
+		background-image: url('images/toolbar-info.png');
 		float: right;
 		margin-right: 4px;
 	}
diff --git a/web/style/transmission/mobile.css b/web/style/transmission/mobile.css
index 6e4497433..b251a390f 100644
--- a/web/style/transmission/mobile.css
+++ b/web/style/transmission/mobile.css
@@ -44,7 +44,7 @@ body.open_showing #torrent_filter_bar, body.open_showing #torrent_container {
 ***/
 div#toolbar {
   width: 100%;
-  height: 36px;
+  height: 39px;
   margin: 0px;
   padding: 2px;
   border-bottom: 1px solid #AAA;
@@ -69,27 +69,29 @@ div#toolbar {
     height: 34px;
     float: left;
     border: none;
-    padding: 0px 3px; }
+    padding: 0px 3px;
+    background-position: center center;
+    background-repeat: no-repeat; }
   div#toolbar > div#toolbar-separator {
     height: 25px;
     margin-top: 8px;
-    margin-bottom: 5px;
+    margin-bottom: 8px;
     border-left: 1px solid #aaa;
     width: 3px; }
-  div#toolbar div#toolbar-open {
-    background: url("images/toolbar-folder.png") no-repeat; }
+  div#toolbar > div#toolbar-open {
+    background-image: url("images/toolbar-folder.png"); }
   div#toolbar > div#toolbar-remove {
-    background: url("images/toolbar-close.png") no-repeat; }
+    background-image: url("images/toolbar-close.png"); }
   div#toolbar > div#toolbar-start {
-    background: url("images/toolbar-start.png") no-repeat; }
+    background-image: url("images/toolbar-start.png"); }
   div#toolbar > div#toolbar-pause {
-    background: url("images/toolbar-pause.png") no-repeat; }
+    background-image: url("images/toolbar-pause.png"); }
   div#toolbar > div#toolbar-start-all {
-    background: url("images/toolbar-start-all.png") no-repeat; }
+    background-image: url("images/toolbar-start-all.png"); }
   div#toolbar > div#toolbar-pause-all {
-    background: url("images/toolbar-pause-all.png") no-repeat; }
+    background-image: url("images/toolbar-pause-all.png"); }
   div#toolbar > div#toolbar-inspector {
-    background: url("images/toolbar-info.png") no-repeat;
+    background-image: url("images/toolbar-info.png");
     float: right; }
   div#toolbar > *.disabled {
     opacity: 0.25; }
@@ -100,7 +102,7 @@ div#toolbar {
 ****
 ***/
 #statusbar {
-  height: 26px;
+  height: 20px;
   width: 100%;
   border-bottom: 1px solid #AAA;
   overflow: hidden;
diff --git a/web/style/transmission/mobile.scss b/web/style/transmission/mobile.scss
index d71ee7925..63af591f9 100644
--- a/web/style/transmission/mobile.scss
+++ b/web/style/transmission/mobile.scss
@@ -113,7 +113,7 @@ body.open_showing #torrent_filter_bar, body.open_showing #torrent_container {
 
 $toolbar-gradient-top: #ddd;
 $toolbar-gradient-bottom: #bbb;
-$toolbar-height: 36px;
+$toolbar-height: 39px;
 
 div#toolbar
 {
@@ -137,37 +137,39 @@ div#toolbar
 		float: left;
 		border: none;
 		padding: 0px 3px;
+		background-position: center center;
+		background-repeat: no-repeat;
 	}
 
 	>div#toolbar-separator {
 		height: 25px;
 		margin-top: 8px;
-		margin-bottom: 5px;
+		margin-bottom: 8px;
 		border-left: 1px solid #aaa;
 		width: 3px;
 	}
 
-	div#toolbar-open {
-		background: url('images/toolbar-folder.png') no-repeat;
+	> div#toolbar-open {
+		background-image: url('images/toolbar-folder.png');
 	}
 	> div#toolbar-remove {
-		background: url('images/toolbar-close.png') no-repeat;
+		background-image: url('images/toolbar-close.png');
 	}
 	> div#toolbar-start {
-		background: url('images/toolbar-start.png') no-repeat;
+		background-image: url('images/toolbar-start.png');
 	}
 	> div#toolbar-pause {
-		background: url('images/toolbar-pause.png') no-repeat;
+		background-image: url('images/toolbar-pause.png');
 	}
 	> div#toolbar-start-all {
-		background: url('images/toolbar-start-all.png') no-repeat;
+		background-image: url('images/toolbar-start-all.png');
 	}
 	> div#toolbar-pause-all {
-		background: url('images/toolbar-pause-all.png') no-repeat;
+		background-image: url('images/toolbar-pause-all.png');
 	}
 
 	> div#toolbar-inspector {
-		background: url('images/toolbar-info.png') no-repeat;
+		background-image: url('images/toolbar-info.png');
 		float: right;
 	}
 
@@ -184,7 +186,7 @@ div#toolbar
 
 $statusbar-gradient-top: #ddd;
 $statusbar-gradient-bottom: #bbb;
-$statusbar-height: 26px;
+$statusbar-height: 20px;
 
 #statusbar
 {