Merge branch 'develop' of github.com:amooma/GS5 into develop

1 files changed, 21 insertions, 0 deletions

diff --git a/app/assets/stylesheets/gemeinschaft-generic.css.scss b/app/assets/stylesheets/gemeinschaft-generic.css.scss
index e594d67..fbeaa1f 100644
--- a/app/assets/stylesheets/gemeinschaft-generic.css.scss
+++ b/app/assets/stylesheets/gemeinschaft-generic.css.scss
@@ -6,6 +6,27 @@ body {
   padding-top: 60px;
   padding-bottom: 40px;
 }
+
+// Nav
+li.display {
+  line-height: 40px;
+  img {
+    vertical-align: middle;
+    width: 26px;
+    margin-top: -2px;
+  }
+}
+
+// SimpleForm Inline Checkbox Fix
+.simple-checkbox .checkbox {
+  text-align: left;
+  width: auto;
+  float: none;
+}
+input, textarea, .uneditable-input {
+  width: 500px;
+}
+
 @media (max-width: 979px) {
   body {
     padding-top: 0px;