Commit 0b62ec7d by Brian Talbot Committed by Nate Hardison

theming - revised variables and link/button styling to account for edX's…

theming - revised variables and link/button styling to account for edX's registration and login constrast/styling changes
parent e9d47498
...@@ -62,6 +62,7 @@ $lighter-base-font-color: rgb(100,100,100); ...@@ -62,6 +62,7 @@ $lighter-base-font-color: rgb(100,100,100);
$text-color: $dark-gray; $text-color: $dark-gray;
$body-bg: rgb(250,250,250); $body-bg: rgb(250,250,250);
$container-bg: $white;
$header-image: linear-gradient(-90deg, rgba(255,255,255, 1), rgba(230,230,230, 0.9)); $header-image: linear-gradient(-90deg, rgba(255,255,255, 1), rgba(230,230,230, 0.9));
$header-bg: $white; $header-bg: $white;
$courseware-header-image: linear-gradient(top, #fff, #eee); $courseware-header-image: linear-gradient(top, #fff, #eee);
...@@ -100,6 +101,7 @@ $border-color-3: rgb(100,100,100); ...@@ -100,6 +101,7 @@ $border-color-3: rgb(100,100,100);
$border-color-4: rgb(252,252,252); $border-color-4: rgb(252,252,252);
$link-color: $blue; $link-color: $blue;
$link-color-d1: $m-blue;
$link-hover: $pink; $link-hover: $pink;
$selection-color-1: $pink; $selection-color-1: $pink;
$selection-color-2: #444; $selection-color-2: #444;
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
margin: 0 0 $baseline 0; margin: 0 0 $baseline 0;
font-weight: 300; font-weight: 300;
text-transform: uppercase; text-transform: uppercase;
color: $link-color; color: $link-color-d1;
} }
.heading-3 { .heading-3 {
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
font-weight: 600; font-weight: 600;
text-transform: uppercase; text-transform: uppercase;
letter-spacing: 0 !important; letter-spacing: 0 !important;
color: saturate($link-color,15%); color: saturate($link-color-d1,15%);
} }
.heading-5 { .heading-5 {
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
// specific examples - buttons // specific examples - buttons
.button-primary { .button-primary {
@include border-radius(0); @include border-radius(0);
@include linear-gradient(saturate($link-color,15%) 5%, shade($link-color,15%) 95%); @include linear-gradient(saturate($link-color-d1,15%) 5%, shade($link-color-d1,15%) 95%);
display: inline-block; display: inline-block;
padding: $baseline/2 $baseline*2.5; padding: $baseline/2 $baseline*2.5;
text-transform: lowercase; text-transform: lowercase;
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
@include clearfix; @include clearfix;
margin: 0 auto; margin: 0 auto;
width: 960px; width: 960px;
background: $white; background: $container-bg;
} }
.container { .container {
...@@ -139,18 +139,18 @@ ...@@ -139,18 +139,18 @@
} }
a { a {
@include transition($link-color 0.15s ease-in-out, border 0.15s ease-in-out); @include transition(color 0.15s ease-in-out, border 0.15s ease-in-out);
&:link, &:visited, &:hover, &:active { &:link, &:visited, &:hover, &:active {
color: $link-color; color: $link-color-d1;
font-weight: 400; font-weight: 400;
text-decoration: none !important; text-decoration: none !important; // needed but nasty
font-family: $sans-serif; font-family: $sans-serif;
} }
&:hover, &:active { &:hover, &:active {
border-bottom: 1px solid saturate($link-color,15%); text-decoration: none !important; // needed but nasty
color: saturate($link-color,15%); border-bottom: 1px dotted $link-color-d1;
} }
} }
...@@ -259,13 +259,13 @@ ...@@ -259,13 +259,13 @@
} }
label { label {
@include transition($link-color 0.15s ease-in-out); @include transition(color 0.15s ease-in-out);
margin: 0 0 ($baseline/4) 0; margin: 0 0 ($baseline/4) 0;
color: tint($black, 20%); color: tint($black, 20%);
} }
.tip { .tip {
@include transition($link-color 0.15s ease-in-out); @include transition(color 0.15s ease-in-out);
display: block; display: block;
margin-top: ($baseline/4); margin-top: ($baseline/4);
color: tint($outer-border-color, 50%); color: tint($outer-border-color, 50%);
...@@ -340,11 +340,11 @@ ...@@ -340,11 +340,11 @@
&.is-focused { &.is-focused {
label { label {
color: saturate($link-color,15%); color: saturate($link-color-d1,15%);
} }
.tip { .tip {
color: saturate($link-color,15%); color: saturate($link-color-d1,15%);
} }
} }
......
...@@ -280,7 +280,7 @@ header.global { ...@@ -280,7 +280,7 @@ header.global {
a { a {
@include border-radius(0); @include border-radius(0);
@include linear-gradient(shade($link-color,15%) 5%, saturate($link-color,15%) 95%); @include linear-gradient(saturate($link-color-d1,15%) 5%, shade($link-color-d1,15%) 95%);
display: inline-block; display: inline-block;
padding: $baseline/2 $baseline*2.5; padding: $baseline/2 $baseline*2.5;
text-transform: lowercase; text-transform: lowercase;
......
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