Merge branch 'release/0.20'0.20.0.0

Conflicts:
  config/general.yml-example

1 files changed, 16 insertions, 1 deletions

diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index b0de2eb7b..104f10c75 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -27,13 +27,16 @@ body.admin {
 }
 
 .admin {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 14px;
+  line-height: 20px;
 
   @import "compass/css3";
   @import "bootstrap";
 
   #main {
+    margin-bottom: 50px;
     padding-top: 50px;
-
   }
 
   .form-inline {
@@ -47,6 +50,9 @@ body.admin {
 
   .accordion-group {
    border: none;
+   div {
+       clear: both;
+   }
   }
   .accordion-heading {
     .btn {
@@ -104,5 +110,14 @@ body.admin {
     width: 750px;
   }
 
+  .save-notice {
+    display: inline-block;
+    padding-left: 1em;
+  }
+
+  .category-list-item {
+    padding: 3px 0;
+  }
+
 }