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 @@
<label class="openassessment_criterion_option_name_label setting-label">
{% trans "Option Name"%}
<input
class="openassessment_criterion_option_name input input-label"
type="text"
value="{{ option_name }}"
class="openassessment_criterion_option_name input input-label"
type="text"
value="{{ option_name }}"
>
</label>
</div>
......@@ -26,10 +26,10 @@
<label class="openassessment_criterion_option_points_label setting-label">
{% trans "Option Points"%}
<input
class="openassessment_criterion_option_points input setting-input"
type="number"
value="{{ option_points }}"
min="0"
class="openassessment_criterion_option_points input setting-input"
type="number"
value="{{ option_points }}"
min="0"
>
</label>
</div>
......
openassessment/templates/openassessmentblock/edit/oa_edit_rubric.html
......@@ -37,10 +37,11 @@
<label for="openassessment_rubric_feedback" class="setting-label">{% trans "Feedback Direction" %}</label>
<textarea id="openassessment_rubric_feedback" class="input setting-input">{{ feedbackprompt }}</textarea>
</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>
<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>
</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 @@
border: none;
border-radius: 4px;
padding: 10px;
font-family: $f-sans-serif;
textarea{
font-size: 14px;
......@@ -358,9 +359,7 @@
.action.expand-collapse {
float: left;
.ui-toggle-expansion {
.icon-caret-down:before{
color: $edx-gray-d3;
}
color: $edx-gray-d3;
}
}
......@@ -396,10 +395,16 @@
overflow: auto;
.wrapper-comp-settings{
input{
font-size: 11px;
float: right;
width: 70%
label{
padding: 0;
margin: 0;
width: 100%;
input{
font-size: 11px;
float: right;
width: 70%;
}
}
.openassessment_criterion_prompt{
padding: 10px;
......@@ -407,11 +412,6 @@
width: 70%;
float: right;
}
label{
padding: 0;
margin: 0;
}
}
}
}
......@@ -424,16 +424,14 @@
margin: 10px;
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{
......@@ -454,9 +452,7 @@
.ui-toggle-expansion {
@include transform(rotate(-90deg));
@include transform-origin(50% 50%);
.icon-caret-down:before{
color: $edx-gray-d3;
}
color: $edx-gray-d3;
}
}
}
......@@ -477,46 +473,52 @@
}
.openassessment_criterion_option_point_wrapper{
width: 40%;
width: 30%;
border-top: none;
padding: 5px 5px 5px 0px;
float: left;
margin: 0;
.wrapper-comp-setting{
min-width: 200px;
}
label{
width: 40%;
vertical-align: middle;
padding: 0;
width: auto;
padding-left: 15%;
margin: 0;
}
input{
padding: 10px;
float: right;
width: 55%;
font-size: 11px;
input{
min-width: 50px;
padding: 10px;
float: right;
width: 30%;
font-size: 11px;
}
}
}
.openassessment_criterion_option_name_wrapper{
float: left;
width: 60%;
width: 70%;
padding: 5px 10px 5px 20px;
border-top: 0;
margin: 0;
label{
width: 25%;
width: 100%;
vertical-align: middle;
padding: 0;
margin: 0;
}
input{
padding: 10px;
font-size: 11px;
width: 60%;
float: right;
input{
padding: 10px;
font-size: 11px;
width: 56%;
float: right;
}
}
}
......@@ -526,42 +528,22 @@
display: inline-block;
margin: 0;
label{
width: 25%;
label {
width: 100%;
text-align: left;
}
margin: 0;
textarea{
padding: 10px;
@extend .openassessment_large_text_input;
width: 70%;
float: right;
textarea {
padding: 10px;
@extend .openassessment_input_styling;
height: 70px;
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{
height: 70px;
width: 70%;
......@@ -600,38 +582,28 @@
float: right;
}
.openassessment_rubric_feedback_wrapper{
padding: 0 10px;
.openassessment_rubric_feedback_header{
margin-top: 10px;
border-bottom: 1px solid $edx-gray-d3;
font-size: 125%;
padding: 10px;
padding-right: 20px;
}
#openassessment_rubric_feedback_wrapper{
padding: 0;
.openassessment_feedback_radio_toggle{
input[type="radio"]{
display: none;
}
#openassessment_rubric_feedback_header{
background-color: $edx-gray-l2;
padding: 5px 5px 5px 10px;
margin: 10px 10px 0 10px;
border-radius: 3px;
}
input[type="radio"] + label:before{
font-family: "FontAwesome";
display: inline-block;
margin-right: ($baseline-h/4);
width: auto;
height: auto;
content: "\f10c";
}
label{
padding-top: 10px;
}
input[type="radio"]:checked + label:before{
content: "\f05d";
}
textarea{
padding: 10px;
@extend .openassessment_large_text_input;
width: 70%;
float: right;
}
}
#openassessment_rubric_add_criterion{
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