From f7b024eafe1c950232d7d9067dd97093c160d2a6 Mon Sep 17 00:00:00 2001 From: Kane York Date: Tue, 18 Aug 2015 21:35:25 -0700 Subject: [PATCH] FIX: User profiles Note on removing the color: $secondary - I did a test with browser inspector by turning the text pink. The only text affected was 'helpful flags', which I fixed below. --- app/assets/stylesheets/desktop/user.scss | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss index 027beaa530a..2f5af264d6d 100644 --- a/app/assets/stylesheets/desktop/user.scss +++ b/app/assets/stylesheets/desktop/user.scss @@ -214,7 +214,6 @@ width: 100%; margin-bottom: 10px; overflow: hidden; - color: $secondary; &.group { .details { @@ -269,7 +268,7 @@ .details { padding: 15px 15px 4px 15px; margin-top: -200px; - background: rgba($primary, .85); + background: dark-light-choose(rgba($primary, .85), rgba($secondary, .85)); transition: margin .15s linear; h1 { @@ -316,20 +315,20 @@ width: 100%; position: relative; float: left; - color: $secondary; + color: dark-light-choose($secondary, lighten($primary, 10%)); h1 {font-weight: bold;} .primary-textual { padding: 3px; a[href] { - color: $secondary; + color: dark-light-choose($secondary, lighten($primary, 10%)); } } .bio { - color: $secondary; + color: dark-light-choose($secondary, lighten($primary, 10%)); max-height: 300px; overflow: auto; max-width: 750px; @@ -396,7 +395,7 @@ .details { padding: 12px 15px 2px 15px; margin-top: 0; - background: rgba($primary, 1); + background: dark-light-choose(rgba($primary, 1), scale-color($secondary, $lightness: 40%)); .bio { display: none; } .primary { @@ -533,21 +532,21 @@ .staff-counters { text-align: left; background: $primary; + color: $secondary; + a { + color: $secondary; + } > div { margin: 0 10px 0 0; display: inline-block; padding: 5px 0; &:first-of-type { padding-left: 10px; - } + } span { padding: 1px 5px; border-radius: 10px; - } - - } - a { - color: $secondary; + } } .active { font-weight: bold;