Skip to content

E
edx-ora2
Commit 3e3cef09 by gradyward
Options

Merge pull request #487 from edx/grady/fix-styles 

Fixed a number of styles that were damaged by the javascript and HTML refactor.
parents 94a8ded7 11f81d4a
Showing with 81 additions and 108 deletions
openassessment/templates/openassessmentblock/edit/oa_edit_option.html
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
<label class="openassessment_criterion_option_name_label setting-label"> <label class="openassessment_criterion_option_name_label setting-label">
{% trans "Option Name"%} {% trans "Option Name"%}
<input <input
class="openassessment_criterion_option_name input input-label" class="openassessment_criterion_option_name input input-label"
type="text" type="text"
value="{{ option_name }}" value="{{ option_name }}"
> >
</label> </label>
</div> </div>
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
<label class="openassessment_criterion_option_points_label setting-label"> <label class="openassessment_criterion_option_points_label setting-label">
{% trans "Option Points"%} {% trans "Option Points"%}
<input <input
class="openassessment_criterion_option_points input setting-input" class="openassessment_criterion_option_points input setting-input"
type="number" type="number"
value="{{ option_points }}" value="{{ option_points }}"
min="0" min="0"
> >
</label> </label>
</div> </div>
......
openassessment/templates/openassessmentblock/edit/oa_edit_rubric.html
...@@ -37,10 +37,11 @@ ...@@ -37,10 +37,11 @@
<label for="openassessment_rubric_feedback" class="setting-label">{% trans "Feedback Direction" %}</label> <label for="openassessment_rubric_feedback" class="setting-label">{% trans "Feedback Direction" %}</label>
<textarea id="openassessment_rubric_feedback" class="input setting-input">{{ feedbackprompt }}</textarea> <textarea id="openassessment_rubric_feedback" class="input setting-input">{{ feedbackprompt }}</textarea>
</div> </div>
<p class="setting-help">
{% trans "If you would like your students to be able to provide feedback on the rubric, add a prompt to ask them for it." %}
</p>
</li> </li>
<p class="setting-help">
{% trans "If you would like your students to be able to provide feedback on the rubric, add a prompt to ask them for it." %}
</p>
</ul> </ul>
</div> </div>
</div> </div>
......
openassessment/xblock/static/css/openassessment.css
This source diff could not be displayed because it is too large. You can view the blob instead.
openassessment/xblock/static/sass/oa/utilities/_developer.scss
...@@ -221,6 +221,7 @@ ...@@ -221,6 +221,7 @@
border: none; border: none;
border-radius: 4px; border-radius: 4px;
padding: 10px; padding: 10px;
font-family: $f-sans-serif;
textarea{ textarea{
font-size: 14px; font-size: 14px;
...@@ -358,9 +359,7 @@ ...@@ -358,9 +359,7 @@
.action.expand-collapse { .action.expand-collapse {
float: left; float: left;
.ui-toggle-expansion { .ui-toggle-expansion {
.icon-caret-down:before{ color: $edx-gray-d3;
color: $edx-gray-d3;
}
} }
} }
...@@ -396,10 +395,16 @@ ...@@ -396,10 +395,16 @@
overflow: auto; overflow: auto;
.wrapper-comp-settings{ .wrapper-comp-settings{
input{ label{
font-size: 11px; padding: 0;
float: right; margin: 0;
width: 70% width: 100%;
input{
font-size: 11px;
float: right;
width: 70%;
}
} }
.openassessment_criterion_prompt{ .openassessment_criterion_prompt{
padding: 10px; padding: 10px;
...@@ -407,11 +412,6 @@ ...@@ -407,11 +412,6 @@
width: 70%; width: 70%;
float: right; float: right;
} }
label{
padding: 0;
margin: 0;
}
} }
} }
} }
...@@ -424,16 +424,14 @@ ...@@ -424,16 +424,14 @@
margin: 10px; margin: 10px;
border-radius: 3px; border-radius: 3px;
.openassessment_criterion_feedback_header_closed:before{ }
font-family: "FontAwesome";
display: inline-block;
margin-right: 10px;
margin-left: 5px;
width: auto;
height: auto;
content: "\f067";
}
label{
width: 100%;
select{
float: right;
margin-right: 24%;
}
} }
.openassessment_criterion_feedback_direction{ .openassessment_criterion_feedback_direction{
...@@ -454,9 +452,7 @@ ...@@ -454,9 +452,7 @@
.ui-toggle-expansion { .ui-toggle-expansion {
@include transform(rotate(-90deg)); @include transform(rotate(-90deg));
@include transform-origin(50% 50%); @include transform-origin(50% 50%);
.icon-caret-down:before{ color: $edx-gray-d3;
color: $edx-gray-d3;
}
} }
} }
} }
...@@ -477,46 +473,52 @@ ...@@ -477,46 +473,52 @@
} }
.openassessment_criterion_option_point_wrapper{ .openassessment_criterion_option_point_wrapper{
width: 40%; width: 30%;
border-top: none; border-top: none;
padding: 5px 5px 5px 0px; padding: 5px 5px 5px 0px;
float: left; float: left;
margin: 0; margin: 0;
.wrapper-comp-setting{
min-width: 200px;
}
label{ label{
width: 40%; width: auto;
vertical-align: middle; padding-left: 15%;
padding: 0;
margin: 0; margin: 0;
}
input{ input{
padding: 10px; min-width: 50px;
float: right; padding: 10px;
width: 55%; float: right;
font-size: 11px; width: 30%;
font-size: 11px;
}
} }
} }
.openassessment_criterion_option_name_wrapper{ .openassessment_criterion_option_name_wrapper{
float: left; float: left;
width: 60%; width: 70%;
padding: 5px 10px 5px 20px; padding: 5px 10px 5px 20px;
border-top: 0; border-top: 0;
margin: 0; margin: 0;
label{ label{
width: 25%; width: 100%;
vertical-align: middle; vertical-align: middle;
padding: 0; padding: 0;
margin: 0; margin: 0;
}
input{ input{
padding: 10px; padding: 10px;
font-size: 11px; font-size: 11px;
width: 60%; width: 56%;
float: right; float: right;
}
} }
} }
...@@ -526,42 +528,22 @@ ...@@ -526,42 +528,22 @@
display: inline-block; display: inline-block;
margin: 0; margin: 0;
label{ label {
width: 25%; width: 100%;
text-align: left; text-align: left;
} margin: 0;
textarea{ textarea {
padding: 10px; padding: 10px;
@extend .openassessment_large_text_input; @extend .openassessment_input_styling;
width: 70%; height: 70px;
float: right; width: 69.5%;
float: right;
}
} }
} }
} }
.openassessment_line_input{
padding: 10px;
overflow: auto;
label{
width: 30%;
text-align: left;
}
input{
width:70%;
min-width: auto;
float: right;
}
textarea{
width:70%;
float:right;
@extend .openassessment_large_text_input
}
}
.openassessment_large_text_input{ .openassessment_large_text_input{
height: 70px; height: 70px;
width: 70%; width: 70%;
...@@ -600,38 +582,28 @@ ...@@ -600,38 +582,28 @@
float: right; float: right;
} }
.openassessment_rubric_feedback_wrapper{ #openassessment_rubric_feedback_wrapper{
padding: 0 10px; padding: 0;
.openassessment_rubric_feedback_header{
margin-top: 10px;
border-bottom: 1px solid $edx-gray-d3;
font-size: 125%;
padding: 10px;
padding-right: 20px;
}
.openassessment_feedback_radio_toggle{ #openassessment_rubric_feedback_header{
input[type="radio"]{ background-color: $edx-gray-l2;
display: none; padding: 5px 5px 5px 10px;
} margin: 10px 10px 0 10px;
border-radius: 3px;
}
input[type="radio"] + label:before{ label{
font-family: "FontAwesome"; padding-top: 10px;
display: inline-block; }
margin-right: ($baseline-h/4);
width: auto;
height: auto;
content: "\f10c";
}
input[type="radio"]:checked + label:before{ textarea{
content: "\f05d"; padding: 10px;
} @extend .openassessment_large_text_input;
width: 70%;
float: right;
} }
} }
#openassessment_rubric_add_criterion{ #openassessment_rubric_add_criterion{
h6:before{ h6:before{
......
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