From 92fe4118dfb8a34a3a173b3cd7bf437b0aaff9b4 Mon Sep 17 00:00:00 2001
From: awesomerobot <awesomerobot@gmail.com>
Date: Sun, 19 Jun 2016 14:43:17 -0400
Subject: [PATCH] updating user profile to match theme/usercard

---
 app/assets/stylesheets/common/base/user.scss |  1 +
 app/assets/stylesheets/desktop/user.scss     | 34 ++++++++++----------
 app/assets/stylesheets/mobile/user.scss      | 11 +++----
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 2e1f31b7446..c4b6fad8369 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -174,6 +174,7 @@
 
 .user-nav {
   margin: 5px 0px;
+  padding-top: 10px;
   .fa {
     margin-right: 5px;
   }
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index 20422beaf5e..83ef8b0a410 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -13,12 +13,10 @@
   transition: height .15s linear;
 }
 
-
 .no-background {
   .profile-image {
     height: 200px;
   }
-
 }
 
 .user-preferences {
@@ -31,8 +29,6 @@
     height: 100px;
   }
 
-  input
-
   input[type=text] {
     @include small-width {
       width: 450px;
@@ -260,7 +256,9 @@
     }
 
   .secondary {
-    background: dark-light-diff($primary, $secondary, 90%, -65%);
+    background: scale-color($secondary, $lightness: -5%);
+    border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
     font-size: 0.929em;
       .btn { padding: 3px 12px; }
 
@@ -303,9 +301,9 @@
     }
 
     .details {
-      padding: 15px 15px 4px 15px;
+      padding: 0 0 4px 0;
+      background: rgba($secondary, .85);
       margin-top: -200px;
-      background: dark-light-choose(rgba($primary, .85), rgba($secondary, .85));
       transition: margin .15s linear;
 
       blockquote {
@@ -357,20 +355,17 @@
         width: 100%;
         position: relative;
         float: left;
-        color: dark-light-choose($secondary, lighten($primary, 10%));
 
         h1 {font-weight: bold;}
 
         .primary-textual {
           padding: 3px;
           a[href] {
-            color: dark-light-choose($secondary, lighten($primary, 10%));
-
+            text-decoration: underline;
           }
         }
 
         .bio {
-          color: dark-light-choose($secondary, lighten($primary, 10%));
           max-height: 300px;
           overflow: auto;
           max-width: 750px;
@@ -390,6 +385,9 @@
         }
       }
     }
+        &.has-background {
+          .details { padding: 15px 15px 4px 15px;}
+        }
 
     .controls {
       padding: 0 0 12px 0;
@@ -435,9 +433,10 @@
     }
 
     .details {
-      padding: 12px 15px 2px 15px;
+      padding: 0 0 2px 0;
       margin-top: 0;
-      background: dark-light-choose(rgba($primary, 1), scale-color($secondary, $lightness: 15%));
+      background: rgba($secondary, .85);
+      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
       .bio { display: none; }
 
       .primary {
@@ -466,8 +465,12 @@
         }
       }
     }
-  }
 
+    &.has-background {
+      .details {  padding: 12px 15px 2px 15px;}
+    }
+
+  }
 
   .user-stream {
     .excerpt {
@@ -708,6 +711,3 @@
     padding-left: 15px;
   }
 }
-
-
-
diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss
index af661e37d10..eb6b56b064b 100644
--- a/app/assets/stylesheets/mobile/user.scss
+++ b/app/assets/stylesheets/mobile/user.scss
@@ -243,8 +243,7 @@
 
     .details {
       padding: 15px 10px 4px 10px;
-      background-color: dark-light-choose(rgba($primary, .9), rgba($secondary, .9));
-      opacity: 0.8;
+      background: rgba($secondary, .85);
 
       blockquote {
         background-color: dark-light-diff($secondary, $primary, 30%, -70%);
@@ -293,7 +292,7 @@
         width: 100%;
         position: relative;
         float: left;
-        color: dark-light-choose(scale-color($secondary, $lightness: 75%), blend-primary-secondary(90%));
+        color: $primary;
 
         h1 {font-weight: bold;}
 
@@ -301,12 +300,12 @@
           float: left;
           padding-left: 15px;
           a[href] {
-            color: dark-light-diff($secondary, $primary, 75%, -10%);
+            color: $primary;
           }
         }
 
         .bio {
-          color: dark-light-diff($secondary, $primary, 75%, 0%);
+          color: $primary;
           max-height: 300px;
           overflow: auto;
           max-width: 700px;
@@ -356,7 +355,7 @@
     .details {
       padding: 12px 15px 2px 15px;
       margin-top: 0;
-      background: dark-light-choose(rgba($primary, 1), blend-primary-secondary(5%));
+      background: rgba($secondary, .85);
       .bio { display: none; }
 
       .primary {