From 7119357a0737e9368162375fb00d2b366149cd78 Mon Sep 17 00:00:00 2001 From: Andy Armstrong Date: Tue, 2 Aug 2016 15:48:23 -0400 Subject: [PATCH] Address code review feedback --- cms/static/sass/programs/_components.scss | 2 +- cms/static/sass/programs/_modals.scss | 9 +++++---- lms/static/certificates/sass/_components.scss | 10 +++++----- lms/static/certificates/sass/_config.scss | 2 +- .../sass/discussion/utilities/_variables-v2.scss | 2 +- lms/static/sass/elements/_banners.scss | 4 ++-- lms/static/sass/elements/_course-card.scss | 12 ++++++------ lms/static/sass/elements/_icons.scss | 4 ++-- lms/static/sass/elements/_program-card.scss | 4 ++-- lms/static/sass/shared-v2/_footer.scss | 2 +- lms/static/sass/shared-v2/_help-tab.scss | 4 ++-- lms/static/sass/shared-v2/_modal.scss | 12 ++++++------ 12 files changed, 34 insertions(+), 33 deletions(-) diff --git a/cms/static/sass/programs/_components.scss b/cms/static/sass/programs/_components.scss index 2c7fd8643c..c14957880f 100644 --- a/cms/static/sass/programs/_components.scss +++ b/cms/static/sass/programs/_components.scss @@ -20,7 +20,7 @@ &:hover, &:focus, &:active { - color: palette(grayscale, black); + color: $black; } } diff --git a/cms/static/sass/programs/_modals.scss b/cms/static/sass/programs/_modals.scss index 9bb12eca0d..2e53637776 100644 --- a/cms/static/sass/programs/_modals.scss +++ b/cms/static/sass/programs/_modals.scss @@ -15,7 +15,7 @@ .modal-window { position: absolute; - background-color: palette(grayscale, black); + background-color: $black; width: 80%; left: 10%; top: 40%; @@ -26,7 +26,7 @@ margin: 5px; padding: 20px; background-color: palette(grayscale, dark); - border-top: 5px solid palette(warning, base); + border-top: 5px solid palette(warning, accent); .copy { color: $white; @@ -46,8 +46,9 @@ } .btn-brand { - background: palette(warning, base); - border-color: palette(warning, base); + background: palette(warning, back); + color: palette(grayscale, dark); + border-color: palette(warning, accent); &:hover, &:focus, diff --git a/lms/static/certificates/sass/_components.scss b/lms/static/certificates/sass/_components.scss index b6f9817d4c..6e32ca7cd7 100644 --- a/lms/static/certificates/sass/_components.scss +++ b/lms/static/certificates/sass/_components.scss @@ -96,7 +96,7 @@ // message to user-centric banner .wrapper-banner-user { - box-shadow: inset 0 rem(2) rem(2) 0 palette(grayscale, black); + box-shadow: inset 0 rem(2) rem(2) 0 $black; background: palette(grayscale, dark); } @@ -161,7 +161,7 @@ // main accomplishment .accomplishment-main { - background: transparentize(palette(grayscale, back), 0.75); + background: palette(grayscale, x-back); } // brief accomplishment @@ -467,7 +467,7 @@ } .accomplishment-main { - background: transparentize(palette(grayscale, dark), 0.9); + background: palette(grayscale, x-back); } .accomplishment-rendering { @@ -492,7 +492,7 @@ } .accomplishment-main { - background: transparentize(palette(primary, accent), 0.9); + background: palette(primary, back); } .accomplishment-rendering { @@ -537,7 +537,7 @@ // #FOOTER // ------------------------------ .footer-app { - border-top: rem(4) solid transparentize(palette(grayscale, base), 0.95); + border-top: rem(4) solid palette(grayscale, x-back); padding-top: spacing-vertical(base); } diff --git a/lms/static/certificates/sass/_config.scss b/lms/static/certificates/sass/_config.scss index 1349205bf7..1f52da440a 100644 --- a/lms/static/certificates/sass/_config.scss +++ b/lms/static/certificates/sass/_config.scss @@ -11,7 +11,7 @@ $cert-base-color: palette(grayscale, dark); $cert-distinguished-color: palette(primary, accent); $cert-decorative-color: palette(grayscale, back); -$cert-decorative-color-de-emphasized: transparentize(palette(grayscale, base), 0.75); +$cert-decorative-color-de-emphasized: palette(grayscale, back); $cert-decorative-color-emphasized: palette(grayscale, accent); // typography: config diff --git a/lms/static/sass/discussion/utilities/_variables-v2.scss b/lms/static/sass/discussion/utilities/_variables-v2.scss index 68f6db80c9..ee2809fe1c 100644 --- a/lms/static/sass/discussion/utilities/_variables-v2.scss +++ b/lms/static/sass/discussion/utilities/_variables-v2.scss @@ -13,7 +13,7 @@ $forum-color-staff: $blue !default; $forum-color-community-ta: $green-d1 !default; $forum-color-marked-answer: $green-d1 !default; $forum-color-border: palette(grayscale, base) !default; -$forum-color-error: palette(error, base) !default; +$forum-color-error: palette(error, accent) !default; // post images $post-image-dimension: ($baseline*3) !default; // image size + margin diff --git a/lms/static/sass/elements/_banners.scss b/lms/static/sass/elements/_banners.scss index 809606a0ef..949a908e48 100644 --- a/lms/static/sass/elements/_banners.scss +++ b/lms/static/sass/elements/_banners.scss @@ -10,7 +10,7 @@ $full-width-banner-margin: 20px; width: 100%; overflow: hidden; position: relative; - background: palette(grayscale, black); + background: $black; &:before { content: ''; @@ -19,7 +19,7 @@ $full-width-banner-margin: 20px; right: 0; bottom: 0; left: 0; - background: palette(grayscale, black); + background: $black; opacity: 0.65; @include susy-media($bp-screen-md) { diff --git a/lms/static/sass/elements/_course-card.scss b/lms/static/sass/elements/_course-card.scss index 81280a85fc..2a92661821 100644 --- a/lms/static/sass/elements/_course-card.scss +++ b/lms/static/sass/elements/_course-card.scss @@ -56,7 +56,7 @@ } .select-error { - color: palette(error, base); + color: palette(error, text); margin-bottom: $baseline/4; font-size: font-size(small); visibility: hidden; @@ -100,14 +100,14 @@ .cta-primary { display: inline-block; - background-color: palette(success, dark); - border-color: palette(success, dark); + background-color: palette(success, back); + border-color: palette(success, accent); &:active, &:focus, &:hover { - background-color: palette(success, base); - border-color: palette(success, base); + background-color: palette(success, back); + border-color: palette(success, accent); } } @@ -138,7 +138,7 @@ .upgrade-message, .certificate-status { - border-top: 1px solid transparentize(palette(grayscale, base), 0.75); + border-top: 1px solid palette(grayscale, back); padding-top: $baseline; @include susy-media($bp-screen-md) { diff --git a/lms/static/sass/elements/_icons.scss b/lms/static/sass/elements/_icons.scss index 9e3edefdbb..10d07773c3 100644 --- a/lms/static/sass/elements/_icons.scss +++ b/lms/static/sass/elements/_icons.scss @@ -12,8 +12,8 @@ } .green-certificate-icon .certificate-body { - fill: palette(success, dark); - border-color: palette(success, dark); + fill: palette(success, accent); + border-color: palette(success, accent); } .blue-certificate-icon .certificate-body { diff --git a/lms/static/sass/elements/_program-card.scss b/lms/static/sass/elements/_program-card.scss index d21e8e3da9..1734380dc6 100644 --- a/lms/static/sass/elements/_program-card.scss +++ b/lms/static/sass/elements/_program-card.scss @@ -154,11 +154,11 @@ position: relative; &.complete { - background: palette(success, dark); + background: palette(success, back); } &.in-progress { - background: palette(warning, base); + background: palette(warning, back); } } } diff --git a/lms/static/sass/shared-v2/_footer.scss b/lms/static/sass/shared-v2/_footer.scss index 2327c81ece..d4d54c8a9f 100644 --- a/lms/static/sass/shared-v2/_footer.scss +++ b/lms/static/sass/shared-v2/_footer.scss @@ -5,7 +5,7 @@ @include clearfix(); @extend %ui-print-excluded; box-shadow: 0 -1px 5px 0 $shadow-l1; - border-top: 1px solid tint(palette(grayscale, back), 50%); + border-top: 1px solid palette(grayscale, x-back); padding: 25px ($baseline/2) ($baseline*1.5); background: $footer-bg; diff --git a/lms/static/sass/shared-v2/_help-tab.scss b/lms/static/sass/shared-v2/_help-tab.scss index f36e0fbf1e..080c5f4e6c 100644 --- a/lms/static/sass/shared-v2/_help-tab.scss +++ b/lms/static/sass/shared-v2/_help-tab.scss @@ -12,8 +12,8 @@ border: 1px solid $lms-border-color; border-top-style: none; border-radius: 0 0 ($baseline/2) ($baseline/2); - background: transparentize($white, 0.25); - color: transparentize(palette(grayscale, dark), 0.25); + background: $white; + color: palette(grayscale, base); font-weight: bold; text-decoration: none; padding: 6px 22px 11px; diff --git a/lms/static/sass/shared-v2/_modal.scss b/lms/static/sass/shared-v2/_modal.scss index b65d71db27..d7f1894dc0 100644 --- a/lms/static/sass/shared-v2/_modal.scss +++ b/lms/static/sass/shared-v2/_modal.scss @@ -122,9 +122,9 @@ } .modal-form-error { - background: transparentize(palette(error, back), 0.95); - border: 1px solid palette(error, dark); - color: palette(error, dark); + background: palette(error, back); + border: 1px solid palette(error, accent); + color: palette(error, text); display: none; margin-bottom: $baseline; padding: 12px; @@ -171,12 +171,12 @@ &.field-error { display: block; - color: palette(error, dark); + color: palette(error, text); + input, + textarea { - border: 1px solid palette(error, dark); - color: palette(error, dark); + border: 1px solid palette(error, accent); + color: palette(error, text); } } }