Commit e8c9dbb4 by marcotuts

updated visual styles to remove rebase issues and borders from previous merges,…

updated visual styles to remove rebase issues and borders from previous merges, as well as a small set of visual clarity improvements to the course dashboard view.
parent 05c8fa82
...@@ -168,10 +168,8 @@ ...@@ -168,10 +168,8 @@
@include box-sizing(border-box); @include box-sizing(border-box);
@extend %t-strong; @extend %t-strong;
display: none; display: none;
border-bottom: 2px solid $yellow-d2;
margin: 0 0 $baseline 0; margin: 0 0 $baseline 0;
padding: ($baseline/2) $baseline; padding: ($baseline/2) $baseline;
background: $yellow-d1;
color: $white; color: $white;
.feedback-symbol { .feedback-symbol {
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
@include clearfix(); @include clearfix();
box-sizing: border-box; box-sizing: border-box;
padding: $baseline; padding: $baseline;
background-color: $body-bg;
border: 1px solid $border-color-l3; border: 1px solid $border-color-l3;
.advertise-message { .advertise-message {
@include font-size(12); @include font-size(12);
...@@ -196,7 +195,6 @@ ...@@ -196,7 +195,6 @@
@include clearfix(); @include clearfix();
box-sizing: border-box; box-sizing: border-box;
padding: $baseline; padding: $baseline;
background-color: $body-bg;
border: 1px solid $border-color-l3; border: 1px solid $border-color-l3;
.list--nav { .list--nav {
...@@ -275,11 +273,10 @@ ...@@ -275,11 +273,10 @@
.course-item { .course-item {
margin-bottom: $baseline; margin-bottom: $baseline;
border-bottom: 4px solid $border-color-l4;
padding-bottom: $baseline; padding-bottom: $baseline;
.course-container { .course-container {
border: 1px solid $border-color-l4; border: 2px solid $border-color-l4;
border-radius: 3px; border-radius: 3px;
} }
...@@ -600,8 +597,7 @@ ...@@ -600,8 +597,7 @@
display: none; display: none;
margin: $baseline 0 ($baseline/2) 0; margin: $baseline 0 ($baseline/2) 0;
padding: ($baseline/2) $baseline; padding: ($baseline/2) $baseline;
background: $gray-l5; border-top: 1px solid $gray-l4;
border: 1px solid $gray-l4;
color: $base-font-color; // Overrides the normal white color in this one case color: $base-font-color; // Overrides the normal white color in this one case
// STATE: shown // STATE: shown
...@@ -795,11 +791,6 @@ ...@@ -795,11 +791,6 @@
.message-copy { .message-copy {
@extend %t-copy-sub1; @extend %t-copy-sub1;
margin: 0; margin: 0;
.grade-value {
font-size: 1.2rem;
font-weight: bold;
}
} }
.credit-action { .credit-action {
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
// #UNITS: Basic units of measurement // #UNITS: Basic units of measurement
// #GRID: Grid and layout variables // #GRID: Grid and layout variables
// #COLORS: Base, palette and theme color definitions + application // #COLORS: Base, palette and theme color definitions + application
// #COLORS-EDX-SPECIFIC: edX specific colors not yet refactored to use updated color scheme
// #TYPOGRAPHY: Font definitions and scales // #TYPOGRAPHY: Font definitions and scales
// #DEPTH: UI depth-based scale // #DEPTH: UI depth-based scale
// #SPACING: General UI spacing variables and scale // #SPACING: General UI spacing variables and scale
...@@ -219,7 +220,13 @@ $alert-color: rgb(212, 64, 64) !default; ...@@ -219,7 +220,13 @@ $alert-color: rgb(212, 64, 64) !default;
$warning-color: rgb(237, 189, 60) !default; $warning-color: rgb(237, 189, 60) !default;
$success-color: rgb(37, 184, 90) !default; $success-color: rgb(37, 184, 90) !default;
// newer color variables
// ----------------------------
// #COLORS- EDX-SPECIFIC
// ----------------------------
// old color variables
// DEPRECATED: Do not continue to use these colors, instead use pattern libary and base colors above.
$dark-gray1: rgb(74,74,74); $dark-gray1: rgb(74,74,74);
$light-gray1: rgb(242,242,242); $light-gray1: rgb(242,242,242);
$light-gray2: rgb(171,171,171); $light-gray2: rgb(171,171,171);
...@@ -232,6 +239,7 @@ $green1: rgb(97,161,46); ...@@ -232,6 +239,7 @@ $green1: rgb(97,161,46);
$red1: rgb(208,2,27); $red1: rgb(208,2,27);
// edx-specific: marketing site variables // edx-specific: marketing site variables
// DEPRECATED: Do not continue to use these colors, instead use pattern libary and base colors above.
$m-gray: rgb(138,140,143); //C8F $m-gray: rgb(138,140,143); //C8F
$m-gray-l1: rgb(151,153,155); $m-gray-l1: rgb(151,153,155);
$m-gray-l2: rgb(164,166,168); $m-gray-l2: rgb(164,166,168);
......
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