Skip to content

E
edx-platform
Commit ab810006 by marco
Options

visual styling changes to staff grading and peer grading, along with additional… 

visual styling changes to staff grading and peer grading, along with additional instances of the use of the baseline variable instead of pixel definitions for padding and margins.
parent 910523ee
Showing with 104 additions and 113 deletions
common/lib/xmodule/xmodule/css/capa/display.scss
...@@ -282,10 +282,9 @@ section.problem { ...@@ -282,10 +282,9 @@ section.problem {
.grader-status { .grader-status {
@include clearfix; @include clearfix;
margin-bottom: $baseline; margin: $baseline/2 0;
padding: 9px; padding: $baseline/2;
border: 1px solid #ddd; border-radius: 5px;
border-top: 0;
background: #F6F6F6; background: #F6F6F6;
span { span {
...@@ -311,11 +310,11 @@ section.problem { ...@@ -311,11 +310,11 @@ section.problem {
} }
&.file { &.file {
background: #fff;
margin-top: $baseline; margin-top: $baseline;
padding: $baseline 0 0 0; padding: $baseline 0 0 0;
border: 0; border: 0;
border-top: 1px solid #eee; border-top: 1px solid #eee;
background: #fff;
p.debug { p.debug {
display: none; display: none;
...@@ -335,8 +334,8 @@ section.problem { ...@@ -335,8 +334,8 @@ section.problem {
.feedback-on-feedback { .feedback-on-feedback {
height: 100px;
margin-right: $baseline; margin-right: $baseline;
height: 100px;
} }
.evaluation-response { .evaluation-response {
......
lms/static/sass/course/_staff_grading.scss
div.staff-grading, div.staff-grading,
div.peer-grading{ div.peer-grading{
padding: $baseline;
border: none;
textarea.feedback-area { textarea.feedback-area {
margin: 0;
height: 75px; height: 75px;
margin: 0px;
} }
ul.rubric-list{ ul.rubric-list{
margin: 0;
padding: 0;
list-style-type: none; list-style-type: none;
padding:0;
margin:0;
li { li {
&.rubric-list-item{ &.rubric-list-item{
margin-bottom: 0px; margin-bottom: 0;
padding: 0px; padding: 0;
} }
} }
} }
h1 { h1 {
margin : 0 0 0 10px; margin: 0 0 0 $baseline/2;
} }
h2{ h2 {
a a {
{
text-size: .5em; text-size: .5em;
} }
} }
div { div {
margin: 0px; margin: 0;
&.submission-container{ &.submission-container{
overflow-y: auto; @include clearfix;
height: 150px; overflow-y: auto;
background: #F6F6F6; height: 150px;
border: 1px solid #ddd; border: 1px solid #ddd;
@include clearfix; background: #F6F6F6;
} }
} }
label { label {
margin: 0px; margin: 0;
padding: 2px; padding: 2px;
min-width: 50px; min-width: 50px;
background-color: white; background-color: white;
...@@ -58,143 +62,127 @@ div.peer-grading{ ...@@ -58,143 +62,127 @@ div.peer-grading{
display: none; display: none;
} }
.problem-list .problem-list {
{
text-align: center;
table-layout: auto;
width:100%; width:100%;
th table-layout: auto;
{ text-align: center;
th {
padding: 2px; padding: 2px;
} }
td
{ td {
padding:2px; padding: 2px;
} }
td.problem-name
{ td.problem-name {
text-align:left; text-align: left;
} }
.ui-progressbar
{ .ui-progressbar {
height:1em; margin: 0;
margin:0px; padding: 0;
padding:0px; height: 1em;
} }
} }
.prompt-information-container, .prompt-information-container,
.rubric-wrapper, .rubric-wrapper,
.calibration-feedback-wrapper, .calibration-feedback-wrapper,
.grading-container .grading-container {
{ padding: $baseline/2 0;
padding: 2px;
} }
.error-container
{ .error-container {
background-color: #FFCCCC; margin-left: 0;
padding: 2px; padding: 2px;
margin-left: 0px; background-color: #ffcccc;
} }
.submission-wrapper
{ .submission-wrapper {
h3 padding: 2px;
{ padding-bottom: 15px;
h3 {
margin-bottom: 2px; margin-bottom: 2px;
} }
p
{ p {
margin-left:2px; margin-left: 2px;
} }
padding: 2px;
padding-bottom: 15px;
} }
.meta-info-wrapper .meta-info-wrapper {
{
background-color: #eee;
padding:2px; padding:2px;
div background-color: #eee;
{
display : inline; div {
display: inline;
} }
} }
.message-container, .message-container,
.grading-message .grading-message {
{ margin-left: 0;
background-color: $yellow;
padding: 2px; padding: 2px;
margin-left:0px; background-color: $yellow;
} }
.breadcrumbs .breadcrumbs {
{ margin: $baseline/2 $baseline/4;
margin-top:2px;
margin-left:0px;
margin-bottom:2px;
font-size: .8em; font-size: .8em;
} }
.instructions-panel .instructions-panel {
{ @include clearfix;
margin-right:2px; margin-right:2px;
> div
{ > div {
padding: 2px;
margin-bottom: 5px; margin-bottom: 5px;
padding: 2px;
width: 47.6%;
background: #eee; background: #eee;
width:47.6%;
h3 h3 {
{
text-align:center;
text-transform:uppercase;
color: #777; color: #777;
text-align: center;
text-transform: uppercase;
} }
p
{ p{
color: #777; color: #777;
} }
} }
.calibration-panel .calibration-panel {
{ float: left;
float:left;
} }
.grading-panel
{ .grading-panel {
float:right; float: right;
} }
.current-state .current-state {
{ background: #1d9dd9;
background: #1D9DD9;
h3, p h3, p {
{
color: white; color: white;
} }
} }
@include clearfix;
} }
.collapsible {
margin-left: 0;
.collapsible header {
{ margin-top: 2px;
margin-left: 0px; margin-bottom: 2px;
header
{
margin-top:2px;
margin-bottom:2px;
font-size: 1.2em; font-size: 1.2em;
} }
} }
.interstitial-page .interstitial-page {
{
text-align: center; text-align: center;
input[type=button]
{ input[type=button] {
margin-top: 20px; margin-top: $baseline;
} }
} }
padding: 15px;
border: none;
} }
lms/templates/combinedopenended/combined_open_ended_results.html
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<span class="section-header section-header-rubric">Submitted Rubric</span> <span class="section-header section-header-rubric">Submitted Rubric</span>
</div> </div>
<div class="oe-tools rubric-header"> <div class="oe-tools rubric-header">
<span class="oe-tools-label">Assessment Tools: </span> <span class="oe-tools-label"></span>
<button class="rubric-collapse" href="#">Show Score Only</button> <button class="rubric-collapse" href="#">Show Score Only</button>
% if len(results)>1: % if len(results)>1:
<a href="#" class="rubric-previous-button">Previous</a> <a href="#" class="rubric-previous-button">Previous</a>
......
lms/templates/peer_grading/peer_grading_problem.html
...@@ -14,7 +14,11 @@ ...@@ -14,7 +14,11 @@
</div> </div>
<div class="prompt-wrapper"> <div class="prompt-wrapper">
<h2>${_('Prompt')} <a href="#" class="question-header">${_('(Hide)')}</a></h2> <div class="visibility-control visibility-control-rubric">
<div class="inner">
</div>
<span class="section-header section-header-rubric">${_('Hide Prompt')}</span>
</div>
<div class="prompt-information-container"> <div class="prompt-information-container">
<section> <section>
<div class="prompt-container"> <div class="prompt-container">
......
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