Skip to content

E
edx-platform
Commit 7119357a by Andy Armstrong
Options

Address code review feedback

parent 2e12214a
Showing with 34 additions and 33 deletions
cms/static/sass/programs/_components.scss
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
&:hover, &:hover,
&:focus, &:focus,
&:active { &:active {
color: palette(grayscale, black); color: $black;
} }
} }
......
cms/static/sass/programs/_modals.scss
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
.modal-window { .modal-window {
position: absolute; position: absolute;
background-color: palette(grayscale, black); background-color: $black;
width: 80%; width: 80%;
left: 10%; left: 10%;
top: 40%; top: 40%;
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
margin: 5px; margin: 5px;
padding: 20px; padding: 20px;
background-color: palette(grayscale, dark); background-color: palette(grayscale, dark);
border-top: 5px solid palette(warning, base); border-top: 5px solid palette(warning, accent);
.copy { .copy {
color: $white; color: $white;
...@@ -46,8 +46,9 @@ ...@@ -46,8 +46,9 @@
} }
.btn-brand { .btn-brand {
background: palette(warning, base); background: palette(warning, back);
border-color: palette(warning, base); color: palette(grayscale, dark);
border-color: palette(warning, accent);
&:hover, &:hover,
&:focus, &:focus,
......
lms/static/certificates/sass/_components.scss
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
// message to user-centric banner // message to user-centric banner
.wrapper-banner-user { .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); background: palette(grayscale, dark);
} }
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
// main accomplishment // main accomplishment
.accomplishment-main { .accomplishment-main {
background: transparentize(palette(grayscale, back), 0.75); background: palette(grayscale, x-back);
} }
// brief accomplishment // brief accomplishment
...@@ -467,7 +467,7 @@ ...@@ -467,7 +467,7 @@
} }
.accomplishment-main { .accomplishment-main {
background: transparentize(palette(grayscale, dark), 0.9); background: palette(grayscale, x-back);
} }
.accomplishment-rendering { .accomplishment-rendering {
...@@ -492,7 +492,7 @@ ...@@ -492,7 +492,7 @@
} }
.accomplishment-main { .accomplishment-main {
background: transparentize(palette(primary, accent), 0.9); background: palette(primary, back);
} }
.accomplishment-rendering { .accomplishment-rendering {
...@@ -537,7 +537,7 @@ ...@@ -537,7 +537,7 @@
// #FOOTER // #FOOTER
// ------------------------------ // ------------------------------
.footer-app { .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); padding-top: spacing-vertical(base);
} }
......
lms/static/certificates/sass/_config.scss
...@@ -11,7 +11,7 @@ $cert-base-color: palette(grayscale, dark); ...@@ -11,7 +11,7 @@ $cert-base-color: palette(grayscale, dark);
$cert-distinguished-color: palette(primary, accent); $cert-distinguished-color: palette(primary, accent);
$cert-decorative-color: palette(grayscale, back); $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); $cert-decorative-color-emphasized: palette(grayscale, accent);
// typography: config // typography: config
......
lms/static/sass/discussion/utilities/_variables-v2.scss
...@@ -13,7 +13,7 @@ $forum-color-staff: $blue !default; ...@@ -13,7 +13,7 @@ $forum-color-staff: $blue !default;
$forum-color-community-ta: $green-d1 !default; $forum-color-community-ta: $green-d1 !default;
$forum-color-marked-answer: $green-d1 !default; $forum-color-marked-answer: $green-d1 !default;
$forum-color-border: palette(grayscale, base) !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 images
$post-image-dimension: ($baseline*3) !default; // image size + margin $post-image-dimension: ($baseline*3) !default; // image size + margin
......
lms/static/sass/elements/_banners.scss
...@@ -10,7 +10,7 @@ $full-width-banner-margin: 20px; ...@@ -10,7 +10,7 @@ $full-width-banner-margin: 20px;
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
background: palette(grayscale, black); background: $black;
&:before { &:before {
content: ''; content: '';
...@@ -19,7 +19,7 @@ $full-width-banner-margin: 20px; ...@@ -19,7 +19,7 @@ $full-width-banner-margin: 20px;
right: 0; right: 0;
bottom: 0; bottom: 0;
left: 0; left: 0;
background: palette(grayscale, black); background: $black;
opacity: 0.65; opacity: 0.65;
@include susy-media($bp-screen-md) { @include susy-media($bp-screen-md) {
......
lms/static/sass/elements/_course-card.scss
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
} }
.select-error { .select-error {
color: palette(error, base); color: palette(error, text);
margin-bottom: $baseline/4; margin-bottom: $baseline/4;
font-size: font-size(small); font-size: font-size(small);
visibility: hidden; visibility: hidden;
...@@ -100,14 +100,14 @@ ...@@ -100,14 +100,14 @@
.cta-primary { .cta-primary {
display: inline-block; display: inline-block;
background-color: palette(success, dark); background-color: palette(success, back);
border-color: palette(success, dark); border-color: palette(success, accent);
&:active, &:active,
&:focus, &:focus,
&:hover { &:hover {
background-color: palette(success, base); background-color: palette(success, back);
border-color: palette(success, base); border-color: palette(success, accent);
} }
} }
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
.upgrade-message, .upgrade-message,
.certificate-status { .certificate-status {
border-top: 1px solid transparentize(palette(grayscale, base), 0.75); border-top: 1px solid palette(grayscale, back);
padding-top: $baseline; padding-top: $baseline;
@include susy-media($bp-screen-md) { @include susy-media($bp-screen-md) {
......
lms/static/sass/elements/_icons.scss
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
} }
.green-certificate-icon .certificate-body { .green-certificate-icon .certificate-body {
fill: palette(success, dark); fill: palette(success, accent);
border-color: palette(success, dark); border-color: palette(success, accent);
} }
.blue-certificate-icon .certificate-body { .blue-certificate-icon .certificate-body {
......
lms/static/sass/elements/_program-card.scss
...@@ -154,11 +154,11 @@ ...@@ -154,11 +154,11 @@
position: relative; position: relative;
&.complete { &.complete {
background: palette(success, dark); background: palette(success, back);
} }
&.in-progress { &.in-progress {
background: palette(warning, base); background: palette(warning, back);
} }
} }
} }
......
lms/static/sass/shared-v2/_footer.scss
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
@include clearfix(); @include clearfix();
@extend %ui-print-excluded; @extend %ui-print-excluded;
box-shadow: 0 -1px 5px 0 $shadow-l1; 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); padding: 25px ($baseline/2) ($baseline*1.5);
background: $footer-bg; background: $footer-bg;
......
lms/static/sass/shared-v2/_help-tab.scss
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
border: 1px solid $lms-border-color; border: 1px solid $lms-border-color;
border-top-style: none; border-top-style: none;
border-radius: 0 0 ($baseline/2) ($baseline/2); border-radius: 0 0 ($baseline/2) ($baseline/2);
background: transparentize($white, 0.25); background: $white;
color: transparentize(palette(grayscale, dark), 0.25); color: palette(grayscale, base);
font-weight: bold; font-weight: bold;
text-decoration: none; text-decoration: none;
padding: 6px 22px 11px; padding: 6px 22px 11px;
......
lms/static/sass/shared-v2/_modal.scss
...@@ -122,9 +122,9 @@ ...@@ -122,9 +122,9 @@
} }
.modal-form-error { .modal-form-error {
background: transparentize(palette(error, back), 0.95); background: palette(error, back);
border: 1px solid palette(error, dark); border: 1px solid palette(error, accent);
color: palette(error, dark); color: palette(error, text);
display: none; display: none;
margin-bottom: $baseline; margin-bottom: $baseline;
padding: 12px; padding: 12px;
...@@ -171,12 +171,12 @@ ...@@ -171,12 +171,12 @@
&.field-error { &.field-error {
display: block; display: block;
color: palette(error, dark); color: palette(error, text);
+ input, + input,
+ textarea { + textarea {
border: 1px solid palette(error, dark); border: 1px solid palette(error, accent);
color: palette(error, dark); color: palette(error, text);
} }
} }
} }
......
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