From affebc2ca1f47179e4d9b5259615f579a92199c8 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Sat, 2 May 2015 08:29:43 +0930
Subject: [PATCH] Skin colour tweaks

---
 .../core/js/lib/utils/string-to-color.js      |  2 +-
 framework/core/less/forum/hero.less           | 26 +++++++++----------
 framework/core/less/forum/index.less          |  3 ++-
 framework/core/less/forum/user.less           |  2 +-
 framework/core/less/lib/config.less           |  6 ++---
 framework/core/less/lib/variables.less        | 12 +++++----
 6 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/framework/core/js/lib/utils/string-to-color.js b/framework/core/js/lib/utils/string-to-color.js
index 691b8099f..b2e1cdf69 100644
--- a/framework/core/js/lib/utils/string-to-color.js
+++ b/framework/core/js/lib/utils/string-to-color.js
@@ -29,6 +29,6 @@ export default function stringToColor(string) {
     num += string.charCodeAt(i);
   }
   var hue = num % 360;
-  var rgb = hsvToRgb(hue / 360, 0.4, 0.9);
+  var rgb = hsvToRgb(hue / 360, 0.3, 0.9);
   return ''+rgb.r.toString(16)+rgb.g.toString(16)+rgb.b.toString(16);
 };
diff --git a/framework/core/less/forum/hero.less b/framework/core/less/forum/hero.less
index ea402b18b..5a3e320a4 100644
--- a/framework/core/less/forum/hero.less
+++ b/framework/core/less/forum/hero.less
@@ -4,26 +4,24 @@
   text-align: center;
   padding: 20px 0;
 
-  &, & a, & .close {
+  &, & a {
     color: @fl-body-hero-color;
   }
+  & .close {
+    float: right;
+    margin-top: -10px;
+    color: @fl-body-hero-muted-color;
+  }
   & h2 {
     margin: 0;
     font-size: 16px;
     font-weight: normal;
     line-height: 1.5em;
   }
-}
-.welcome-hero {
-  & a, & .close {
-    opacity: 0.5;
-  }
-  & .close {
-    float: right;
-    margin-top: -10px;
-  }
-  & p {
-    margin: 5px 0 0;
+  & .subtitle {
+    margin: 8px 0 0;
+    line-height: 1.5em;
+    color: @fl-body-hero-muted-color;
   }
 }
 @media @phone {
@@ -35,8 +33,8 @@
 }
 @media @tablet, @desktop, @desktop-hd {
   .hero {
-    padding: 30px 0;
-    font-size: 14px;
+    padding: 40px 0 30px;
+    font-size: 15px;
 
     & h2 {
       font-size: 22px;
diff --git a/framework/core/less/forum/index.less b/framework/core/less/forum/index.less
index 0aaad20b3..f014bbd64 100644
--- a/framework/core/less/forum/index.less
+++ b/framework/core/less/forum/index.less
@@ -176,7 +176,7 @@
   }
   & .author {
     float: left;
-    margin-top: 18px;
+    margin-top: 19px;
   }
   & .badges {
     float: left;
@@ -200,6 +200,7 @@
   & .title {
     margin: 0 0 5px;
     line-height: 1.3;
+    color: @fl-secondary-color;
   }
   &.unread .title {
     color: @fl-body-heading-color;
diff --git a/framework/core/less/forum/user.less b/framework/core/less/forum/user.less
index 5a0cab0f2..3a42fe4e2 100644
--- a/framework/core/less/forum/user.less
+++ b/framework/core/less/forum/user.less
@@ -59,7 +59,7 @@
   }
   & .avatar {
     .avatar-size(96px);
-    border: 4px solid #fff;
+    border: 4px solid @fl-body-bg;
     .box-shadow(0 2px 6px @fl-shadow-color);
   }
   & .badges {
diff --git a/framework/core/less/lib/config.less b/framework/core/less/lib/config.less
index 7eb9efa37..e80bbd00e 100644
--- a/framework/core/less/lib/config.less
+++ b/framework/core/less/lib/config.less
@@ -2,10 +2,10 @@
 // CONFIG
 
 // Color palette:
-// #AB2C2C #E7562E #E99700 #E7D81D #92D32F #55A835 #3388A7 #355B8E #7F45A9 #A0346E #797979
+// #8F3B3B #9E5541 #99793F #8F8A49 #778F53 #638F53 #537F8F #536F90 #76538F #8F5373 #797979
 
-@fl-primary-color:                  #355B8E;
-@fl-secondary-color:                #355B8E;
+@fl-primary-color:                  #536F90;
+@fl-secondary-color:                #536F90;
 
 @fl-dark-mode:                      false;
 @fl-colored-hdr:                    false;
diff --git a/framework/core/less/lib/variables.less b/framework/core/less/lib/variables.less
index 14b671c92..d8df67906 100644
--- a/framework/core/less/lib/variables.less
+++ b/framework/core/less/lib/variables.less
@@ -23,12 +23,12 @@
 }
 .define-body-variables(true) {
   @fl-body-primary-color:             mix(@fl-primary-color, #000);
-  @fl-body-secondary-color:           hsl(@fl-secondary-hue, min(30%, @fl-secondary-sat), 13%);
+  @fl-body-secondary-color:           hsl(@fl-secondary-hue, min(20%, @fl-secondary-sat), 13%);
 
-  @fl-body-bg:                        hsl(@fl-secondary-hue, min(30%, @fl-secondary-sat), 10%);
+  @fl-body-bg:                        hsl(@fl-secondary-hue, min(20%, @fl-secondary-sat), 10%);
   @fl-body-color:                     #ccc;
-  @fl-body-muted-color:               hsl(@fl-secondary-hue, min(30%, @fl-secondary-sat), 35%);
-  @fl-body-muted-more-color:          hsl(@fl-secondary-hue, min(20%, @fl-secondary-sat), 25%);
+  @fl-body-muted-color:               hsl(@fl-secondary-hue, min(20%, @fl-secondary-sat), 35%);
+  @fl-body-muted-more-color:          hsl(@fl-secondary-hue, min(10%, @fl-secondary-sat), 25%);
   @fl-shadow-color:                   rgba(0, 0, 0, 0.5);
 }
 @fl-body-heading-color:             @fl-body-color;
@@ -57,6 +57,7 @@
 
   @fl-body-hero-bg:             @fl-body-primary-color;
   @fl-body-hero-color:          #fff;
+  @fl-body-hero-muted-color:    rgba(255, 255, 255, 0.6);
 }
 .define-hdr-variables(true) {
   @fl-hdr-bg:                   @fl-drawer-bg;
@@ -66,7 +67,8 @@
   @fl-hdr-control-color:        @fl-drawer-control-color;
 
   @fl-body-hero-bg:             @fl-body-control-bg;
-  @fl-body-hero-color:          @fl-body-control-color;
+  @fl-body-hero-color:          @fl-body-primary-color;
+  @fl-body-hero-muted-color:    @fl-body-control-color;
 }
 
 // ---------------------------------