Skip to content

E
edx-platform
Commit 486d085d by cahrens
Options

Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into… 

Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
parents a82daf07 290d049c
Showing with 133 additions and 155 deletions
cms/static/sass/_base.scss
...@@ -814,7 +814,7 @@ hr.divide { ...@@ -814,7 +814,7 @@ hr.divide {
line-height: 26px; line-height: 26px;
color: $white; color: $white;
pointer-events: none; pointer-events: none;
opacity: 0; opacity: 0.0;
&:after { &:after {
content: '▾'; content: '▾';
......
cms/static/sass/_reset.scss
...@@ -149,11 +149,11 @@ abbr[title] { ...@@ -149,11 +149,11 @@ abbr[title] {
margin-left: 20px; margin-left: 20px;
} }
li { li {
opacity: .8; opacity: 0.8;
&:ui-state-active { &:ui-state-active {
background-color: rgba(255, 255, 255, .3); background-color: rgba(255, 255, 255, .3);
opacity: 1; opacity: 1.0;
font-weight: 400; font-weight: 400;
} }
a:focus { a:focus {
......
cms/static/sass/assets/_anims.scss
...@@ -95,12 +95,12 @@ ...@@ -95,12 +95,12 @@
// bounce in // bounce in
@mixin bounceIn { @mixin bounceIn {
0% { 0% {
opacity: 0; opacity: 0.0;
@include transform(scale(0.3)); @include transform(scale(0.3));
} }
50% { 50% {
opacity: 1; opacity: 1.0;
@include transform(scale(1.05)); @include transform(scale(1.05));
} }
...@@ -128,12 +128,12 @@ ...@@ -128,12 +128,12 @@
// bounce in // bounce in
@mixin bounceOut { @mixin bounceOut {
0% { 0% {
opacity: 0; opacity: 0.0;
@include transform(scale(0.3)); @include transform(scale(0.3));
} }
50% { 50% {
opacity: 1; opacity: 1.0;
@include transform(scale(1.05)); @include transform(scale(1.05));
} }
...@@ -146,12 +146,12 @@ ...@@ -146,12 +146,12 @@
} }
50% { 50% {
opacity: 1; opacity: 1.0;
@include transform(scale(1.05)); @include transform(scale(1.05));
} }
100% { 100% {
opacity: 0; opacity: 0.0;
@include transform(scale(0.3)); @include transform(scale(0.3));
} }
} }
......
cms/static/sass/elements/_header.scss
...@@ -243,7 +243,7 @@ ...@@ -243,7 +243,7 @@
left: -7px; left: -7px;
top: 47px; top: 47px;
width: 140px; width: 140px;
opacity: 0; opacity: 0.0;
pointer-events: none; pointer-events: none;
} }
...@@ -558,7 +558,7 @@ body.signin .nav-not-signedin-signup { ...@@ -558,7 +558,7 @@ body.signin .nav-not-signedin-signup {
.wrapper-nav-sub { .wrapper-nav-sub {
@include transition (opacity 1.0s ease-in-out 0s); @include transition (opacity 1.0s ease-in-out 0s);
opacity: 0; opacity: 0.0;
pointer-events: none; pointer-events: none;
&.is-shown { &.is-shown {
......
cms/static/sass/elements/_system-feedback.scss
...@@ -627,7 +627,7 @@ ...@@ -627,7 +627,7 @@
pointer-events: none; pointer-events: none;
.prompt { .prompt {
opacity: 0; opacity: 0.0;
} }
} }
......
cms/static/sass/views/_checklists.scss
...@@ -254,7 +254,7 @@ body.course.checklists { ...@@ -254,7 +254,7 @@ body.course.checklists {
.task-support { .task-support {
@extend .t-copy-sub2; @extend .t-copy-sub2;
@include transition(opacity .15s .25s ease-in-out); @include transition(opacity .15s .25s ease-in-out);
opacity: 0; opacity: 0.0;
pointer-events: none; pointer-events: none;
} }
} }
...@@ -267,7 +267,7 @@ body.course.checklists { ...@@ -267,7 +267,7 @@ body.course.checklists {
float: right; float: right;
width: flex-grid(2,9); width: flex-grid(2,9);
margin: ($baseline/2) 0 0 flex-gutter(); margin: ($baseline/2) 0 0 flex-gutter();
opacity: 0; opacity: 0.0;
pointer-events: none; pointer-events: none;
text-align: right; text-align: right;
......
cms/static/sass/views/_dashboard.scss
...@@ -59,7 +59,7 @@ body.dashboard { ...@@ -59,7 +59,7 @@ body.dashboard {
top: 15px; top: 15px;
right: $baseline; right: $baseline;
padding: ($baseline/4) ($baseline/2); padding: ($baseline/4) ($baseline/2);
opacity: 0; opacity: 0.0;
pointer-events: none; pointer-events: none;
&:hover { &:hover {
......
cms/static/sass/views/_index.scss
...@@ -162,7 +162,7 @@ body.index { ...@@ -162,7 +162,7 @@ body.index {
position: absolute; position: absolute;
bottom: -30px; bottom: -30px;
right: ($baseline/2); right: ($baseline/2);
opacity: 0; opacity: 0.0;
[class^="icon-"] { [class^="icon-"] {
@include font-size(18); @include font-size(18);
......
cms/static/sass/views/_settings.scss
...@@ -703,7 +703,7 @@ body.course.settings { ...@@ -703,7 +703,7 @@ body.course.settings {
.tip { .tip {
@include transition (opacity 0.5s ease-in-out 0s); @include transition (opacity 0.5s ease-in-out 0s);
opacity: 0; opacity: 0.0;
position: absolute; position: absolute;
bottom: ($baseline*1.25); bottom: ($baseline*1.25);
} }
...@@ -718,7 +718,7 @@ body.course.settings { ...@@ -718,7 +718,7 @@ body.course.settings {
input.error { input.error {
& + .tip { & + .tip {
opacity: 0; opacity: 0.0;
} }
} }
} }
......
cms/static/sass/views/_unit.scss
...@@ -13,10 +13,6 @@ body.course.unit { ...@@ -13,10 +13,6 @@ body.course.unit {
} }
//end problem selector reqs //end problem selector reqs
// Unit Page Main Column
// ====================
.main-column { .main-column {
clear: both; clear: both;
float: left; float: left;
...@@ -28,18 +24,15 @@ body.course.unit { ...@@ -28,18 +24,15 @@ body.course.unit {
border: none; border: none;
.rendered-component { .rendered-component {
padding: 0 20px; padding: 0 $baseline;
} }
} }
} }
.unit-body { .unit-body {
// Unit Page Name
// ====================
.unit-name-input { .unit-name-input {
padding: 20px 40px; padding: $baseline 2*$baseline;
label { label {
display: block; display: block;
...@@ -80,17 +73,15 @@ body.course.unit { ...@@ -80,17 +73,15 @@ body.course.unit {
letter-spacing: 1px; letter-spacing: 1px;
text-transform: uppercase; text-transform: uppercase;
} }
// Component List Meta
// ==================== // ====================
// TODO: clean up organization of this page, to many levels/duplication
// Component List Meta
.components { .components {
> li { > li {
position: relative; position: relative;
z-index: 10; z-index: 10;
margin: 20px 40px; margin: $baseline 2*$baseline;
.title { .title {
margin: 0 0 15px 0; margin: 0 0 15px 0;
...@@ -100,26 +91,26 @@ body.course.unit { ...@@ -100,26 +91,26 @@ body.course.unit {
} }
} }
// New Components
// ==================== // ====================
// New Components
&.new-component-item { &.new-component-item {
margin: 20px 0px; margin: $baseline 0px;
border-top: 1px solid $mediumGrey; border-top: 1px solid $mediumGrey;
box-shadow: 0 2px 1px rgba(182, 182, 182, 0.75) inset; box-shadow: 0 2px 1px rgba(182, 182, 182, 0.75) inset;
background-color: $lightGrey; background-color: $lightGrey;
margin-bottom: 0px; margin-bottom: 0px;
padding-bottom: 20px; padding-bottom: $baseline;
.new-component-button { .new-component-button {
display: block; display: block;
padding: 20px; padding: $baseline;
text-align: center; text-align: center;
color: #edf1f5; color: #edf1f5;
} }
h5 { h5 {
margin: 20px 0px; margin: $baseline 0px;
color: #fff; color: #fff;
font-weight: 600; font-weight: 600;
font-size: 18px; font-size: 18px;
...@@ -144,7 +135,7 @@ body.course.unit { ...@@ -144,7 +135,7 @@ body.course.unit {
height: 100px; height: 100px;
color: #fff; color: #fff;
margin-right: 15px; margin-right: 15px;
margin-bottom: 20px; margin-bottom: $baseline;
border-radius: 8px; border-radius: 8px;
font-size: 15px; font-size: 15px;
line-height: 14px; line-height: 14px;
...@@ -156,7 +147,7 @@ body.course.unit { ...@@ -156,7 +147,7 @@ body.course.unit {
bottom: 5px; bottom: 5px;
left: 0; left: 0;
width: 100%; width: 100%;
padding: 10px; padding: $baseline/2;
@include box-sizing(border-box); @include box-sizing(border-box);
color: #fff; color: #fff;
} }
...@@ -165,7 +156,7 @@ body.course.unit { ...@@ -165,7 +156,7 @@ body.course.unit {
.new-component-templates { .new-component-templates {
display: none; display: none;
margin: 20px 40px 20px 40px; margin: $baseline 2*$baseline;
border-radius: 3px; border-radius: 3px;
border: 1px solid $mediumGrey; border: 1px solid $mediumGrey;
background-color: #fff; background-color: #fff;
...@@ -173,7 +164,7 @@ body.course.unit { ...@@ -173,7 +164,7 @@ body.course.unit {
@include clearfix; @include clearfix;
.cancel-button { .cancel-button {
margin: 20px 0px 10px 10px; margin: $baseline 0px $baseline/2 $baseline/2;
@include white-button; @include white-button;
} }
...@@ -183,7 +174,7 @@ body.course.unit { ...@@ -183,7 +174,7 @@ body.course.unit {
// specific menu types // specific menu types
&.new-component-problem { &.new-component-problem {
padding-bottom:10px; padding-bottom: $baseline/2;
[class^="icon-"], .editor-indicator { [class^="icon-"], .editor-indicator {
display: inline-block; display: inline-block;
...@@ -220,7 +211,7 @@ body.course.unit { ...@@ -220,7 +211,7 @@ body.course.unit {
@include box-shadow(0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 -1px 0 rgba(0, 0, 0, 0.2) inset); @include box-shadow(0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 -1px 0 rgba(0, 0, 0, 0.2) inset);
li:first-child { li:first-child {
margin-left: 20px; margin-left: $baseline;
} }
li { li {
...@@ -231,17 +222,17 @@ body.course.unit { ...@@ -231,17 +222,17 @@ body.course.unit {
@include linear-gradient(top, rgba(255, 255, 255, .4), rgba(255, 255, 255, 0)); @include linear-gradient(top, rgba(255, 255, 255, .4), rgba(255, 255, 255, 0));
background-color: tint($lightBluishGrey, 10%); background-color: tint($lightBluishGrey, 10%);
@include box-shadow(0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 -1px 0 rgba(0, 0, 0, 0.2) inset); @include box-shadow(0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 -1px 0 rgba(0, 0, 0, 0.2) inset);
opacity:.8; opacity: 0.8;
&:hover { &:hover {
opacity:.9; opacity: 0.9;
background-color: tint($lightBluishGrey, 20%); background-color: tint($lightBluishGrey, 20%);
} }
&.ui-state-active { &.ui-state-active {
border: 0px; border: 0px;
@include active; @include active;
opacity:1; opacity: 1.0;
} }
} }
...@@ -292,7 +283,7 @@ body.course.unit { ...@@ -292,7 +283,7 @@ body.course.unit {
a { a {
@include clearfix(); @include clearfix();
display: block; display: block;
padding: 7px 20px; padding: 7px $baseline;
border-bottom: none; border-bottom: none;
font-weight: 500; font-weight: 500;
...@@ -367,9 +358,9 @@ body.course.unit { ...@@ -367,9 +358,9 @@ body.course.unit {
} }
} }
// Component Drag and Drop, Non-Edit Module Rendering, Styling
// ==================== // ====================
// Component Drag and Drop, Non-Edit Module Rendering, Styling
.component { .component {
border: 1px solid $lightBluishGrey2; border: 1px solid $lightBluishGrey2;
border-radius: 3px; border-radius: 3px;
...@@ -416,7 +407,7 @@ body.course.unit { ...@@ -416,7 +407,7 @@ body.course.unit {
} }
.xmodule_display { .xmodule_display {
padding: 40px 20px 20px; padding: 2*$baseline $baseline $baseline;
overflow-x: auto; overflow-x: auto;
h1 { h1 {
...@@ -424,10 +415,9 @@ body.course.unit { ...@@ -424,10 +415,9 @@ body.course.unit {
margin-left: 0; margin-left: 0;
} }
} }
// Component Editing
// ==================== // ====================
// Component Editing
.wrapper-component-editor { .wrapper-component-editor {
z-index: 9999; z-index: 9999;
position: relative; position: relative;
...@@ -442,7 +432,7 @@ body.course.unit { ...@@ -442,7 +432,7 @@ body.course.unit {
border-radius: 2px 2px 0 0; border-radius: 2px 2px 0 0;
h3 { h3 {
margin-bottom: 10px; margin-bottom: $baseline/2;
font-size: 18px; font-size: 18px;
font-weight: 700; font-weight: 700;
} }
...@@ -460,24 +450,21 @@ body.course.unit { ...@@ -460,24 +450,21 @@ body.course.unit {
// Module Actions, also used for Static Pages // Module Actions, also used for Static Pages
.module-actions { .module-actions {
@include box-shadow(inset 0 1px 1px $shadow); @include box-shadow(inset 0 1px 1px $shadow);
padding: 0px 0 10px 10px; padding: 0 0 $baseline $baseline;
background-color: $gray-l6; background-color: $gray-l6;
.save-button { .save-button {
margin: ($baseline/2) 8px 0 0; margin: ($baseline/2) 8px 0 0;
} }
} }
} }
} }
} }
// Edit Header (Component Name, Mode-Editor, Mode-Settings) // Edit Header (Component Name, Mode-Editor, Mode-Settings)
.component-edit-header { .component-edit-header {
@include box-sizing(border-box); @include box-sizing(border-box);
padding: 18px 0 18px 20px; padding: 18px 0 18px $baseline;
top: 0; top: 0;
right: 0; right: 0;
background-color: $blue; background-color: $blue;
...@@ -580,9 +567,9 @@ body.course.unit { ...@@ -580,9 +567,9 @@ body.course.unit {
//component-setting-entry //component-setting-entry
.field.comp-setting-entry { .field.comp-setting-entry {
background-color: $white; background-color: $white;
padding: 20px; padding: $baseline;
border-bottom: 1px solid $gray-l2; border-bottom: 1px solid $gray-l2;
opacity: .8; opacity: 0.7;
&:last-child { &:last-child {
//margin-bottom: 0; //margin-bottom: 0;
...@@ -601,23 +588,16 @@ body.course.unit { ...@@ -601,23 +588,16 @@ body.course.unit {
&:hover { &:hover {
@include transition(opacity 0.25s ease-in-out); @include transition(opacity 0.25s ease-in-out);
opacity: 1; opacity: 1.0;
} }
&.is-set { &.is-set {
opacity: 1; opacity: 1.0;
background-color: $white; background-color: $white;
//setting-label
.setting-label { }
//setting-input
.setting-input { .setting-input {
color: $blue-l1; color: $blue-l1;
} }
//setting-clear
.setting-clear { }
} }
.wrapper-comp-setting{ .wrapper-comp-setting{
...@@ -694,11 +674,11 @@ body.course.unit { ...@@ -694,11 +674,11 @@ body.course.unit {
&:focus { &:focus {
@include box-shadow(0 0 1px $shadow); @include box-shadow(0 0 1px $shadow);
@include transition(opacity 0.25s ease-in-out); @include transition(opacity 0.25s ease-in-out);
background-color: #FFFCF1; background-color: $yellow;
} }
&:active { &:active {
background-color: #FFFCF1; background-color: $yellow;
} }
} }
...@@ -710,7 +690,7 @@ body.course.unit { ...@@ -710,7 +690,7 @@ body.course.unit {
vertical-align: middle; vertical-align: middle;
padding: 5px; padding: 5px;
border-radius: 50%; border-radius: 50%;
margin: 0 10px; margin: 0 $baseline/2;
box-shadow: none; box-shadow: none;
text-shadow: none; text-shadow: none;
border: 1px solid $gray-l1; border: 1px solid $gray-l1;
...@@ -740,10 +720,9 @@ body.course.unit { ...@@ -740,10 +720,9 @@ body.course.unit {
} }
} }
} }
// Editing Units from Courseware
// ==================== // ====================
// Editing Units from Courseware
body.unit { body.unit {
.component { .component {
...@@ -765,13 +744,12 @@ body.unit { ...@@ -765,13 +744,12 @@ body.unit {
} }
} }
} }
// Unit Page Sidebar
// ==================== // ====================
// Unit Page Sidebar
.unit-settings { .unit-settings {
.window-contents { .window-contents {
padding: 10px 20px; padding: $baseline/2 $baseline;
} }
.unit-actions { .unit-actions {
...@@ -781,7 +759,7 @@ body.unit { ...@@ -781,7 +759,7 @@ body.unit {
.published-alert { .published-alert {
display: none; display: none;
padding: 10px; padding: $baseline/2;
border: 1px solid #edbd3c; border: 1px solid #edbd3c;
border-radius: 3px; border-radius: 3px;
background: #fbf6e1; background: #fbf6e1;
...@@ -807,7 +785,7 @@ body.unit { ...@@ -807,7 +785,7 @@ body.unit {
.preview-button, .view-button { .preview-button, .view-button {
@include white-button; @include white-button;
margin-bottom: 10px; margin-bottom: $baseline/2;
} }
.publish-button { .publish-button {
...@@ -827,7 +805,7 @@ body.unit { ...@@ -827,7 +805,7 @@ body.unit {
.publish-button, .publish-button,
.view-button { .view-button {
font-size: 11px; font-size: 11px;
margin-top: 10px; margin-top: $baseline/2;
padding: 6px 15px 8px; padding: 6px 15px 8px;
} }
} }
...@@ -849,7 +827,7 @@ body.unit { ...@@ -849,7 +827,7 @@ body.unit {
li { li {
display: block; display: block;
padding: 6px 8px 8px 10px; padding: 6px 8px 8px $baseline/2;
background: #edf1f5; background: #edf1f5;
font-size: 12px; font-size: 12px;
...@@ -880,7 +858,7 @@ body.unit { ...@@ -880,7 +858,7 @@ body.unit {
.url { .url {
@include box-shadow(none); @include box-shadow(none);
width: 100%; width: 100%;
margin-bottom: 10px; margin-bottom: $baseline/2;
} }
.draft-tag, .draft-tag,
...@@ -906,11 +884,11 @@ body.unit { ...@@ -906,11 +884,11 @@ body.unit {
ol { ol {
.section-item { .section-item {
padding-left: 20px; padding-left: $baseline;
} }
.new-unit-item { .new-unit-item {
margin-left: 20px; margin-left: $baseline;
} }
} }
...@@ -920,7 +898,7 @@ body.unit { ...@@ -920,7 +898,7 @@ body.unit {
} }
.new-unit-item { .new-unit-item {
margin: 0 0 10px 41px; margin: 0 0 $baseline 41px;
} }
} }
} }
...@@ -967,23 +945,23 @@ body.unit { ...@@ -967,23 +945,23 @@ body.unit {
display: none; display: none;
} }
} }
// ====================
// Latex Compiler // Latex Compiler
// ====================
.launch-latex-compiler { .launch-latex-compiler {
background-color: $white; background-color: $white;
padding: 10px 0 10px 20px; padding: $baseline/2 0 $baseline/2 $baseline;
border-bottom: 1px solid $gray-l2; border-bottom: 1px solid $gray-l2;
opacity: .8; opacity: 0.8;
&:hover { &:hover {
@include transition(opacity 0.25s ease-in-out); @include transition(opacity 0.25s ease-in-out);
opacity: 1; opacity: 1.0s;
} }
} }
//hides latex compiler button if settings mode is-active // hides latex compiler button if settings mode is-active
div.wrapper-comp-editor.is-inactive + div.launch-latex-compiler{ div.wrapper-comp-editor.is-inactive + div.launch-latex-compiler{
display: none; display: none;
} }
common/lib/xmodule/xmodule/css/sequence/display.scss
...@@ -170,7 +170,7 @@ nav.sequence-nav { ...@@ -170,7 +170,7 @@ nav.sequence-nav {
font-family: $sans-serif; font-family: $sans-serif;
line-height: lh(); line-height: lh();
left: 0px; left: 0px;
opacity: 0; opacity: 0.0;
padding: 6px; padding: 6px;
position: absolute; position: absolute;
top: 48px; top: 48px;
...@@ -204,7 +204,7 @@ nav.sequence-nav { ...@@ -204,7 +204,7 @@ nav.sequence-nav {
p { p {
display: block; display: block;
margin-top: 4px; margin-top: 4px;
opacity: 1; opacity: 1.0;
} }
} }
} }
...@@ -248,12 +248,12 @@ nav.sequence-nav { ...@@ -248,12 +248,12 @@ nav.sequence-nav {
} }
&:hover { &:hover {
opacity: .5; opacity: 0.5;
} }
&.disabled { &.disabled {
cursor: normal; cursor: normal;
opacity: .4; opacity: 0.4;
} }
} }
} }
...@@ -320,12 +320,12 @@ nav.sequence-bottom { ...@@ -320,12 +320,12 @@ nav.sequence-bottom {
outline: 0; outline: 0;
&:hover { &:hover {
opacity: .5; opacity: 0.5;
background-position: center 15px; background-position: center 15px;
} }
&.disabled { &.disabled {
opacity: .4; opacity: 0.4;
} }
&:focus { &:focus {
......
common/lib/xmodule/xmodule/css/video/display.scss
...@@ -41,7 +41,7 @@ div.video { ...@@ -41,7 +41,7 @@ div.video {
&:hover { &:hover {
ul, div { ul, div {
opacity: 1; opacity: 1.0;
} }
} }
...@@ -158,7 +158,7 @@ div.video { ...@@ -158,7 +158,7 @@ div.video {
ol.video_speeds { ol.video_speeds {
display: block; display: block;
opacity: 1; opacity: 1.0;
padding: 0; padding: 0;
margin: 0; margin: 0;
list-style: none; list-style: none;
...@@ -208,7 +208,7 @@ div.video { ...@@ -208,7 +208,7 @@ div.video {
} }
&:hover, &:active, &:focus { &:hover, &:active, &:focus {
opacity: 1; opacity: 1.0;
background-color: #444; background-color: #444;
} }
} }
...@@ -221,7 +221,7 @@ div.video { ...@@ -221,7 +221,7 @@ div.video {
border: 1px solid #000; border: 1px solid #000;
bottom: 46px; bottom: 46px;
display: none; display: none;
opacity: 0; opacity: 0.0;
position: absolute; position: absolute;
width: 133px; width: 133px;
z-index: 10; z-index: 10;
...@@ -264,7 +264,7 @@ div.video { ...@@ -264,7 +264,7 @@ div.video {
&.open { &.open {
.volume-slider-container { .volume-slider-container {
display: block; display: block;
opacity: 1; opacity: 1.0;
} }
} }
...@@ -302,7 +302,7 @@ div.video { ...@@ -302,7 +302,7 @@ div.video {
border: 1px solid #000; border: 1px solid #000;
bottom: 46px; bottom: 46px;
display: none; display: none;
opacity: 0; opacity: 0.0;
position: absolute; position: absolute;
width: 45px; width: 45px;
height: 125px; height: 125px;
...@@ -395,7 +395,7 @@ div.video { ...@@ -395,7 +395,7 @@ div.video {
font-weight: 800; font-weight: 800;
line-height: 46px; //height of play pause buttons line-height: 46px; //height of play pause buttons
margin-left: 0; margin-left: 0;
opacity: 1; opacity: 1.0;
padding: 0 lh(.5); padding: 0 lh(.5);
position: relative; position: relative;
text-indent: -9999px; text-indent: -9999px;
...@@ -410,7 +410,7 @@ div.video { ...@@ -410,7 +410,7 @@ div.video {
} }
&.off { &.off {
opacity: .7; opacity: 0.7;
} }
} }
} }
...@@ -418,7 +418,7 @@ div.video { ...@@ -418,7 +418,7 @@ div.video {
&:hover section.video-controls { &:hover section.video-controls {
ul, div { ul, div {
opacity: 1; opacity: 1.0;
} }
div.slider { div.slider {
......
common/lib/xmodule/xmodule/css/videoalpha/display.scss
...@@ -41,7 +41,7 @@ div.video { ...@@ -41,7 +41,7 @@ div.video {
&:hover { &:hover {
ul, div { ul, div {
opacity: 1; opacity: 1.0;
} }
} }
...@@ -158,7 +158,7 @@ div.video { ...@@ -158,7 +158,7 @@ div.video {
ol.video_speeds { ol.video_speeds {
display: block; display: block;
opacity: 1; opacity: 1.0;
padding: 0; padding: 0;
margin: 0; margin: 0;
list-style: none; list-style: none;
...@@ -208,7 +208,7 @@ div.video { ...@@ -208,7 +208,7 @@ div.video {
} }
&:hover, &:active, &:focus { &:hover, &:active, &:focus {
opacity: 1; opacity: 1.0;
background-color: #444; background-color: #444;
} }
} }
...@@ -221,7 +221,7 @@ div.video { ...@@ -221,7 +221,7 @@ div.video {
border: 1px solid #000; border: 1px solid #000;
bottom: 46px; bottom: 46px;
display: none; display: none;
opacity: 0; opacity: 0.0;
position: absolute; position: absolute;
width: 133px; width: 133px;
z-index: 10; z-index: 10;
...@@ -264,7 +264,7 @@ div.video { ...@@ -264,7 +264,7 @@ div.video {
&.open { &.open {
.volume-slider-container { .volume-slider-container {
display: block; display: block;
opacity: 1; opacity: 1.0;
} }
} }
...@@ -302,7 +302,7 @@ div.video { ...@@ -302,7 +302,7 @@ div.video {
border: 1px solid #000; border: 1px solid #000;
bottom: 46px; bottom: 46px;
display: none; display: none;
opacity: 0; opacity: 0.0;
position: absolute; position: absolute;
width: 45px; width: 45px;
height: 125px; height: 125px;
...@@ -395,7 +395,7 @@ div.video { ...@@ -395,7 +395,7 @@ div.video {
font-weight: 800; font-weight: 800;
line-height: 46px; //height of play pause buttons line-height: 46px; //height of play pause buttons
margin-left: 0; margin-left: 0;
opacity: 1; opacity: 1.0;
padding: 0 lh(.5); padding: 0 lh(.5);
position: relative; position: relative;
text-indent: -9999px; text-indent: -9999px;
...@@ -410,7 +410,7 @@ div.video { ...@@ -410,7 +410,7 @@ div.video {
} }
&.off { &.off {
opacity: .7; opacity: 0.7;
} }
} }
} }
...@@ -418,7 +418,7 @@ div.video { ...@@ -418,7 +418,7 @@ div.video {
&:hover section.video-controls { &:hover section.video-controls {
ul, div { ul, div {
opacity: 1; opacity: 1.0;
} }
div.slider { div.slider {
......
lms/static/sass/_discussion.scss
...@@ -85,8 +85,8 @@ ...@@ -85,8 +85,8 @@
} }
@-webkit-keyframes fadeIn { @-webkit-keyframes fadeIn {
0% { opacity: 0; } 0% { opacity: 0.0; }
100% { opacity: 1; } 100% { opacity: 1.0; }
} }
...@@ -736,11 +736,11 @@ body.discussion { ...@@ -736,11 +736,11 @@ body.discussion {
&.is-open { &.is-open {
.browse-topic-drop-btn span { .browse-topic-drop-btn span {
opacity: 1; opacity: 1.0;
} }
.browse-topic-drop-icon { .browse-topic-drop-icon {
opacity: 0; opacity: 0.0;
} }
&.is-dropped { &.is-dropped {
...@@ -788,7 +788,7 @@ body.discussion { ...@@ -788,7 +788,7 @@ body.discussion {
&::-webkit-input-placeholder, &::-webkit-input-placeholder,
&:-moz-placeholder, &:-moz-placeholder,
&:-ms-input-placeholder { &:-ms-input-placeholder {
opacity: 1; opacity: 1.0;
} }
} }
} }
...@@ -818,7 +818,7 @@ body.discussion { ...@@ -818,7 +818,7 @@ body.discussion {
line-height: 58px; line-height: 58px;
color: #333; color: #333;
text-shadow: 0 1px 0 rgba(255, 255, 255, .8); text-shadow: 0 1px 0 rgba(255, 255, 255, .8);
opacity: 0; opacity: 0.0;
@include transition(opacity .2s); @include transition(opacity .2s);
} }
} }
...@@ -833,7 +833,7 @@ body.discussion { ...@@ -833,7 +833,7 @@ body.discussion {
height: 16px; height: 16px;
margin-left: -12px; margin-left: -12px;
background: url(../images/browse-icon.png) no-repeat; background: url(../images/browse-icon.png) no-repeat;
opacity: 1; opacity: 1.0;
@include transition(none); @include transition(none);
} }
...@@ -967,7 +967,7 @@ body.discussion { ...@@ -967,7 +967,7 @@ body.discussion {
&::-webkit-input-placeholder, &::-webkit-input-placeholder,
&:-moz-placeholder, &:-moz-placeholder,
&:-ms-input-placeholder { &:-ms-input-placeholder {
opacity: 0; opacity: 0.0;
@include transition(opacity .2s); @include transition(opacity .2s);
} }
...@@ -2454,7 +2454,7 @@ body.discussion { ...@@ -2454,7 +2454,7 @@ body.discussion {
font-style: italic; font-style: italic;
cursor:pointer; cursor:pointer;
margin-right: 10px; margin-right: 10px;
opacity:.8; opacity: 0.8;
span { span {
cursor: pointer; cursor: pointer;
...@@ -2462,7 +2462,7 @@ body.discussion { ...@@ -2462,7 +2462,7 @@ body.discussion {
&:hover { &:hover {
@include transition(opacity .2s); @include transition(opacity .2s);
opacity: 1; opacity: 1.0;
} }
} }
...@@ -2475,7 +2475,7 @@ body.discussion { ...@@ -2475,7 +2475,7 @@ body.discussion {
top:-13px; top:-13px;
margin-right:35px; margin-right:35px;
margin-top:13px; margin-top:13px;
opacity: 1; opacity: 1.0;
} }
.notpinned .icon { .notpinned .icon {
...@@ -2523,11 +2523,11 @@ display:none; ...@@ -2523,11 +2523,11 @@ display:none;
padding-right: 5px; padding-right: 5px;
font-style: italic; font-style: italic;
cursor:pointer; cursor:pointer;
opacity:.8; opacity: 0.8;
&:hover { &:hover {
@include transition(opacity .2s); @include transition(opacity .2s);
opacity: 1; opacity: 1.0;
} }
} }
......
lms/static/sass/base/_animations.scss
...@@ -9,12 +9,12 @@ ...@@ -9,12 +9,12 @@
@mixin home-header-pop-up-keyframes { @mixin home-header-pop-up-keyframes {
0% { 0% {
opacity: 0; opacity: 0.0;
top: 300px; top: 300px;
//@include transform(scale(0.9)); //@include transform(scale(0.9));
} }
45% { 45% {
opacity: 1; opacity: 1.0;
} }
65% { 65% {
top: -40px; top: -40px;
...@@ -43,19 +43,19 @@ ...@@ -43,19 +43,19 @@
@mixin title-appear-keyframes { @mixin title-appear-keyframes {
0% { 0% {
opacity: 0; opacity: 0.0;
top: 60px; top: 60px;
@include transform(scale(0.9)); @include transform(scale(0.9));
} }
20% { 20% {
opacity: 1; opacity: 1.0;
} }
27% { // this % of total-time should be ~ 1.25s 27% { // this % of total-time should be ~ 1.25s
top: 40px; top: 40px;
@include transform(scale(1)); @include transform(scale(1));
} }
90% { // this % of total-time is when 2nd half of animation starts 90% { // this % of total-time is when 2nd half of animation starts
opacity: 1; opacity: 1.0;
top: 40px; top: 40px;
@include transform(scale(1)); @include transform(scale(1));
} }
...@@ -79,24 +79,24 @@ ...@@ -79,24 +79,24 @@
@mixin home-appear-keyframes { @mixin home-appear-keyframes {
0% { 0% {
opacity: 0; opacity: 0.0;
top: 60px; top: 60px;
@include transform(scale(0.9)); @include transform(scale(0.9));
} }
20% { 20% {
opacity: 1; opacity: 1.0;
} }
30% { // this % of total-time should be ~ 1.25s 30% { // this % of total-time should be ~ 1.25s
top: 40px; top: 40px;
@include transform(scale(1)); @include transform(scale(1));
} }
80% { // this % of total-time is when 2nd half of animation starts 80% { // this % of total-time is when 2nd half of animation starts
opacity: 1; opacity: 1.0;
top: 40px; top: 40px;
@include transform(scale(1)); @include transform(scale(1));
} }
100% { 100% {
opacity: 0; opacity: 0.0;
top: 60px; top: 60px;
@include transform(scale(0.7)); @include transform(scale(0.7));
} }
...@@ -117,10 +117,10 @@ ...@@ -117,10 +117,10 @@
@mixin edx-appear-keyframes { @mixin edx-appear-keyframes {
0% { 0% {
opacity: 0; opacity: 0.0;
} }
100% { 100% {
opacity: 1; opacity: 1.0;
} }
} }
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
opacity: 0.9; opacity: 0.9;
} }
80% { 80% {
opacity: 1; opacity: 1.0;
} }
100% { 100% {
bottom: 0px; bottom: 0px;
......
lms/static/sass/course/_textbook.scss
...@@ -38,7 +38,7 @@ div.book-wrapper { ...@@ -38,7 +38,7 @@ div.book-wrapper {
line-height: 2.1em; line-height: 2.1em;
text-align: right; text-align: right;
color: #9a9a9a; color: #9a9a9a;
opacity: 0; opacity: 0.0;
@include transition(opacity .15s); @include transition(opacity .15s);
} }
...@@ -55,7 +55,7 @@ div.book-wrapper { ...@@ -55,7 +55,7 @@ div.book-wrapper {
background-color: transparent; background-color: transparent;
.page-number { .page-number {
opacity: 1; opacity: 1.0;
} }
} }
} }
...@@ -119,7 +119,7 @@ div.book-wrapper { ...@@ -119,7 +119,7 @@ div.book-wrapper {
@include box-sizing(border-box); @include box-sizing(border-box);
display: table; display: table;
height: 100%; height: 100%;
opacity: 0; opacity: 0.0;
filter: alpha(opacity=0); filter: alpha(opacity=0);
text-indent: -9999px; text-indent: -9999px;
@include transition; @include transition;
...@@ -127,7 +127,7 @@ div.book-wrapper { ...@@ -127,7 +127,7 @@ div.book-wrapper {
width: 100%; width: 100%;
&:hover { &:hover {
opacity: 1; opacity: 1.0;
filter: alpha(opacity=100); filter: alpha(opacity=100);
} }
} }
......
lms/static/sass/course/courseware/_sidebar.scss
...@@ -61,7 +61,7 @@ section.course-index { ...@@ -61,7 +61,7 @@ section.course-index {
span.ui-icon { span.ui-icon {
left: 0; left: 0;
background-image: url("/static/images/ui-icons_222222_256x240.png"); background-image: url("/static/images/ui-icons_222222_256x240.png");
opacity: .3; opacity: 0.3;
} }
} }
} }
...@@ -146,7 +146,7 @@ section.course-index { ...@@ -146,7 +146,7 @@ section.course-index {
@include box-shadow(inset 0 1px 14px 0 rgba(0,0,0, 0.1)); @include box-shadow(inset 0 1px 14px 0 rgba(0,0,0, 0.1));
&:after { &:after {
opacity: 1; opacity: 1.0;
right: 15px; right: 15px;
} }
} }
...@@ -174,7 +174,7 @@ section.course-index { ...@@ -174,7 +174,7 @@ section.course-index {
background: $sidebar-active-image; background: $sidebar-active-image;
&:after { &:after {
opacity: 1; opacity: 1.0;
right: 15px; right: 15px;
} }
......
lms/static/sass/course/layout/_calculator.scss
...@@ -27,7 +27,7 @@ div.calc-main { ...@@ -27,7 +27,7 @@ div.calc-main {
width: 16px; width: 16px;
&:hover { &:hover {
opacity: .8; opacity: 0.8;
} }
&.closed { &.closed {
...@@ -136,7 +136,7 @@ div.calc-main { ...@@ -136,7 +136,7 @@ div.calc-main {
&.shown { &.shown {
display: block; display: block;
opacity: 1; opacity: 1.0;
} }
dt { dt {
......
lms/static/sass/ie.scss
...@@ -26,7 +26,7 @@ header.global { ...@@ -26,7 +26,7 @@ header.global {
} }
h2 { h2 {
opacity: 1; opacity: 1.0;
} }
} }
...@@ -51,7 +51,7 @@ header.global { ...@@ -51,7 +51,7 @@ header.global {
text-decoration: none; text-decoration: none;
&::before { &::before {
opacity: 1; opacity: 1.0;
} }
.name { .name {
......
lms/static/sass/multicourse/_course_about.scss
...@@ -429,7 +429,7 @@ ...@@ -429,7 +429,7 @@
&:hover { &:hover {
.sharing-message { .sharing-message {
opacity: 1; opacity: 1.0;
top: 56px; top: 56px;
} }
} }
...@@ -470,7 +470,7 @@ ...@@ -470,7 +470,7 @@
width: 44px; width: 44px;
&:hover { &:hover {
opacity: 1; opacity: 1.0;
} }
img { img {
...@@ -514,7 +514,7 @@ ...@@ -514,7 +514,7 @@
&:hover { &:hover {
.icon { .icon {
opacity: 1; opacity: 1.0;
} }
} }
......
lms/static/sass/multicourse/_dashboard.scss
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
&:hover { &:hover {
.title .icon { .title .icon {
opacity: 1; opacity: 1.0;
} }
} }
......
lms/static/sass/multicourse/_home.scss
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
@include box-sizing(border-box); @include box-sizing(border-box);
@include inline-block; @include inline-block;
left: 0px; left: 0px;
opacity: 1; opacity: 1.0;
padding: 20px 30px; padding: 20px 30px;
top: 0px; top: 0px;
@include transition(all, 0.2s, linear); @include transition(all, 0.2s, linear);
...@@ -312,7 +312,7 @@ ...@@ -312,7 +312,7 @@
text-decoration: none; text-decoration: none;
&::before { &::before {
opacity: 1; opacity: 1.0;
} }
.name { .name {
......
lms/static/sass/shared/_course_object.scss
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
.info-link { .info-link {
color: $link-color; color: $link-color;
opacity: 1; opacity: 1.0;
} }
h2 { h2 {
......
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