From a129fd4a27bd2927e8d8a662c5aeec4e5a65387b Mon Sep 17 00:00:00 2001 From: marco Date: Wed, 16 Jul 2014 18:07:39 -0400 Subject: [PATCH] adjusted styling of dashboard profile area to remove heavier gradients and other small cleanups --- lms/static/sass/multicourse/_dashboard.scss | 68 ++++++------------- lms/templates/dashboard.html | 6 +- .../dashboard/_dashboard_info_language.html | 1 - 3 files changed, 25 insertions(+), 50 deletions(-) diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss index 28ecfa04be..a883f244cd 100644 --- a/lms/static/sass/multicourse/_dashboard.scss +++ b/lms/static/sass/multicourse/_dashboard.scss @@ -3,7 +3,7 @@ .dashboard { @include clearfix; - padding: 60px 0 0 0; + padding: ($baseline*2) 0 0 0; .dashboard-banner { background: $yellow; @@ -27,46 +27,44 @@ } .profile-sidebar { - background: transparent; float: left; margin-right: flex-gutter(); width: flex-grid(3); + background: transparent; + box-shadow: 0 0 1px $shadow-l1; header.profile { - @include background-image($dashboard-profile-header-image); - background-color: $dashboard-profile-header-color; - border: 1px solid $border-color-2; - border-radius: 4px; @include box-sizing(border-box); + border: 1px solid $border-color-2; + border-radius: ($baseline/4) ($baseline/4) 0 0; width: flex-grid(12); + background: $dashboard-profile-color; h1.user-name { - color: $base-font-color; - font: 700 1.2em/1.2em $sans-serif; - margin: 0px; overflow: hidden; - padding: 15px 10px 17px; + margin: 0px; + padding: ($baseline*.75) ($baseline/2); + color: $base-font-color; + text-transform: none; text-wrap: nowrap; text-overflow: ellipsis; - text-transform: none; + font: 700 1.2em/1.2em $sans-serif; } } .user-info { @include clearfix; - padding: 0px 10px; > ul { - background: $dashboard-profile-color; - border: 1px solid $border-color-2; - border-top: none; - //@include border-bottom-radius(4px); @include box-sizing(border-box); - box-shadow: inset 0 0 3px 0 rgba(0,0,0, 0.15); @include clearfix; margin: 0px; - padding: 20px 10px 10px; + border: 1px solid $border-color-2; + border-top: none; + border-radius: 0 0 ($baseline/4) ($baseline/4); + padding: $baseline; width: flex-grid(12); + background: $white; li { @include clearfix; @@ -92,41 +90,19 @@ } span.title { - color: $lighter-base-font-color; + color: $gray; font-family: $sans-serif; font-size: 13px; + text-transform: uppercase; - .icon { - background-size: cover; - float: left; - height: 19px; - margin: 0 6px 0 0; - opacity: 0.6; - @include transition(all 0.15s linear 0s); - width: 19px; - - &.email-icon { - @include background-image(url('../images/portal-icons/email-icon.png')); - } - - &.name-icon { - @include background-image(url('../images/portal-icons/course-info-icon.png')); - } - - &.location-icon { - @include background-image(url('../images/portal-icons/home-icon.png')); - } - - &.language-icon { - @include background-image(url('../images/portal-icons/language-icon.png')); - } + a { + text-transform: none; } } span.data { - color: $lighter-base-font-color; - font-weight: 700; - margin-left: 26px; + color: $base-font-color; + font-weight: 600; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index 0d7feface4..e03cda79ee 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -209,10 +209,10 @@