From 328a515dbe2275eecf5bda3cb3d5f88f9c690584 Mon Sep 17 00:00:00 2001
From: Faldrian <faldrian@och-noe.de>
Date: Sun, 16 Nov 2014 18:19:32 +0100
Subject: [PATCH] fixed margins and fonts in headerbar. fixed bootstrap2
 placeholder error

---
 app/assets/stylesheets/application.css.scss   |  4 ++++
 app/assets/stylesheets/bootstrap-fix.css.scss | 11 +++++++++++
 app/assets/stylesheets/header.css.scss        |  3 ++-
 app/assets/stylesheets/new-templates.css.scss |  2 ++
 4 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/stylesheets/bootstrap-fix.css.scss

diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index 1d2a9b255..9d9253f6b 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -66,6 +66,10 @@ body {
   };
 }
 
+header {
+  line-height: 20px;
+}
+
 a {
   color: $blue;
   text: {
diff --git a/app/assets/stylesheets/bootstrap-fix.css.scss b/app/assets/stylesheets/bootstrap-fix.css.scss
new file mode 100644
index 000000000..468c84d3f
--- /dev/null
+++ b/app/assets/stylesheets/bootstrap-fix.css.scss
@@ -0,0 +1,11 @@
+// A temporary fix for broken classes in bootstrap 2.
+// Can probably be removed when migration of bootstrap 3 is done.
+
+input::-moz-placeholder,
+textarea::-moz-placeholder {
+  color: #999999;
+}
+input::-ms-input-placeholder,
+textarea::-ms-input-placeholder {
+  color: #999999;
+}
diff --git a/app/assets/stylesheets/header.css.scss b/app/assets/stylesheets/header.css.scss
index 6c5ab9025..909200c32 100644
--- a/app/assets/stylesheets/header.css.scss
+++ b/app/assets/stylesheets/header.css.scss
@@ -233,6 +233,7 @@ body > header {
         border: 1px solid #222;
         font-size: 13px;
         padding: 4px;
+        margin-top: 1px;
 
         &:hover { background-color: #555; }
 
@@ -345,7 +346,7 @@ body > header {
     float: left;
     height: 100%;
     margin-right: 5px;
-    margin-top: 3px;
+    margin-top: 2px;
 
     a {
       padding: 0 10px;
diff --git a/app/assets/stylesheets/new-templates.css.scss b/app/assets/stylesheets/new-templates.css.scss
index 2b11270c9..06752bfc8 100644
--- a/app/assets/stylesheets/new-templates.css.scss
+++ b/app/assets/stylesheets/new-templates.css.scss
@@ -1,3 +1,5 @@
+@import 'bootstrap-fix';
+
 @import 'perfect-scrollbar';
 
 @import "colors";