merge with staging

app/assets/javascripts/application.js

@@ -52,3 +52,5 @@ function export_to(path)
   var form_params = $("#frm_report").serialize();
   window.location = path+"?"+ form_params;
 }
+
+

app/assets/stylesheets/sx-sidebar.css

@@ -14,7 +14,7 @@
 }
 
 #wrapper.toggled {
-    padding-left: 200px;
+    padding-left: 210px;
 }
 
 #sidebar-wrapper {
@@ -41,13 +41,14 @@
 #page-content-wrapper {
     width: 100%;
     position: absolute;
-    padding: 0px;
+    padding-top: 20px;
     
 }
 
 #wrapper.toggled #page-content-wrapper {
     position: absolute;
     margin-right: -200px;
+    padding-top: 20px;
 }
 
 
@@ -117,7 +118,7 @@
         padding-left: 0;
     }
     #wrapper.toggled {
-        padding-left: 210px;
+        padding-left: 209px;
     }
     #sidebar-wrapper {
         width: 0;
@@ -126,12 +127,13 @@
         width: 216px;
     }
     #page-content-wrapper {
-        padding: 0px;
+        padding-top: 20px;
         position: relative;
     }
     #wrapper.toggled #page-content-wrapper {
         position: relative;
         margin-right: 0;
+        padding-top: 20px;
     }
 }
 .accordion {