updated margins

4 files changed, 6 insertions, 7 deletions

diff --git a/apps/calendar/css/style.css b/apps/calendar/css/style.css
index 5e19b88f55a..ca9f3274e3c 100644
--- a/apps/calendar/css/style.css
+++ b/apps/calendar/css/style.css
@@ -5,7 +5,7 @@
  * See the COPYING-README file.
  */
 
-#view {margin-left: 10px; float: left; font-size: 12px;}
+#view { float: left; font-size: 12px; height: 100%;}
 #datecontrol {text-align: center;}
 #datecontrol_left{font-size: 12px;}
 #datecontrol_right{font-size: 12px;}
@@ -17,7 +17,6 @@
 #editentry_dialog {display: none;}
 #parsingfail_dialog{display: none;}
 
-#view {margin-left: 10px; float: left; font-size: 12px; height: 100%;}
 #calendar_holder {height: 100%; width: 100%;}
 #onedayview, #oneweekview, #fourweeksview, #onemonthview, #listview {display: none; position: absolute;bottom: 0; right: 0; left: 160px; top: 80px;}
 #onedayview table {margin: 0; padding: 0; width: 100%; height: 100%; border-spacing:1px; background: #EEEEEE;}
diff --git a/apps/media/css/music.css b/apps/media/css/music.css
index 8575e6334a5..67d56075194 100644
--- a/apps/media/css/music.css
+++ b/apps/media/css/music.css
@@ -1,6 +1,6 @@
 #controls ul.jp-controls { padding:0; }
 #controls ul.jp-controls li { display:inline; }
-#controls ul.jp-controls li a { position:absolute; padding:.8em 1em; }
+#controls ul.jp-controls li a { position:absolute; padding:.8em 1em .8em 0; }
 a.jp-play, a.jp-pause { left:2.5em; }
 a.jp-pause { display:none; }
 a.jp-next { left:5em; }
@@ -39,7 +39,7 @@ tr.album td.artist { padding-left:1em; }
 tr.song td.artist { padding-left:2em; }
 .add {margin: 0 0.5em 0 0; }
 
-#scan { position:absolute; right:13em; top:0em; }
+#scan { position:absolute; right:13.5em; top:0em; }
 #scan .start { position:relative; display:inline; float:right; }
 #scan .stop { position:relative; display:inline; float:right; }
 #scan #scanprogressbar { position:relative; display:inline-block; width:10em; height:1.5em; top:.4em; }
diff --git a/core/css/styles.css b/core/css/styles.css
index 84a024f95b9..5d4df586a8e 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -50,7 +50,7 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-shadow:#ffeedd 0 1px 0; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; }
 
 /* CONTENT ------------------------------------------------------------------ */
-#controls { width:100%; top:3.5em; height:2.8em; margin:0; background:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:50; -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; }
+#controls { padding: 0 0.5em; width:100%; top:3.5em; height:2.8em; margin:0; background:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:50; -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; }
 #controls .button { display:inline-block; }
 #content { margin:3.5em 0 0 12.5em; }
 #leftcontent, .leftcontent { position:fixed; overflow: auto; top:6.4em; width:20em; background:#f8f8f8; border-right:1px solid #ddd; }
@@ -117,7 +117,7 @@ tbody tr:hover, tr:active { background-color:#f8f8f8; }
 #quotatext {padding: .6em 1em;}
 div.jp-play-bar, div.jp-seek-bar { padding:0; }
 
-.pager { list-style:none; float:right; display:inline; margin:.7em 12.7em 0 0; }
+.pager { list-style:none; float:right; display:inline; margin:.7em 13em 0 0; }
 .pager li { display:inline-block; }
 
 li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; }
diff --git a/files/css/files.css b/files/css/files.css
index 1766d03d967..a8419e972ef 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -10,7 +10,7 @@
 .file_upload_form, #file_newfolder_form { display:inline; float: left;}
 #fileSelector, #file_upload_submit, #file_newfolder_submit { display:none; }
 .file_upload_wrapper, #file_newfolder_name { background-repeat:no-repeat; background-position:.5em .5em; padding-left:2em; }
-.file_upload_wrapper { font-weight:bold; display:-moz-inline-box; /* fallback for older firefox versions*/ display:inline-block; padding-left:0; overflow:hidden; position:relative; margin:.1em 1em;}
+.file_upload_wrapper { font-weight:bold; display:-moz-inline-box; /* fallback for older firefox versions*/ display:inline-block; padding-left:0; overflow:hidden; position:relative; margin:.1em 1em .1em 0em;}
 .file_upload_wrapper .file_upload_button_wrapper { position:absolute; top:0; left:0; width:100%; height:100%; cursor:pointer; z-index:1000; }
 
 #file_newfolder_name { background-image:url('../../core/img/places/folder.svg'); font-weight:normal; width:7em; }