summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-02-16 11:10:02 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-02-16 11:10:02 +0100
commit5d8ce5f4775ac8bc5f523964e6e36f63ff3c4683 (patch)
tree49ed889b1d10cda98c475f3453abff1b97afb4e7 /app/assets/stylesheets
parentc9066760fd1f5f2f892ce2be5cf2a83bb5210246 (diff)
parent55784bcffc0678ce6102c0b81447434a8030ebd2 (diff)
Merge branch 'develop'5.1-beta5
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/gemeinschaft-generic.css.scss21
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;