From 3434ac83dd1b723d82d76d23fb8a86a76fff6cf2 Mon Sep 17 00:00:00 2001
From: jlukic <jacklukic@gmail.com>
Date: Thu, 28 Aug 2014 18:14:09 -0400
Subject: [PATCH] Continued work on sidebar fixes, menu some other stuff

---
 server/documents/views/card.html.eco               | 14 ++++++++------
 src/definitions/modules/sidebar.less               |  1 +
 src/definitions/views/card.less                    | 12 ++++++++++--
 src/themes/packages/basic/views/card.variables     |  4 ++++
 src/themes/packages/default/views/card.variables   |  4 ++++
 .../packages/github/collections/menu.variables     |  2 +-
 6 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/server/documents/views/card.html.eco b/server/documents/views/card.html.eco
index 630948b24..de2d7a6ef 100644
--- a/server/documents/views/card.html.eco
+++ b/server/documents/views/card.html.eco
@@ -34,20 +34,22 @@ themes      : ['Default', 'Basic']
     <p>A single card.</p>
     <div class="ui card">
       <div class="image">
-        <img src="/images/demo/highres.jpg">
+        <img src="/images/avatar/large/stevie.jpg">
       </div>
       <div class="content">
-        <div class="header">Cute Dog</div>
+        <a class="header">Stevie Feliciano</a>
         <div class="meta">
-          <span class="date">5 days ago</span>
+          <span class="date">Joined in 2014</span>
         </div>
         <div class="description">
-          This dog has some things going for it. Its pretty cute and looks like it'd be fun to cuddle up with.
+          Stevie Feliciano lives in New York City. She spends her time reading, running, and writing and likes the park.
         </div>
       </div>
       <div class="extra content">
-        <i class="like icon"></i>
-        22 Likes
+        <a>
+          <i class="user icon"></i>
+          22 Friends
+        </a>
       </div>
     </div>
   </div>
diff --git a/src/definitions/modules/sidebar.less b/src/definitions/modules/sidebar.less
index 8b4bc3969..efc0f9769 100755
--- a/src/definitions/modules/sidebar.less
+++ b/src/definitions/modules/sidebar.less
@@ -37,6 +37,7 @@
   border-radius: 0em !important;
   margin: 0 !important;
   will-change: transform;
+  overflow: auto !important;
 }
 
 /*--------------
diff --git a/src/definitions/views/card.less b/src/definitions/views/card.less
index 8d6a97334..8aa16f35c 100644
--- a/src/definitions/views/card.less
+++ b/src/definitions/views/card.less
@@ -331,8 +331,8 @@
   Extra Content
 -----------------*/
 
-.ui.cards > .card .extra,
-.ui.card .extra {
+.ui.cards > .card > .extra,
+.ui.card > .extra {
   min-height: 0px !important;
   position: @extraPosition;
   background: @extraBackground;
@@ -345,6 +345,14 @@
   transition: @extraTransition;
   border-top: @extraDivider;
 }
+.ui.cards > .card > .extra a,
+.ui.card > .extra a {
+  color: @extraLinkColor;
+}
+.ui.cards > .card > .extra a:hover,
+.ui.card > .extra a:hover {
+  color: @extraLinkHoverColor;
+}
 
 
 /*******************************
diff --git a/src/themes/packages/basic/views/card.variables b/src/themes/packages/basic/views/card.variables
index beef0f672..2b01dff2a 100644
--- a/src/themes/packages/basic/views/card.variables
+++ b/src/themes/packages/basic/views/card.variables
@@ -18,7 +18,11 @@
 @extraBoxShadow: none;
 @extraPadding: 0.5em 0em;
 
+@extraLinkColor: @linkColor;
+@extraLinkHoverColor: @linkColor;
+
 @headerFontSize: 1.2em;
+@headerLinkColor: @linkColor;
 
 @imageBorderRadius: @borderRadius;
 @imageBorder: 1px solid @borderColor;
diff --git a/src/themes/packages/default/views/card.variables b/src/themes/packages/default/views/card.variables
index 884a3eeaf..485f2a246 100644
--- a/src/themes/packages/default/views/card.variables
+++ b/src/themes/packages/default/views/card.variables
@@ -111,6 +111,10 @@
 @extraColor: @lightTextColor;
 @extraTransition: color @transitionDuration @transitionEasing;
 
+/* Extra Links */
+@extraLinkColor: @unselectedTextColor;
+@extraLinkHoverColor: @linkHoverColor;
+
 /*-------------------
       Variations
 --------------------*/
diff --git a/src/themes/packages/github/collections/menu.variables b/src/themes/packages/github/collections/menu.variables
index 14904f740..d5e3e2a37 100644
--- a/src/themes/packages/github/collections/menu.variables
+++ b/src/themes/packages/github/collections/menu.variables
@@ -58,7 +58,7 @@
 @verticalBackground: #FFFFFF;
 @verticalItemBackground: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.02));
 
-@invertedBackground: @black linear-gradient(rgba(255, 255, 255, 0.15), rgba(0, 0, 0, 0.15));
+@invertedBackground: @black linear-gradient(rgba(255, 255, 255, 0.05), rgba(0, 0, 0, 0.0));
 @invertedBoxShadow             :
   0px 1px 2px 0px rgba(0, 0, 0, 0.15),
   0px 0px 0px 1px rgba(255, 255, 255, 0.15)