Commit d6e89e7b by Harry Rein Committed by GitHub

Merge pull request #15956 from edx/HarryRein/LEARNER-2485-profile-issues

LEARNER-2485: Fix styling issues on learner profile.
parents f1c574cf d0bc499f
...@@ -325,8 +325,8 @@ ...@@ -325,8 +325,8 @@
margin: 0 $baseline/2; margin: 0 $baseline/2;
.social-links { .social-links {
@include padding($baseline/4, 0, 0, $baseline/4);
font-size: 2rem; font-size: 2rem;
padding-top: $baseline/4;
& > span { & > span {
color: $gray-l4; color: $gray-l4;
...@@ -348,33 +348,34 @@ ...@@ -348,33 +348,34 @@
} }
.u-field { .u-field {
@extend %t-weight4; font-weight: $font-semibold;
@include padding(0, 0, 0, 3px); @include padding(0, 0, 0, 3px);
color: $base-font-color; color: $base-font-color;
margin-top: $baseline/5; margin-top: $baseline/5;
.u-field-value, .u-field-title { .u-field-value, .u-field-title {
@extend %t-weight4; font-weight: 500;
width: calc(100% - 40px); width: calc(100% - 40px);
color: $lightest-base-font-color;
} }
.u-field-value-readonly { .u-field-value-readonly {
@extend %t-weight3;
font-family: $sans-serif; font-family: $sans-serif;
color: $darkest-base-font-color; color: $darkest-base-font-color;
} }
.u-field-title {
color: $lightest-base-font-color;
display: block;
}
&.u-field-dropdown { &.u-field-dropdown {
position: relative; position: relative;
&:not(.editable-never) { &:not(.editable-never) {
cursor: pointer; cursor: pointer;
} }
}
&:not(.u-field-readonly) {
&.u-field-value {
@extend %t-weight3;
}
&:not(:last-child) { &:not(:last-child) {
padding-bottom: $baseline/4; padding-bottom: $baseline/4;
......
...@@ -118,6 +118,9 @@ ...@@ -118,6 +118,9 @@
fieldView.delegateEvents(); fieldView.delegateEvents();
} }
// Clear existing content in user profile card
this.$('.profile-section-one-fields').html('');
// Do not show name when in limited mode or no name has been set // Do not show name when in limited mode or no name has been set
if (this.showFullProfile() && this.options.accountSettingsModel.get('name')) { if (this.showFullProfile() && this.options.accountSettingsModel.get('name')) {
this.$('.profile-section-one-fields').append(this.options.nameFieldView.render().el); this.$('.profile-section-one-fields').append(this.options.nameFieldView.render().el);
......
...@@ -53,11 +53,10 @@ from openedx.core.djangolib.markup import HTML ...@@ -53,11 +53,10 @@ from openedx.core.djangolib.markup import HTML
</div> </div>
</div> </div>
<div class="wrapper-profile-section-container-two is-hidden"> <div class="wrapper-profile-section-container-two is-hidden">
<div class="wrapper-profile-bio"></div>
% if achievements_fragment: % if achievements_fragment:
${HTML(achievements_fragment.body_html())} ${HTML(achievements_fragment.body_html())}
% endif % endif
<div class="wrapper-profile-bio">
</div>
</div> </div>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment