From 113cab87b866b24acf4edd84d2ca4bbac8443179 Mon Sep 17 00:00:00 2001 From: Frances Botsford Date: Tue, 13 Oct 2015 14:01:16 -0400 Subject: [PATCH] profile page style cleanup remove link style, add pointer, adjust spacing on profile --- lms/static/sass/shared/_fields.scss | 2 + lms/static/sass/views/_learner-profile.scss | 59 ++++++++++++++++----- 2 files changed, 47 insertions(+), 14 deletions(-) diff --git a/lms/static/sass/shared/_fields.scss b/lms/static/sass/shared/_fields.scss index b2b365fb49..921f45eaf0 100644 --- a/lms/static/sass/shared/_fields.scss +++ b/lms/static/sass/shared/_fields.scss @@ -133,6 +133,8 @@ padding: 0; box-shadow: none; font-size: inherit; + font-weight: inherit; + text-shadow: none; } diff --git a/lms/static/sass/views/_learner-profile.scss b/lms/static/sass/views/_learner-profile.scss index 7c56d30d08..92c91b1342 100644 --- a/lms/static/sass/views/_learner-profile.scss +++ b/lms/static/sass/views/_learner-profile.scss @@ -9,6 +9,7 @@ .view-profile { $profile-image-dimension: 120px; + .window-wrap, .content-wrapper { background-color: $white; } @@ -34,6 +35,7 @@ .u-field-image { padding-top: 0; + padding-bottom: ($baseline/4); } .image-wrapper { @@ -128,10 +130,11 @@ .wrapper-profile-field-account-privacy { @include clearfix(); @include box-sizing(border-box); - margin: 0 auto 0; - padding: ($baseline*0.75) 0; width: 100%; - background-color: $gray-l3; + margin: 0 auto 0; + border: 1px solid $gray-l3; + background-color: $gray-l4; + padding: ($baseline*0.75) 0; .u-field-account_privacy { @extend .container; @@ -141,10 +144,11 @@ } .u-field-title { + @extend %t-strong; width: auto; color: $base-font-color; - font-weight: $font-bold; cursor: text; + text-shadow: none; // override bad lms styles on labels } .u-field-value { @@ -157,6 +161,10 @@ width: 100%; padding: 0; color: $base-font-color; + + .u-field-message-notification { + color: $gray-d2; + } } } } @@ -170,22 +178,22 @@ width: 100%; display: inline-block; margin-top: ($baseline*1.5); + @include margin-left($baseline/2); } .profile-section-one-fields { @include float(left); width: flex-grid(4, 12); - @include margin-left($baseline*1.5); + @include margin-left($baseline); .u-field { margin-bottom: ($baseline/4); - padding-top: 0; - padding-bottom: 0; + padding-top: 3px; + padding-bottom: 3px; @include padding-left(3px); } .u-field-username { - margin-bottom: ($baseline/2); input[type="text"] { font-weight: 600; @@ -197,12 +205,19 @@ } } + .u-field-icon { + display: inline-block; + vertical-align: baseline; + } + .u-field-title { width: 0; } .u-field-value { width: 200px; + display: inline-block; + vertical-align: baseline; } select { @@ -212,7 +227,13 @@ .u-field-message { @include float(right); width: 20px; - margin-top: 2px; + display: inline-block; + vertical-align: baseline; + margin-top: 0; + + .icon { + vertical-align: baseline; + } } } @@ -224,30 +245,40 @@ .u-field-textarea { margin-bottom: ($baseline/2); - padding: ($baseline/4) ($baseline/2) ($baseline/2); + padding: ($baseline/2) ($baseline*.75) ($baseline*.75) ($baseline*.75); + + &.editable-toggle { + cursor: pointer; + } } .u-field-title { - font-size: 1.1em; + @extend %t-title5; @extend %t-weight4; + display: inline-block; + margin-top: 0; margin-bottom: ($baseline/4); + color: inherit; } .u-field-value { + @extend %t-copy-base; width: 100%; - white-space: pre-line; - line-height: 1.5em; textarea { width: 100%; background-color: transparent; + white-space: pre-line; + } + + a { + color: inherit; } } .u-field-message { @include float(right); width: auto; - padding-top: ($baseline/4); } .u-field.mode-placeholder {