Commit d2eca92f by Brian Talbot Committed by Don Mitchell

edx.org: abstracting new edx.org button extends and colors with other themes in mind

parent 95478a34
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
} }
// primary button // primary button
.m-btn-primary { .m-btn-base {
@extend .m-btn; @extend .m-btn;
@extend .m-btn-edged; @extend .m-btn-edged;
border: none; border: none;
...@@ -46,67 +46,67 @@ ...@@ -46,67 +46,67 @@
letter-spacing: 0; letter-spacing: 0;
&.disabled, &[disabled], &.is-disabled { &.disabled, &[disabled], &.is-disabled {
background: $m-gray-d3; background: $action-primary-disabled-bg;
&:hover { &:hover {
background: $m-gray-d3 !important; // needed for IE currently background: $action-primary-disabled-bg !important; // needed for IE currently
} }
} }
} }
// blue primary button // primary button
.m-btn-primary-blue { .m-btn-primary {
@extend .m-btn-primary; @extend .m-btn-base;
box-shadow: 0 2px 1px 0 $m-blue-d4; box-shadow: 0 2px 1px 0 $action-primary-shadow;
background: $m-blue-d3; background: $action-primary-bg;
color: $white; color: $action-primary-fg;
&:hover, &:active { &:hover, &:active {
background: $m-blue-d1; background: $action-primary-focused-bg;
} }
&.current, &.active { &.current, &.active {
box-shadow: inset 0 2px 1px 1px $m-blue-d2; box-shadow: inset 0 2px 1px 1px $action-primary-active-shadow;
background: $m-blue; background: $action-primary-active-bg;
color: $m-blue-d2; color: $action-primary-active-fg;
&:hover, &:active { &:hover, &:active {
box-shadow: inset 0 2px 1px 1px $m-blue-d3; box-shadow: inset 0 2px 1px 1px $action-primary-active-focused-shadow;
color: $m-blue-d3; color: $action-primary-active-focused-fg;
} }
} }
&.disabled, &[disabled] { &.disabled, &[disabled] {
box-shadow: none; box-shadow: none;
background: $m-gray-d3; // needed for IE currently background: $action-primary-disabled-bg; // needed for IE currently
} }
} }
// pink primary button // secondary button
.m-btn-primary-pink { .m-btn-secondary {
@extend .m-btn-primary; @extend .m-btn-base;
box-shadow: 0 2px 1px 0 $m-pink-d2; box-shadow: 0 2px 1px 0 $action-secondary-shadow;
background: $m-pink; background: $action-secondary-bg;
color: $white; color: $action-secondary-fg;
&:hover, &:active { &:hover, &:active {
background: $m-pink-l3; background: $action-secondary-focused-bg;
} }
&.current, &.active { &.current, &.active {
box-shadow: inset 0 2px 1px 1px $m-pink-d1; box-shadow: inset 0 2px 1px 1px $action-secondary-active-shadow;
background: $m-pink-l2; background: $action-secondary-active-bg;
color: $m-pink-d1; color: $action-secondary-active-fg;
&:hover, &:active { &:hover, &:active {
box-shadow: inset 0 2px 1px 1px $m-pink-d2; box-shadow: inset 0 2px 1px 1px $action-secondary-active-focused-shadow;
color: $m-pink-d3; color: $action-secondary-active-focused-fg;
} }
} }
&.disabled, &[disabled] { &.disabled, &[disabled] {
box-shadow: none; box-shadow: none;
background: $m-gray-d3; // needed for IE currently background: $action-secondary-disabled-bg; // needed for IE currently
} }
} }
...@@ -154,20 +154,20 @@ ...@@ -154,20 +154,20 @@
// register or access courseware // register or access courseware
&.action-register, &.access-courseware { &.action-register, &.access-courseware {
@extend .m-btn-primary-blue; @extend .m-btn-primary;
display: block; display: block;
} }
// already registered but course not started or registration is closed // already registered but course not started or registration is closed
&.is-registered, &.registration-closed { &.is-registered, &.registration-closed {
@extend .m-btn-primary-pink; @extend .m-btn-secondary;
pointer-events: none !important; pointer-events: none !important;
display: block; display: block;
} }
// coming soon // coming soon
&.coming-soon { &.coming-soon {
@extend .m-btn-primary-pink; @extend .m-btn-secondary;
pointer-events: none !important; pointer-events: none !important;
outline: none; outline: none;
display: block; display: block;
......
...@@ -69,7 +69,6 @@ $m-pink-d3: #771C44; ...@@ -69,7 +69,6 @@ $m-pink-d3: #771C44;
$m-base-font-size: em(15); $m-base-font-size: em(15);
$base-font-color: rgb(60,60,60); $base-font-color: rgb(60,60,60);
$baseFontColor: rgb(60,60,60); $baseFontColor: rgb(60,60,60);
$lighter-base-font-color: rgb(100,100,100); $lighter-base-font-color: rgb(100,100,100);
...@@ -88,10 +87,57 @@ $courseware-footer-border: none; ...@@ -88,10 +87,57 @@ $courseware-footer-border: none;
$courseware-footer-shadow: none; $courseware-footer-shadow: none;
$courseware-footer-margin: 0px; $courseware-footer-margin: 0px;
// actions
$button-bg-image: linear-gradient(#fff 0%, rgb(250,250,250) 50%, rgb(237,237,237) 50%, rgb(220,220,220) 100%); $button-bg-image: linear-gradient(#fff 0%, rgb(250,250,250) 50%, rgb(237,237,237) 50%, rgb(220,220,220) 100%);
$button-bg-color: transparent; $button-bg-color: transparent;
$button-bg-hover-color: #fff; $button-bg-hover-color: #fff;
// actions - primary
$action-primary-bg: $m-blue-d3;
$action-primary-fg: $white;
$action-primary-shadow: $m-blue-d4;
// focused - hover/active pseudo states
$action-primary-focused-bg: $m-blue-d1;
$action-primary-focused-fg: $white;
// current or active navigation item
$action-primary-active-bg: $m-blue;
$action-primary-active-fg: $m-blue-d3;
$action-primary-active-shadow: $m-blue-d2;
$action-primary-active-focused-fg: $m-blue-d4;
$action-primary-active-focused-shadow: $m-blue-d3;
// disabled
$action-primary-disabled-bg: $m-gray-d3;
$action-prmary-disabled-fg: $white;
// actions - secondary
$action-secondary-bg: $m-pink;
$action-secondary-fg: $white;
$action-secondary-shadow: $m-pink-d2;
// focused - hover/active pseudo states
$action-secondary-focused-bg: $m-pink-l3;
$action-secondary-focused-fg: $white;
// current or active navigation item
$action-secondary-active-bg: $m-pink-l2;
$action-secondary-active-fg: $m-pink-d1;
$action-secondary-active-shadow: $m-pink-d1;
$action-secondary-active-focused-fg: $m-pink-d3;
$action-secondary-active-focused-shadow: $m-pink-d2;
// disabled
$action-secondary-disabled-bg: $m-gray-d3;
$action-secondary-disabled-fg: $white;
$faded-hr-image-1: linear-gradient(180deg, rgba(200,200,200, 0) 0%, rgba(200,200,200, 1) 50%, rgba(200,200,200, 0)); $faded-hr-image-1: linear-gradient(180deg, rgba(200,200,200, 0) 0%, rgba(200,200,200, 1) 50%, rgba(200,200,200, 0));
$faded-hr-image-2: linear-gradient(180deg, rgba(200,200,200, 0) 0%, rgba(200,200,200, 1)); $faded-hr-image-2: linear-gradient(180deg, rgba(200,200,200, 0) 0%, rgba(200,200,200, 1));
$faded-hr-image-3: linear-gradient(180deg, rgba(200,200,200, 1) 0%, rgba(200,200,200, 0)); $faded-hr-image-3: linear-gradient(180deg, rgba(200,200,200, 1) 0%, rgba(200,200,200, 0));
......
...@@ -390,7 +390,7 @@ ...@@ -390,7 +390,7 @@
@include clearfix(); @include clearfix();
button[type="submit"] { button[type="submit"] {
@extend .m-btn-primary-blue; @extend .m-btn-primary;
&:disabled, &.is-disabled { &:disabled, &.is-disabled {
opacity: 0.3; opacity: 0.3;
......
...@@ -279,7 +279,7 @@ header.global { ...@@ -279,7 +279,7 @@ header.global {
display: inline-block; display: inline-block;
.cta { .cta {
@extend .m-btn-primary-blue; @extend .m-btn-primary;
} }
} }
......
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