Commit 486d085d by cahrens

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