Skip to content

E
edx-platform
Commit 4cd2114f by Brian Talbot
Options

grading - finalized style/states for grading UI on courseware overview

parent bdebc602
Showing with 110 additions and 107 deletions
cms/static/sass/_courseware.scss
...@@ -66,13 +66,13 @@ input.courseware-unit-search-input { ...@@ -66,13 +66,13 @@ input.courseware-unit-search-input {
min-height: 75px; min-height: 75px;
@include clearfix(); @include clearfix();
.item-details, .section-published-date, .gradable-status { .item-details, .section-published-date {
float: left; display: inline-block;
} }
.item-details { .item-details {
padding: 20px 0 10px 0; padding: 20px 0 10px 0;
width: 800px; @include clearfix();
.section-name { .section-name {
float: left; float: left;
...@@ -110,6 +110,7 @@ input.courseware-unit-search-input { ...@@ -110,6 +110,7 @@ input.courseware-unit-search-input {
} }
.section-published-date { .section-published-date {
float: left;
width: 265px; width: 265px;
margin-right: 10px; margin-right: 10px;
padding: 4px 10px; padding: 4px 10px;
...@@ -139,106 +140,107 @@ input.courseware-unit-search-input { ...@@ -139,106 +140,107 @@ input.courseware-unit-search-input {
padding: 3px 15px 5px; padding: 3px 15px 5px;
} }
} }
}
.gradable-status { .gradable-status {
position: relative; position: absolute;
top: 1px; top: 20px;
width: 145px; right: 70px;
width: 145px;
.status-label {
position: absolute;
top: 0;
right: 2px;
display: none;
width: 105px;
padding: 10px 20px 10px 10px;
@include border-radius(3px);
background: $lightGrey;
color: $lightGrey;
font-size: 12px;
font-weight: bold;
line-height: 16px;
}
.status-label { .menu-toggle {
position: absolute; z-index: 10;
top: 0; position: absolute;
right: 2px; top: 0;
display: none; right: 5px;
width: 100px; padding: 5px;
padding: 10px 20px 10px 10px; color: $lightGrey;
@include border-radius(3px);
background: $lightGrey;
color: $lightGrey;
font-size: 12px;
font-weight: bold;
line-height: 16px;
}
.menu-toggle { &:hover, &.is-active {
z-index: 10; color: $blue;
position: absolute;
top: 0;
right: 5px;
padding: 5px;
color: $lightGrey;
&:hover, &.is-active {
color: $blue;
}
} }
}
.menu { .menu {
z-index: 1; z-index: 1;
display: block; display: block;
opacity: 0.0; opacity: 0.0;
position: absolute; position: absolute;
top: -1px; top: -1px;
left: 2px; left: 2px;
margin: 0; margin: 0;
padding: 8px 12px; padding: 8px 12px;
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 {
width: 115px; width: 115px;
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 {
color: $darkGrey; color: $darkGrey;
}
} }
} }
}
a { a {
&.is-selected { &.is-selected {
font-weight: bold; font-weight: bold;
}
} }
} }
}
// dropdown state // dropdown state
&.is-active { &.is-active {
.menu { .menu {
z-index: 1000; z-index: 1000;
opacity: 1.0; opacity: 1.0;
} }
.menu-toggle { .menu-toggle {
z-index: 10000; z-index: 10000;
}
} }
}
// 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;
}
} }
} }
} }
...@@ -324,20 +326,20 @@ input.courseware-unit-search-input { ...@@ -324,20 +326,20 @@ input.courseware-unit-search-input {
} }
.gradable-status { .gradable-status {
float: left; float: right;
position: relative; position: relative;
top: -4px; top: -4px;
right: 50px;
width: 145px; width: 145px;
.status-label { .status-label {
position: absolute; position: absolute;
top: 0; top: 2px;
right: 2px; right: -5px;
display: none; display: none;
width: 100px; width: 110px;
padding: 10px 20px 10px 10px; padding: 5px 20px 5px 10px;
@include border-radius(3px); @include border-radius(3px);
background: $lightGrey;
color: $lightGrey; color: $lightGrey;
font-size: 12px; font-size: 12px;
font-weight: bold; font-weight: bold;
...@@ -392,6 +394,7 @@ input.courseware-unit-search-input { ...@@ -392,6 +394,7 @@ input.courseware-unit-search-input {
} }
a { a {
color: $blue;
&.is-selected { &.is-selected {
font-weight: bold; font-weight: bold;
......
cms/templates/overview.html
...@@ -168,24 +168,24 @@ ...@@ -168,24 +168,24 @@
<span class="published-status"><strong>Will Release:</strong> ${start_date_str} at ${start_time_str}</span> <span class="published-status"><strong>Will Release:</strong> ${start_date_str} at ${start_time_str}</span>
<a href="#" class="edit-button" data-date="${start_date_str}" data-time="${start_time_str}" data-id="${section.location}">Edit</a> <a href="#" class="edit-button" data-date="${start_date_str}" data-time="${start_time_str}" data-id="${section.location}">Edit</a>
%endif %endif
</div> </div>
</div>
<div class="gradable-status">
<h4 class="status-label">Not Graded</h4>
<div class="gradable-status"> <a class="menu-toggle" href="#">
<h4 class="status-label">Not Graded</h4> <span class="ss-icon ss-standard">&#x2713;</span>
</a>
<a class="menu-toggle" href="#">
<span class="ss-icon ss-standard">&#x2713;</span> <ul class="menu">
</a> <li><a class="is-selected" href="#">Homework</a></li>
<li><a href="#">Finger Exercises</a></li>
<ul class="menu"> <li><a href="#">Lab</a></li>
<li><a class="is-selected" href="#">Homework</a></li> <li><a href="#">Midterm Exam</a></li>
<li><a href="#">Finger Exercises</a></li> <li><a href="#">Final Exam</a></li>
<li><a href="#">Lab</a></li> <li><a class="gradable-status-notgraded" href="#">Not Graded</a></li>
<li><a href="#">Midterm Exam</a></li> </ul>
<li><a href="#">Final Exam</a></li>
<li><a class="gradable-status-notgraded" href="#">Not Graded</a></li>
</ul>
</div>
</div> </div>
<div class="item-actions"> <div class="item-actions">
......
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