Skip to content

E
edx-platform
Commit d45aecff by frances botsford
Options

Merge pull request #7646 from edx/frances/donate-notification-fix 

Dashboard donate and sidebar layout fix
parents 8db98203 73dd510f
Showing with 208 additions and 211 deletions
lms/static/sass/multicourse/_dashboard.scss
...@@ -1058,289 +1058,286 @@ ...@@ -1058,289 +1058,286 @@
// +Misc - Uncategorized // +Misc - Uncategorized
// ==================== // ====================
.dashboard .my-courses { // status - language
.status-language {
.icon {
@include font-size(17);
display: inline-block;
vertical-align: middle;
margin-right: ($baseline/4);
color: $black;
}
// status - language .title .icon {
.status-language { opacity: 0.75; // needed to overcome bad specificity elsewhere
}
}
.icon { // status - verification
@include font-size(17); .status-verification {
display: inline-block;
vertical-align: middle;
margin-right: ($baseline/4);
color: $black;
}
.title .icon { .status-title {
opacity: 0.75; // needed to overcome bad specificity elsewhere margin: 0 0 ($baseline/4) 26px;
}
} }
// status - verification .status-data {
.status-verification { margin: 0 0 ($baseline/2) 26px;
width: 80%;
}
.status-title { .status-data-message {
margin: 0 0 ($baseline/4) 26px; @extend %t-copy-sub1;
} @extend %t-weight4;
margin-bottom: ($baseline/2);
}
.status-data { .list-actions {
margin: 0 0 ($baseline/2) 26px; @extend %ui-no-list;
width: 80%;
}
.status-data-message { .action {
@extend %t-copy-sub1;
@extend %t-weight4; @extend %t-weight4;
margin-bottom: ($baseline/2); display: block;
@include font-size(14);
} }
}
.list-actions { .status-note {
@extend %ui-no-list; @extend %t-copy-sub2;
position: relative;
.action { margin-top: $baseline;
@extend %t-weight4; border-top: 1px solid $black-t0;
display: block; padding-top: ($baseline/2);
@include font-size(14);
}
}
.status-note { p {
@extend %t-copy-sub2; @extend %t-copy-sub2;
position: relative;
margin-top: $baseline;
border-top: 1px solid $black-t0;
padding-top: ($baseline/2);
p {
@extend %t-copy-sub2;
}
.deco-arrow {
@include triangle(($baseline/2), $m-gray-d3, up);
position: absolute;
left: 45%;
top: -($baseline/2);
}
} }
// CASE: is denied .deco-arrow {
&.is-denied { @include triangle(($baseline/2), $m-gray-d3, up);
position: absolute;
.status-data-message { left: 45%;
color: $error-color; top: -($baseline/2);
border-bottom-color: rgba($error-color, 0.25); }
} }
.status-note { // CASE: is denied
color: desaturate($error-color, 65%); &.is-denied {
border-top-color: rgba($error-color, 0.25);
}
.action-reverify { .status-data-message {
@extend %btn-primary-error; color: $error-color;
@extend %t-weight4; border-bottom-color: rgba($error-color, 0.25);
display: block; }
@include font-size(14);
}
.deco-arrow { .status-note {
@include triangle(($baseline/2), $error-color, up); color: desaturate($error-color, 65%);
} border-top-color: rgba($error-color, 0.25);
} }
// CASE: is accepted .action-reverify {
&.is-accepted { @extend %btn-primary-error;
@extend %t-weight4;
display: block;
@include font-size(14);
}
.status-data-message { .deco-arrow {
color: $verified-color-lvl1; @include triangle(($baseline/2), $error-color, up);
border-bottom-color: $verified-color-lvl4; }
} }
.status-note { // CASE: is accepted
color: $m-gray-l1; &.is-accepted {
border-top-color: $verified-color-lvl4;
}
.deco-arrow { .status-data-message {
@include triangle(($baseline/2), $verified-color-lvl4, up); color: $verified-color-lvl1;
} border-bottom-color: $verified-color-lvl4;
} }
// CASE: is pending .status-note {
&.is-pending { color: $m-gray-l1;
border-top-color: $verified-color-lvl4;
.status-data-message { }
color: $m-gray-d3;
border-bottom-color: $m-gray-l4;
}
.status-note { .deco-arrow {
color: $m-gray-l1; @include triangle(($baseline/2), $verified-color-lvl4, up);
border-top-color: $m-gray-d3;
}
} }
} }
// status - verification // CASE: is pending
.status--verification { &.is-pending {
.data { .status-data-message {
white-space: normal !important; color: $m-gray-d3;
text-overflow: no !important; border-bottom-color: $m-gray-l4;
overflow: visible !important;
}
.list--nav {
margin-left: 26px;
} }
// STATE: is denied .status-note {
&.is-denied { color: $m-gray-l1;
border-top-color: $m-gray-d3;
.data {
color: $error-color !important;
}
} }
} }
}
// status - verification
.status--verification {
// message .data {
.msg { white-space: normal !important;
margin: ($baseline/2) 0 ($baseline/2) 26px; text-overflow: no !important;
overflow: visible !important;
} }
.msg__title { .list--nav {
@extend %hd-lv5; margin-left: 26px;
color: $lighter-base-font-color;
} }
.msg__copy { // STATE: is denied
@extend %copy-metadata; &.is-denied {
color: $lighter-base-font-color;
p { .data {
@extend %t-copy; color: $error-color !important;
} }
} }
p.course-block{ }
border-style: solid;
border-color: #E3DC86; // message
padding: ($baseline/4); .msg {
border-width: 1px; margin: ($baseline/2) 0 ($baseline/2) 26px;
background: #FDFBE4; }
.msg__title {
@extend %hd-lv5;
color: $lighter-base-font-color;
}
.msg__copy {
@extend %copy-metadata;
color: $lighter-base-font-color;
p {
@extend %t-copy;
} }
.enter-course-blocked{ }
p.course-block{
border-style: solid;
border-color: #E3DC86;
padding: ($baseline/4);
border-width: 1px;
background: #FDFBE4;
@include box-sizing(border-box); }
@include float(left); .enter-course-blocked{
display: block;
@include box-sizing(border-box);
@include float(left);
display: block;
font: normal 15px/1.6rem $sans-serif;
letter-spacing: 0;
padding: 6px 32px 7px;
text-align: center;
margin-top: 16px;
opacity:0.5;
background:#808080;
border:0;
color:white;
box-shadow:none;
&.archived {
@include button(simple, $button-archive-color);
font: normal 15px/1.6rem $sans-serif; font: normal 15px/1.6rem $sans-serif;
letter-spacing: 0;
padding: 6px 32px 7px; padding: 6px 32px 7px;
text-align: center;
margin-top: 16px; &:hover, &:focus {
opacity:0.5; text-decoration: none;
background:#808080;
border:0;
color:white;
box-shadow:none;
&.archived {
@include button(simple, $button-archive-color);
font: normal 15px/1.6rem $sans-serif;
padding: 6px 32px 7px;
&:hover, &:focus {
text-decoration: none;
}
} }
} }
}
a.disable-look{ a.disable-look{
color: #808080; color: #808080;
} }
a.fade-cover{ a.fade-cover{
@extend .cover; @extend .cover;
opacity: 0.5; opacity: 0.5;
}
} }
// +Dashboard - Banner // +Dashboard - Banner
// ==================== // ====================
.dashboard .my-courses { .dashboard-banner {
.dashboard-banner {
&:empty { &:empty {
display: none; display: none;
} }
.wrapper-msg { .wrapper-msg {
padding-bottom: 0; padding-bottom: 0;
.msg { .msg {
@include clearfix(); @include clearfix();
font-family: $sans-serif; font-family: $sans-serif;
padding-bottom: $baseline; padding-bottom: $baseline;
border-bottom: thin solid $gray; border-bottom: thin solid $gray;
&.title { &.title {
@extend %t-title5; @extend %t-title5;
@extend %t-weight4; @extend %t-weight4;
font-family: $f-sans-serif; font-family: $f-sans-serif;
// Overriding Platform h2 styles
text-transform: none;
letter-spacing: 0;
}
&.has-actions {
// Overriding Platform h2 styles .donate-content {
text-transform: none; width: flex-grid(8, 12);
letter-spacing: 0;
} }
&.has-actions { .donate-actions {
width: flex-grid(4, 12);
vertical-align: bottom;
display: inline-block;
.donate-content { .monetary-symbol {
width: flex-grid(8, 12); vertical-align: middle;
color: $white;
font-weight: 600;
} }
.donate-actions { .amount {
width: flex-grid(4, 12); height: 40px;
vertical-align: bottom; width: 80px;
display: inline-block; vertical-align: middle;
text-align: left;
border: 2px solid $white;
.monetary-symbol { &.validation-error {
vertical-align: middle; border: 2px solid $error-color;
color: $white;
font-weight: 600;
}
.amount {
height: 40px;
width: 80px;
vertical-align: middle;
text-align: left;
border: 2px solid $white;
&.validation-error {
border: 2px solid $error-color;
}
} }
}
.action-donate { .action-donate {
@extend %btn-primary-blue; @extend %btn-primary-blue;
vertical-align: middle; vertical-align: middle;
padding-top: ($baseline/2); padding-top: ($baseline/2);
padding-bottom: ($baseline/2); padding-bottom: ($baseline/2);
text-shadow: none; text-shadow: none;
text-transform: none; text-transform: none;
letter-spacing: 0; letter-spacing: 0;
color: $white; color: $white;
font-weight: 600; font-weight: 600;
} }
.donation-error-msg { .donation-error-msg {
padding: ($baseline/2) 0; padding: ($baseline/2) 0;
}
} }
} }
} }
} }
} }
} }
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