From 24011b773b14479153f6f4b97c7b0dc652fc6326 Mon Sep 17 00:00:00 2001
From: diminator <dimi.dejonghe@gmail.com>
Date: Tue, 13 Oct 2015 11:39:42 +0200
Subject: [PATCH] merge header - form error

---
 js/components/header.js        |  5 ++++-
 sass/ascribe_custom_style.scss | 16 +++++++++++++++-
 sass/ascribe_property.scss     | 10 ++++++----
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/js/components/header.js b/js/components/header.js
index 0c40130d..1fb96c6f 100644
--- a/js/components/header.js
+++ b/js/components/header.js
@@ -73,7 +73,10 @@ let Header = React.createClass({
         else{
             setTitle('ascribe');
         }
-        if (whitelabel.subdomain !== 'www'){
+
+        if (whitelabel.subdomain &&
+            whitelabel.subdomain !== 'www'
+            && whitelabel.logo){
             return (<img className="img-brand" src={whitelabel.logo}/>);
         }
         return (
diff --git a/sass/ascribe_custom_style.scss b/sass/ascribe_custom_style.scss
index e9f730dd..b429f7ff 100644
--- a/sass/ascribe_custom_style.scss
+++ b/sass/ascribe_custom_style.scss
@@ -5,6 +5,8 @@ $ascribe-light-blue: #D3DEE4;
 $ascribe-white: #F8F8F8;
 $ascribe-pink: #D10074;
 $ascribe-blue-border: rgba(0, 60, 105, 0.1);
+$ascribe-red-error: rgb(169, 68, 66);
+
 
 $ascribe--fg-color: $ascribe-dark-blue;
 $ascribe--bg-color: $ascribe-dark-blue;
@@ -542,6 +544,18 @@ fieldset[disabled] .btn-secondary.active {
     border-left-color: $ascribe--button-default-color !important;
     background-color: rgba($ascribe--button-default-color, .05);
 }
+
+.is-error {
+    > div {
+        > span {
+            color: rgba($ascribe-red-error, 1) !important;
+        }
+    }
+    &:hover {
+        border-left: 3px solid rgba(169, 68, 66, .5)!important;
+    }
+}
+
 .ascribe-property-wrapper:hover {
     //border-left-color: rgba($ascribe--button-default-color, .5);
     border-left-color: rgba($ascribe-blue, .5);
@@ -568,7 +582,7 @@ fieldset[disabled] .btn-secondary.active {
         }
     }
     > span:not(.glyphicon) {
-        color: $ascribe-pink;
+        color: $ascribe--button-default-color;
         //font-weight: normal !important;
     }
 
diff --git a/sass/ascribe_property.scss b/sass/ascribe_property.scss
index dd28f901..e938a7c3 100644
--- a/sass/ascribe_property.scss
+++ b/sass/ascribe_property.scss
@@ -1,3 +1,5 @@
+$ascribe-red-error: rgb(169, 68, 66);
+
 .ascribe-property-wrapper {
     background-color: white;
     border-left: 3px solid rgba(0, 0, 0, 0);
@@ -24,12 +26,12 @@
 }
 
 .is-error {
-    background-color: rgba(169, 68, 66, .05);
-    border-left: 3px solid rgba(169, 68, 66, 1);
+    background-color: rgba($ascribe-red-error, .03);
+    border-left: 3px solid rgba($ascribe-red-error, 1);
 
     > div {
         > span {
-            color: rgba(169, 68, 66, 1);
+            color: rgba($ascribe-red-error, 1);
             font-size: .9em;
             margin-right: 1em;
         }
@@ -41,7 +43,7 @@
     }
 
     &:hover {
-      border-left: 3px solid rgba(169, 68, 66, 1);
+      border-left: 3px solid rgba($ascribe-red-error, 1);
     }
 }