Skip to content

E
edx-platform
Commit 2ee48873 by Brian Talbot
Options

cms pull request 1160 - brought back all css changes lost in this request - mostly overview related

parent e57b5b14
Showing with 124 additions and 130 deletions
cms/static/sass/_cms_mixins.scss
...@@ -48,17 +48,17 @@ ...@@ -48,17 +48,17 @@
} }
@mixin green-button { @mixin green-button {
@include button; @include button;
border: 1px solid #0d7011; border: 1px solid #0d7011;
border-radius: 3px; border-radius: 3px;
@include linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0)); @include linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0));
background-color: $green; background-color: $green;
color: #fff; color: #fff;
&:hover { &:hover {
background-color: #129416; background-color: #129416;
color: #fff; color: #fff;
} }
} }
@mixin white-button { @mixin white-button {
...@@ -277,12 +277,12 @@ ...@@ -277,12 +277,12 @@
} }
@mixin sr-text { @mixin sr-text {
border: 0; border: 0;
clip: rect(0 0 0 0); clip: rect(0 0 0 0);
height: 1px; height: 1px;
margin: -1px; margin: -1px;
overflow: hidden; overflow: hidden;
padding: 0; padding: 0;
position: absolute; position: absolute;
width: 1px; width: 1px;
} }
\ No newline at end of file
cms/static/sass/_subsection.scss
...@@ -182,106 +182,106 @@ ...@@ -182,106 +182,106 @@
.gradable { .gradable {
label { label {
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
} }
.gradable-status { .gradable-status {
position: relative; position: relative;
top: -4px; top: -4px;
display: inline-block; display: inline-block;
margin-left: 10px; margin-left: 10px;
width: 65%; width: 65%;
.status-label { .status-label {
margin: 0; margin: 0;
padding: 0; padding: 0;
background: transparent; background: transparent;
color: $blue; color: $blue;
border: none; border: none;
font-size: 11px; font-size: 11px;
font-weight: bold; font-weight: bold;
text-transform: uppercase; text-transform: uppercase;
} }
.menu-toggle { .menu-toggle {
z-index: 100; z-index: 100;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
height: 20px; height: 20px;
background: transparent; background: transparent;
&:hover, &.is-active { &:hover, &.is-active {
color: $blue; color: $blue;
} }
} }
.menu { .menu {
z-index: 1; z-index: 1;
position: absolute; position: absolute;
top: -12px; top: -12px;
left: -7px; left: -7px;
display: none; display: none;
width: 100%; width: 100%;
margin: 0; margin: 0;
padding: 8px 12px; padding: 8px 12px;
opacity: 0.0; opacity: 0.0;
background: $white; background: $white;
border: 1px solid $mediumGrey; border: 1px solid $mediumGrey;
font-size: 12px; font-size: 12px;
@include border-radius(4px); @include border-radius(4px);
@include box-shadow(0 1px 2px rgba(0, 0, 0, .2)); @include box-shadow(0 1px 2px rgba(0, 0, 0, .2));
@include transition(opacity .15s); @include transition(opacity .15s);
li { li {
margin-bottom: 3px; margin-bottom: 3px;
padding-bottom: 3px; padding-bottom: 3px;
border-bottom: 1px solid $lightGrey; border-bottom: 1px solid $lightGrey;
&:last-child { &:last-child {
margin-bottom: 0; margin-bottom: 0;
padding-bottom: 0; padding-bottom: 0;
border: none; border: none;
} }
} }
a { a {
&.is-selected { &.is-selected {
font-weight: bold; font-weight: bold;
} }
} }
} }
// dropdown state // dropdown state
&.is-active { &.is-active {
.menu { .menu {
z-index: 10000; z-index: 10000;
display: block; display: block;
opacity: 1.0; opacity: 1.0;
} }
.menu-toggle { .menu-toggle {
z-index: 1000; z-index: 1000;
} }
} }
// set state // set state
&.is-set { &.is-set {
.menu-toggle { .menu-toggle {
color: $blue; color: $blue;
} }
.status-label { .status-label {
display: block; display: block;
color: $blue; color: $blue;
} }
} }
} }
} }
\ No newline at end of file \ No newline at end of file
cms/static/sass/_variables.scss
...@@ -12,7 +12,6 @@ $body-line-height: golden-ratio(.875em, 1); ...@@ -12,7 +12,6 @@ $body-line-height: golden-ratio(.875em, 1);
$white: rgb(255,255,255); $white: rgb(255,255,255);
$black: rgb(0,0,0); $black: rgb(0,0,0);
$pink: rgb(182,37,104); $pink: rgb(182,37,104);
$error-red: rgb(253, 87, 87); $error-red: rgb(253, 87, 87);
...@@ -21,12 +20,6 @@ $offBlack: #3c3c3c; ...@@ -21,12 +20,6 @@ $offBlack: #3c3c3c;
$black: rgb(0,0,0); $black: rgb(0,0,0);
$white: rgb(255,255,255); $white: rgb(255,255,255);
$blue: #5597dd; $blue: #5597dd;
$lightBlue: tint($blue, 75%);
$extraLightBlue: tint($lightBlue, 75%);
$darkBlue: shade($blue, 25%);
$extraDarkBlue: shade($darkBlue, 25%);
$lightTransparentBlue: rgba(167, 192, 221, 0.3);
$orange: #edbd3c; $orange: #edbd3c;
$red: #b20610; $red: #b20610;
$green: #108614; $green: #108614;
......
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