Skip to content

E
edx-ora2
Commit a9a9184c by Brian Talbot
Options

Merge pull request #72 from edx/talbs/fed-cleanup 

Front End Development Cleanup/Loose Ends
parents cdf74f7a 669f269b
Showing with 129 additions and 399 deletions
apps/openassessment/templates/openassessmentblock/peer/oa_peer_assessment.html
<!-- TEMPLATE: peer evaluation -->
<!-- NOTES:
* class of is--unavailable is added when step is not available
* each .peer-evaluation item needs a unique id attribute formatted as #peer-evaluation--###
* individual rubric questions' answers need specific id attributes in several places
-->
<!-- CASE: default/not started -->
{% block list_item %} {% block list_item %}
<li id="openassessment__peer-assessment" class="openassessment__steps__step step--peer-assessment ui-toggle-visibility"> <li id="openassessment__peer-assessment" class="openassessment__steps__step step--peer-assessment ui-toggle-visibility">
{% endblock %} {% endblock %}
...@@ -62,7 +50,6 @@ ...@@ -62,7 +50,6 @@
</span> </span>
</header> </header>
<!-- ?: markup validating/copy cleaning upon submission -->
<div class="peer-assessment__display__response"> <div class="peer-assessment__display__response">
{{ peer_submission.answer }} {{ peer_submission.answer }}
</div> </div>
...@@ -104,13 +91,12 @@ ...@@ -104,13 +91,12 @@
</li> </li>
{% endfor %} {% endfor %}
<!-- individual rubric question (text) --> <li class="wrapper--input field field--textarea assessment__rubric__question assessment__rubric__question--feedback" id="assessment__rubric__question--feedback">
<li class="wrapper--input field field--textarea assessment__rubric__question assessment__rubric__question--feedback" id="assessment__rubric__question--004"> <label class="question__title" for="assessment__rubric__question--feedback__value">
<label class="question__title" for="assessment__rubric__question--004__value">
<i class="ico fa fa-caret-right"></i> <i class="ico fa fa-caret-right"></i>
<span class="question__title__copy">Please provide any other feedback you have around this response</span> <span class="question__title__copy">Please provide any other feedback you have around this response</span>
</label> </label>
<textarea id="assessment__rubric__question--004__value" placeholder="I felt this response was..."></textarea> <textarea id="assessment__rubric__question--feedback__value" placeholder="I felt this response was..."></textarea>
</li> </li>
</ol> </ol>
</fieldset> </fieldset>
......
apps/openassessment/templates/openassessmentblock/peer/oa_peer_closed.html
{% extends "openassessmentblock/peer/oa_peer_assessment.html" %} {% extends "openassessmentblock/peer/oa_peer_assessment.html" %}
<!-- CASE: started, but incomplete and problem closed -->
{% block list_item %} {% block list_item %}
<li id="openassessment__peer-assessment"class="openassessment__steps__step step--peer-assessment ui-toggle-visibility"> <li id="openassessment__peer-assessment"class="openassessment__steps__step step--peer-assessment ui-toggle-visibility">
{% endblock %} {% endblock %}
...@@ -17,4 +17,5 @@ ...@@ -17,4 +17,5 @@
</span> </span>
{% endblock %} {% endblock %}
{% block body %}{% endblock %} {% block body %}
{% endblock %}
apps/openassessment/templates/openassessmentblock/peer/oa_peer_complete.html
{% extends "openassessmentblock/peer/oa_peer_assessment.html" %} {% extends "openassessmentblock/peer/oa_peer_assessment.html" %}
<!-- CASE: completed -->
{% block list_item %} {% block list_item %}
<li id="openassessment__peer-assessment" class="openassessment__steps__step step--peer-assessment ui-toggle-visibility"> <li id="openassessment__peer-assessment" class="openassessment__steps__step step--peer-assessment ui-toggle-visibility">
{% endblock %} {% endblock %}
...@@ -17,4 +17,5 @@ ...@@ -17,4 +17,5 @@
</span> </span>
{% endblock %} {% endblock %}
{% block body %}{% endblock %} {% block body %}
{% endblock %}
apps/openassessment/templates/openassessmentblock/peer/oa_peer_waiting.html
{% extends "openassessmentblock/peer/oa_peer_assessment.html" %} {% extends "openassessmentblock/peer/oa_peer_assessment.html" %}
<!-- CASE: no peer responses to assess -->
{% block list_item %} {% block list_item %}
<li id="openassessment__peer-assessment" class="openassessment__steps__step step--peer-assessment ui-toggle-visibility"> <li id="openassessment__peer-assessment" class="openassessment__steps__step step--peer-assessment ui-toggle-visibility">
{% endblock %} {% endblock %}
...@@ -14,4 +14,5 @@ ...@@ -14,4 +14,5 @@
</span> </span>
{% endblock %} {% endblock %}
{% block body %}{% endblock %} {% block body %}
{% endblock %}
apps/openassessment/templates/openassessmentblock/response/oa_response.html
<!-- TEMPLATE: student response -->
<!-- NOTES:
* class of is--unavailable is added when step is not available
* class of is--saved is added when response is saved by system
* class of is--submitted is added when user has formally submitted response
* class of is--graded is added when user's response has proper amount of completed peer evaluations
* class of is--updated is added to the step__status element when a response is saved
-->
<!-- CASE: default/unanswered -->
{% block list_item %} {% block list_item %}
<li id="openassessment__response" class="openassessment__steps__step step--response ui-toggle-visibility"> <li id="openassessment__response" class="openassessment__steps__step step--response ui-toggle-visibility">
{% endblock %} {% endblock %}
...@@ -56,7 +41,7 @@ ...@@ -56,7 +41,7 @@
<ul class="list list--actions response__submission__actions"> <ul class="list list--actions response__submission__actions">
<li class="list--actions__item"> <li class="list--actions__item">
<button type="submit" id="submission__submit" class="action action--submit submission__submit">Save Your Progress</button> <button type="submit" id="submission__save" class="action action--save submission__save">Save Your Progress</button>
<span class="tip">you may continue to work on your response until you submit</span> <span class="tip">you may continue to work on your response until you submit</span>
</li> </li>
</ul> </ul>
......
apps/openassessment/templates/openassessmentblock/response/oa_response_graded.html
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
{% block body %} {% block body %}
<div class="ui-toggle-visibility__content"> <div class="ui-toggle-visibility__content">
<div class="step__content"> <div class="step__content">
<!-- user's response -->
<article class="submission__answer__display"> <article class="submission__answer__display">
<h3 class="submission__answer__display__title">Your Submitted Response</h3> <h3 class="submission__answer__display__title">Your Submitted Response</h3>
...@@ -26,14 +25,12 @@ ...@@ -26,14 +25,12 @@
</div> </div>
</article> </article>
<!-- peer evaluations -->
<article class="submission__peer-evaluations"> <article class="submission__peer-evaluations">
<h3 class="submission__peer-evaluations__title">Peer Evaluations Of Your Response</h3> <h3 class="submission__peer-evaluations__title">Peer Evaluations Of Your Response</h3>
<ol class="list submission__peer-evaluations__questions"> <ol class="list submission__peer-evaluations__questions">
{% for criterion in rubric_criteria %} {% for criterion in rubric_criteria %}
{% with criterion_num=forloop.counter %} {% with criterion_num=forloop.counter %}
<!-- individual question from rubric -->
<li class="question question--{{ criterion_num }} ui-toggle-visibility"> <li class="question question--{{ criterion_num }} ui-toggle-visibility">
<h4 class="question__title ui-toggle-visibility__control"> <h4 class="question__title ui-toggle-visibility__control">
<span class="question__title__copy">{{ criterion.name }}</span> <span class="question__title__copy">{{ criterion.name }}</span>
...@@ -82,7 +79,6 @@ ...@@ -82,7 +79,6 @@
</ol> </ol>
</article> </article>
<!-- peer assessment feedback -->
<form id="submission__feeedback" class="submission__feeedback ui-toggle-visibility" method="post"> <form id="submission__feeedback" class="submission__feeedback ui-toggle-visibility" method="post">
<h3 class="submission__feeedback__title ui-toggle-visibility__control">Give Feedback On Peer Evaluations</h3> <h3 class="submission__feeedback__title ui-toggle-visibility__control">Give Feedback On Peer Evaluations</h3>
......
apps/openassessment/templates/openassessmentblock/response/oa_response_submitted.html
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
{% block body %} {% block body %}
<div class="ui-toggle-visibility__content"> <div class="ui-toggle-visibility__content">
<div class="step__content"> <div class="step__content">
<!-- user's response -->
<article class="submission__answer__display"> <article class="submission__answer__display">
<h3 class="submission__answer__display__title">Your Submitted Response</h3> <h3 class="submission__answer__display__title">Your Submitted Response</h3>
......
apps/openassessment/templates/openassessmentblock/self/oa_self_assessment.html
<!-- TEMPLATE: self evaluation -->
<!-- NOTES:
* class of is--unavailable is added when step is not available
* each .self-assessment item needs a unique id attribute formatted as #self-assessment--###
* individual rubric questions' answers need specific id attributes in several places
-->
<!-- CASE: default/not started -->
{% block list_item %} {% block list_item %}
<li id="openassessment__self-assessment" class="openassessment__steps__step step--self-assessment is--expanded"> <li id="openassessment__self-assessment" class="openassessment__steps__step step--self-assessment is--expanded">
{% endblock %} {% endblock %}
...@@ -41,7 +29,6 @@ ...@@ -41,7 +29,6 @@
<h3 class="self-assessment__display__title">Your Submitted Response</h3> <h3 class="self-assessment__display__title">Your Submitted Response</h3>
</header> </header>
<!-- ?: markup validating/copy cleaning upon submission -->
<div class="self-assessment__display__response"> <div class="self-assessment__display__response">
{{ self_submission.answer }} {{ self_submission.answer }}
</div> </div>
...@@ -53,7 +40,6 @@ ...@@ -53,7 +40,6 @@
<ol class="list list--fields assessment__rubric"> <ol class="list list--fields assessment__rubric">
{% for criterion in rubric_criteria %} {% for criterion in rubric_criteria %}
<!-- individual rubric question (radio-based choice) -->
<li class="field field--radio is--required assessment__rubric__question" id="assessment__rubric__question--{{ criterion.name }}"> <li class="field field--radio is--required assessment__rubric__question" id="assessment__rubric__question--{{ criterion.name }}">
<h4 class="question__title"> <h4 class="question__title">
<i class="ico fa fa-caret-right"></i> <i class="ico fa fa-caret-right"></i>
...@@ -83,13 +69,12 @@ ...@@ -83,13 +69,12 @@
</li> </li>
{% endfor %} {% endfor %}
<!-- individual rubric question (text) --> <li class="wrapper--input field field--textarea assessment__rubric__question" id="assessment__rubric__question--feedback">
<li class="wrapper--input field field--textarea assessment__rubric__question" id="assessment__rubric__question--004"> <label for="assessment__rubric__question--feedback__value">
<label for="assessment__rubric__question--004__value">
<i class="ico fa fa-caret-right"></i> <i class="ico fa fa-caret-right"></i>
<span class="question__title__copy">Please provide any other feedback you have around this response</span> <span class="question__title__copy">Please provide any other feedback you have around this response</span>
</label> </label>
<textarea id="assessment__rubric__question--004__value" placeholder="I felt this response was..."></textarea> <textarea id="assessment__rubric__question--feedback__value" placeholder="I felt this response was..."></textarea>
</li> </li>
</ol> </ol>
</fieldset> </fieldset>
......
apps/openassessment/templates/openassessmentblock/self/oa_self_closed.html
{% extends "openassessmentblock/self/oa_self_assessment.html" %} {% extends "openassessmentblock/self/oa_self_assessment.html" %}
<!-- CASE: not started and problem closed -->
{% block list_item %} {% block list_item %}
<li id="openassessment__self-assessment" class="openassessment__steps__step step--self-assessment ui-toggle-visibility"> <li id="openassessment__self-assessment" class="openassessment__steps__step step--self-assessment ui-toggle-visibility">
{% endblock %} {% endblock %}
...@@ -15,4 +14,5 @@ ...@@ -15,4 +14,5 @@
</span> </span>
{% endblock %} {% endblock %}
{% block body %}{% endblock %} {% block body %}
{% endblock %}
apps/openassessment/templates/openassessmentblock/self/oa_self_complete.html
{% extends "openassessmentblock/self/oa_self_assessment.html" %} {% extends "openassessmentblock/self/oa_self_assessment.html" %}
<!-- CASE: complete -->
{% block list_item %} {% block list_item %}
<li id="openassessment__self-assessment" class="openassessment__steps__step step--self-assessment ui-toggle-visibility"> <li id="openassessment__self-assessment" class="openassessment__steps__step step--self-assessment ui-toggle-visibility">
{% endblock %} {% endblock %}
...@@ -15,4 +14,5 @@ ...@@ -15,4 +14,5 @@
</span> </span>
{% endblock %} {% endblock %}
{% block body %}{% endblock %} {% block body %}
{% endblock %}
apps/openassessment/templates/openassessmentblock/t-base.html deleted 100644 → 0
<!-- TEMPLATE: base -->
<!-- NOTES:
* class of message--warning is added message is a warning/notification to user
* class of message--confirmation is added message is a confirmation to user
* class of has--actions is added when a message has actions associated with it for user to interact with
-->
<div class="wrapper wrapper--openassessment wrapper--xblock theme--basic">
<div class="openassessment" id="openassessment">
<div class="wrapper--grid">
<h1 class="openassessment__title">
<span class="openassessment__title--super">
Assignment Number 1 - Censorship in Libraries
</span>
<span class="openassessment__title--sub">
<span class="problem-type problem-type--open-ended-response">Open Ended Response</span>
+
<span class="problem-type problem-type--peer-assessment">Peer</span>
+
<span class="problem-type problem-type--self-assessment">Self Assessment</span>
</span>
</h1>
<!--?: may have trouble with aync -->
<nav class="nav--contents">
<h2 class="title">Skip to a part of this problem:</h2>
<ol class="list list--nav">
<li class="list--nav__item">
<a class="action" href="#openassessment__response">Your response to this problem</a>
</li>
<li class="list--nav__item">
<a class="action" href="#openassessment__peer-assessment">Your assessment(s) of peer responses</a>
</li>
<li class="list--nav__item">
<a class="action" href="#openassessment__self-assessment">Your assessment of your response</a>
</li>
<li class="list--nav__item">
<a class="action" href="#openassessment__grade">Your grade for this problem</a>
</li>
</ol>
</nav>
<!-- STATUS: system messages -->
<!-- SEE t-messages.html for all cases -->
<!-- question -->
<div class="wrapper--openassessment__prompt">
<article class="openassessment__prompt ui-toggle-visibility">
<h2 class="openassessment__prompt__title">Open Assessment Problem</h2>
<div class="openassessment__prompt__copy ui-toggle-visibility__content">
<blockquote>
<p>All of us can think of a book that we hope none of our children or any other children have taken off the shelf. But if I have the right to remove that book from the shelf -- that work I abhor -- then you also have exactly the same right and so does everyone else. And then we have no books left on the shelf for any of us.</p>
<footer>
&mdash; <cite><a href="">Katherine Paterson, Author</a></cite>
</footer>
</blockquote>
<p>Write a persuasive essay to a newspaper reflecting your vies on censorship in libraries. Do you believe that certain materials, such as books, music, movies, magazines, etc., should be removed from the shelves if they are found offensive? Support your position with convincing arguments from your own experience, observations, and/or reading.</p>
</div>
<ul class="list list--controls">
<li class="list--controls__item">
<a href="" class="action action--toggle ui-toggle-visibility__control">Collapse/Expand This</a>
</li>
</ul>
</article>
</div>
<!-- steps -->
<ol class="openassessment__steps" id="openassessment__steps">
<!-- STEP: response -->
<!-- SEE t-response.html for all cases -->
<!-- ==== -->
<!-- STEP: peer assessment -->
<!-- SEE t-peer-assessment.html for all cases -->
<!-- ==== -->
<!-- STEP: self assessment -->
<!-- SEE t-self-assessment.html for all cases -->
</ol>
<!-- STATUS: problem grade -->
<!-- SEE t-grade.html for all cases -->
</div>
</div>
</div>
apps/openassessment/templates/openassessmentblock/t-grade.html deleted 100644 → 0
<!-- TEMPLATE: grade status -->
<!-- NOTES:
* class of is--incomplete is added when the problem is in an incomplete state
* class of is--complete is added when problem is successfully completed by user
* class of has--grade is added when a grade (failing or passing) is calculated for user
* classes of needs--* are added when user action is needed
* classes of awaiting--* are added when a user's flow is dependent upon system readiness
-->
<!-- CASE: default/unstarted -->
<div id="openassessment__grade" class="openassessment__grade is--unstarted">
<h2 class="openassessment__grade__title">Your Grade:</h2>
<div class="openassessment__grade__content">
<span class="grade__value">Incomplete</span>
<p>You have not started this problem</p>
</div>
</div>
<!-- CASE: is in-progress and incomplete (no response submission) -->
<div id="openassessment__grade" class="openassessment__grade is--incomplete needs--response">
<h2 class="openassessment__grade__title">Your Grade:</h2>
<div class="openassessment__grade__content">
<span class="grade__value">Incomplete</span>
<p>You have not completed the <span class="step">Response</span>, <span class="step">Peer Assessment</span>, and <span class="step">Self Assessment</span> portions of this problem</p>
</div>
</div>
<!-- CASE: is in-progress and incomplete (peer responses to assess) -->
<div id="openassessment__grade" class="openassessment__grade is--incomplete awaiting--peer-responses">
<h2 class="openassessment__grade__title">Your Grade:</h2>
<div class="openassessment__grade__content">
<span class="grade__value">Incomplete</span>
<p>You have not completed the <span class="step">Peer Assessment</span>, and <span class="step">Self Assessment</span> portions of this problem.</p>
</div>
</div>
<!-- CASE: is in-progress and incomplete (peer evaluations of user's response) -->
<div id="openassessment__grade" class="openassessment__grade is--incomplete awaiting--peer-evaluations">
<h2 class="openassessment__grade__title">Your Grade:</h2>
<div class="openassessment__grade__content">
<span class="grade__value">Waiting for Peers to Assess Your Response</span>
<p>Your response is still being evaluated by your peers. Once complete, you will receive a final grade and detailed feedback from their evaluations.</p>
</div>
</div>
<!-- CASE: is in-progress and incomplete (no self assessment) -->
<div id="openassessment__grade" class="openassessment__grade is--incomplete needs--self-assessment">
<h2 class="openassessment__grade__title">Your Grade:</h2>
<div class="openassessment__grade__content">
<span class="grade__value">Incomplete</span>
<p>You have not completed the <span class="step">Self Assessment</span> portion of this problem.</p>
</div>
</div>
<!-- CASE: is incomplete and problem closed -->
<div id="openassessment__grade" class="openassessment__grade is--incomplete has--grade">
<h2 class="openassessment__grade__title">Your Grade:</h2>
<div class="openassessment__grade__content">
<span class="grade__value">Incomplete</span>
<p>You did not complete the <span class="step">Peer Assessment</span>, and <span class="step">Self Assessment</span> portions of this problem.</p>
</div>
</div>
<!-- CASE: is complete -->
<div id="openassessment__grade" class="openassessment__grade is--complete has--grade">
<h2 class="openassessment__grade__title">Your Grade:</h2>
<div class="openassessment__grade__content">
<span class="grade__value">4.00</span> out of <span class="grade__potential">5.00</span>
</div>
</div>
apps/openassessment/templates/openassessmentblock/t-messages.html deleted 100644 → 0
<!-- TEMPLATE: status messages -->
<!-- NOTES:
* class of message--warning is added message is a warning/notification to user
* class of message--confirmation is added message is a confirmation to user
* class of has--actions is added when a message has actions associated with it for user to interact with
-->
<!-- CASE: completion status is incomplete and peer evaluations are needed -->
<div class="message message--warning">
<h2 class="message__title">You still need to submit your response to this question</h2>
<div class="message__copy">
<p>Please note that self assessments are due on: <span class="step__deadline">due <span class="date">Jan 24, 2014</span> at <span class="time">15:00 UTC</span></span></p>
</div>
</div>
<!-- CASE: completion status is incomplete and self assessment is needed -->
<div class="message message--warning">
<h2 class="message__title">You still need to complete your self assessment</h2>
<div class="message__copy">
<p>Please note that self assessments are due on: <span class="step__deadline">due <span class="date">Jan 30, 2014</span> at <span class="time">15:00 UTC</span></span></p>
</div>
</div>
<!-- CASE: problem is closed and completion status is incomplete -->
<div class="message message--warning">
<h2 class="message__title">This problem’s due date has past &amp; submissions are now closed</h2>
<div class="message__copy">
<p>You did not complete the necessary requirements and received an incomplete grade</p>
</div>
</div>
<!-- CASE: problem is closed/open and completion status is complete -->
<div class="message message--confirmation has--actions">
<h2 class="message__title">You have completed this problem</h2>
<ul class="list--actions">
<li class="list--actions__item">
<a class="action" href="#openassessment__grade">View your grade</a>
</li>
</ul>
</div>
apps/openassessment/xblock/static/css/openassessment.css
This source diff could not be displayed because it is too large. You can view the blob instead.
apps/openassessment/xblock/static/sass/oa/contexts/_lms.scss deleted 100644 → 0
// openassessment: contexts - lms UI
// ====================
// NOTES:
// * any openassessment-specific suport-based styling needed for the xblock rendering in edX's LMS should be placed here
// --------------------
// CASE: less than or equal to IE9
// --------------------
.is--in-edxlms {
}
apps/openassessment/xblock/static/sass/oa/contexts/_responsive.scss 0 → 100644
// openassessment: contexts - responsive sizing
// ====================
// NOTES:
// * this creates different sized layouts/grid based to use in lieu of native media queries (since XBlocks don't control the chrome they are rendered in)
.xblock {
// --------------------
// CASE: extra small digital screen
// --------------------
&.ui-size-xs .wrapper--grid {
}
// --------------------
// CASE: small digital screen
// --------------------
&.ui-size-s .wrapper--grid {
}
// --------------------
// CASE: medium digital screen
// --------------------
&.ui-size-m .wrapper--grid {
}
// --------------------
// CASE: large digital screen
// --------------------
&.ui-size-l .wrapper--grid {
}
// --------------------
// CASE: extra large large digital screen
// --------------------
&.ui-size-xl .wrapper--grid {
}
}
apps/openassessment/xblock/static/sass/oa/utilities/_developer.scss
...@@ -30,59 +30,59 @@ ...@@ -30,59 +30,59 @@
.wrapper--xblock { .wrapper--xblock {
// typography tests // typography tests
.h1 { .h1 {
@extend %hd-alpha; @extend %hd-1;
} }
.h2 { .h2 {
@extend %hd-bravo; @extend %hd-2;
} }
.h3 { .h3 {
@extend %hd-charlie; @extend %hd-3;
} }
.h4 { .h4 {
@extend %hd-delta; @extend %hd-4;
} }
.h5 { .h5 {
@extend %hd-epsilon; @extend %hd-5;
} }
.h6 { .h6 {
@extend %hd-foxtrot; @extend %hd-6;
} }
.h7 { .h7 {
@extend %hd-golf; @extend %hd-7;
} }
.h8 { .h8 {
@extend %hd-hotel; @extend %hd-8;
} }
.copy-1 { .copy-1 {
@extend %copy-alpha; @extend %copy-1;
} }
.copy-2 { .copy-2 {
@extend %copy-bravo; @extend %copy-2;
} }
.copy-3 { .copy-3 {
@extend %copy-charlie; @extend %copy-3;
} }
.copy-4 { .copy-4 {
@extend %copy-delta; @extend %copy-4;
} }
.copy-5 { .copy-5 {
@extend %copy-epsilon; @extend %copy-5;
} }
.copy-6 { .copy-6 {
@extend %copy-foxtrot; @extend %copy-6;
} }
} }
......
apps/openassessment/xblock/static/sass/oa/utilities/_extends.scss
...@@ -20,19 +20,19 @@ ...@@ -20,19 +20,19 @@
%ui-section { %ui-section {
border: ($baseline-v/10) solid $color-decorative-tertiary; border: ($baseline-v/10) solid $color-decorative-tertiary;
border-radius: ($baseline-v/10); border-radius: ($baseline-v/10);
margin-bottom: $spacing-bravo; margin-bottom: $baseline-v;
} }
%ui-section-title { %ui-section-title {
@extend %hd-golf; @extend %hd-7;
@extend %t-weight3; @extend %t-weight3;
padding: $spacing-charlie $spacing-bravo; padding: ($baseline-v/2) $baseline-v;
background: $color-decorative-tertiary; background: $color-decorative-tertiary;
color: $heading-secondary-color; color: $heading-secondary-color;
} }
%ui-section-content { %ui-section-content {
padding: $spacing-bravo; padding: $baseline-v;
} }
...@@ -42,23 +42,23 @@ ...@@ -42,23 +42,23 @@
// rubric question // rubric question
%ui-rubric-question { %ui-rubric-question {
@include clearfix(); @include clearfix();
margin-bottom: $spacing-bravo; margin-bottom: $baseline-v;
@extend %wipe-last-child; @extend %wipe-last-child;
.question__title { .question__title {
margin-bottom: $spacing-bravo; margin-bottom: $baseline-v;
border-bottom: ($baseline-v/10) solid $color-decorative-tertiary; border-bottom: ($baseline-v/10) solid $color-decorative-tertiary;
padding-bottom: $spacing-delta; padding-bottom: ($baseline-v/4);
.ico { .ico {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
margin-right: $spacing-delta; margin-right: ($baseline-v/4);
} }
} }
.question__title__copy { .question__title__copy {
@extend %hd-delta; @extend %hd-4;
@extend %t-weight3; @extend %t-weight3;
color: $heading-primary-color; color: $heading-primary-color;
} }
...@@ -71,9 +71,9 @@ ...@@ -71,9 +71,9 @@
@include row(); @include row();
@extend %trans-opacity; @extend %trans-opacity;
@extend %wipe-last-child; @extend %wipe-last-child;
margin-bottom: $spacing-charlie; margin-bottom: ($baseline-v/2);
border-bottom: ($baseline-v/20) solid $color-decorative-tertiary; border-bottom: ($baseline-v/20) solid $color-decorative-tertiary;
padding-bottom: $spacing-charlie; padding-bottom: ($baseline-v/2);
opacity: 0.75; opacity: 0.75;
&:hover { &:hover {
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
} }
.wrapper--input { .wrapper--input {
margin-bottom: $spacing-delta; margin-bottom: ($baseline-v/4);
@include media($bp-ds) { @include media($bp-ds) {
@include span-columns(6 of 6); @include span-columns(6 of 6);
...@@ -109,14 +109,14 @@ ...@@ -109,14 +109,14 @@
} }
.answer__label { .answer__label {
@extend %copy-delta; @extend %copy-4;
@extend %t-weight3; @extend %t-weight3;
margin-bottom: 0; // FIX: need to reset base label style margin-bottom: 0; // FIX: need to reset base label style
color: $color-unfocused; color: $color-unfocused;
} }
.answer__value { .answer__value {
margin-right: $spacing-charlie; margin-right: ($baseline-v/2);
// STATE: checked // STATE: checked
&:checked { &:checked {
...@@ -152,10 +152,10 @@ ...@@ -152,10 +152,10 @@
} }
.answer__tip { .answer__tip {
margin-bottom: $spacing-charlie; margin-bottom: ($baseline-v/2);
@extend %copy-epsilon; @extend %copy-5;
margin-right: $spacing-bravo; margin-right: $baseline-v;
color: $copy-supplemental-color; color: $copy-supplemental-color;
@include media($bp-dm) { @include media($bp-dm) {
...@@ -182,11 +182,11 @@ ...@@ -182,11 +182,11 @@
} }
.answer__points { .answer__points {
@extend %copy-epsilon; @extend %copy-5;
color: $copy-color; color: $copy-color;
@extend %copy-epsilon; @extend %copy-5;
margin-right: $spacing-bravo; margin-right: $baseline-v;
color: $copy-supplemental-color; color: $copy-supplemental-color;
@include media($bp-dm) { @include media($bp-dm) {
...@@ -205,9 +205,9 @@ ...@@ -205,9 +205,9 @@
} }
.label { .label {
@extend %copy-epsilon; // FIX: need to reset base label style @extend %copy-5; // FIX: need to reset base label style
display: inline-block; // FIX: need to reset base label style display: inline-block; // FIX: need to reset base label style
margin-left: $spacing-delta; margin-left: ($baseline-v/4);
color: $copy-supplemental-color; color: $copy-supplemental-color;
} }
} }
......
apps/openassessment/xblock/static/sass/openassessment.scss
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
// openassessment: contextual // openassessment: contextual
@import 'oa/contexts/ie'; // open assessment-specific Internet Explorer-specific styling @import 'oa/contexts/ie'; // open assessment-specific Internet Explorer-specific styling
@import 'oa/contexts/lms'; // open assessment-specific LMS constraints @import 'oa/contexts/responsive'; // open assessment-specific UI sizes (faking responsive brakpoints)
// openassessment: misc. // openassessment: misc.
@import 'oa/utilities/developer'; // developer-friendly file: add rough/WIP styling that needs UI triage @import 'oa/utilities/developer'; // developer-friendly file: add rough/WIP styling that needs UI triage
......
apps/openassessment/xblock/static/sass/themes/edx/_utilities.scss
...@@ -111,8 +111,8 @@ $color-decorative-tertiary: $gray-l5; ...@@ -111,8 +111,8 @@ $color-decorative-tertiary: $gray-l5;
$color-decorative-quaternary: $gray-l7; $color-decorative-quaternary: $gray-l7;
// application - colors: states // application - colors: states
$color-disabled: $gray-l4; $color-disabled: $edx-gray-l4;
$color-focused: $edx-lms-header; $color-focused: $edx-gray;
// application - colors: copy and headings // application - colors: copy and headings
$heading-color: $edx-lms-header; $heading-color: $edx-lms-header;
......
apps/openassessment/xblock/static/sass/xb/elements/_controls.scss
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
} }
.copy { .copy {
margin-right: $spacing-charlie; margin-right: ($baseline-v/2);
} }
} }
......
apps/openassessment/xblock/static/sass/xb/elements/_forms.scss
...@@ -12,10 +12,8 @@ ...@@ -12,10 +12,8 @@
input[type="email"], input[type="email"],
input[type="password"], input[type="password"],
textarea { textarea {
@extend %t-weight2;
border: 1px solid $color-decorative-secondary; border: 1px solid $color-decorative-secondary;
padding: $spacing-charlie; padding: ($baseline-v/2);
font-family: $f-copy;
outline: 0; outline: 0;
color: $selected-color; color: $selected-color;
...@@ -31,11 +29,12 @@ ...@@ -31,11 +29,12 @@
} }
.field { .field {
font-family: $f-copy;
label, .label { label, .label {
@extend %copy-delta; @extend %copy-4;
display: block; display: block;
margin-bottom: $spacing-charlie; margin-bottom: ($baseline-v/2);
color: $copy-color; color: $copy-color;
} }
......
apps/openassessment/xblock/static/sass/xb/elements/_typography.scss
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
// -------------------- // --------------------
// canned headings // canned headings
// -------------------- // --------------------
%hd-alpha { %hd-1 {
@extend %t-weight1; @extend %t-weight1;
@extend %t-titlecase; @extend %t-titlecase;
@include font-size(24); @include font-size(24);
...@@ -69,14 +69,14 @@ ...@@ -69,14 +69,14 @@
font-family: $f-title; font-family: $f-title;
} }
%hd-bravo { %hd-2 {
@extend %t-weight3; @extend %t-weight3;
@include font-size(21); @include font-size(21);
@include lh(21); @include lh(21);
font-family: $f-title; font-family: $f-title;
} }
%hd-charlie { %hd-3 {
@extend %t-weight1; @extend %t-weight1;
@extend %t-titlecase; @extend %t-titlecase;
@include font-size(18); @include font-size(18);
...@@ -84,14 +84,14 @@ ...@@ -84,14 +84,14 @@
font-family: $f-title; font-family: $f-title;
} }
%hd-delta { %hd-4 {
@extend %t-weight3; @extend %t-weight3;
@include font-size(16); @include font-size(16);
@include lh(16); @include lh(16);
font-family: $f-title; font-family: $f-title;
} }
%hd-epsilon { %hd-5 {
@extend %t-weight1; @extend %t-weight1;
@extend %t-titlecase; @extend %t-titlecase;
@include font-size(16); @include font-size(16);
...@@ -99,14 +99,14 @@ ...@@ -99,14 +99,14 @@
font-family: $f-title; font-family: $f-title;
} }
%hd-foxtrot { %hd-6 {
@extend %t-weight3; @extend %t-weight3;
@include font-size(16); @include font-size(16);
@include lh(16); @include lh(16);
font-family: $f-title; font-family: $f-title;
} }
%hd-golf { %hd-7 {
@extend %t-weight1; @extend %t-weight1;
@extend %t-titlecase; @extend %t-titlecase;
@include font-size(13); @include font-size(13);
...@@ -114,58 +114,50 @@ ...@@ -114,58 +114,50 @@
font-family: $f-title; font-family: $f-title;
} }
%hd-hotel { %hd-8 {
@extend %t-weight1; @extend %t-weight1;
@include font-size(13); @include font-size(13);
@include lh(13); @include lh(13);
font-family: $f-title; font-family: $f-title;
} }
%hd-india {
@extend %t-weight1;
@extend %t-titlecase;
@include font-size(11);
@include lh(11);
font-family: $f-title;
}
// -------------------- // --------------------
// canned copy // canned copy
// -------------------- // --------------------
%copy-alpha { %copy-1 {
@extend %t-weight0; @extend %t-weight0;
@include font-size(24); @include font-size(24);
@include lh(24); @include lh(24);
font-family: $f-copy; font-family: $f-copy;
} }
%copy-bravo { %copy-2 {
@include font-size(18); @include font-size(18);
@include lh(18); @include lh(18);
font-family: $f-copy; font-family: $f-copy;
} }
%copy-charlie { %copy-3 {
@extend %t-weight1; @extend %t-weight1;
@include font-size(16); @include font-size(16);
@include lh(16); @include lh(16);
font-family: $f-copy; font-family: $f-copy;
} }
%copy-delta { %copy-4 {
@include font-size(14); @include font-size(14);
@include lh(14); @include lh(14);
font-family: $f-copy; font-family: $f-copy;
} }
%copy-epsilon { %copy-5 {
@include font-size(13); @include font-size(13);
@include lh(12); @include lh(12);
font-family: $f-copy; font-family: $f-copy;
} }
%copy-foxtrot { %copy-6 {
@include font-size(12); @include font-size(12);
@include lh(12); @include lh(12);
font-family: $f-copy; font-family: $f-copy;
...@@ -175,31 +167,31 @@ ...@@ -175,31 +167,31 @@
// -------------------- // --------------------
// canned actions // canned actions
// -------------------- // --------------------
%action-alpha { %action-1 {
@include font-size(18); @include font-size(18);
@include lh(18); @include lh(18);
font-family: $f-action; font-family: $f-action;
} }
%action-bravo { %action-2 {
@include font-size(18); @include font-size(18);
@include lh(18); @include lh(18);
font-family: $f-action; font-family: $f-action;
} }
%action-charlie { %action-3 {
@include font-size(16); @include font-size(16);
@include lh(16); @include lh(16);
font-family: $f-action; font-family: $f-action;
} }
%action-delta { %action-4 {
@include font-size(14); @include font-size(14);
@include lh(14); @include lh(14);
font-family: $f-action; font-family: $f-action;
} }
%action-epsilon { %action-5 {
@include font-size(12); @include font-size(12);
@include lh(12); @include lh(12);
font-family: $f-action; font-family: $f-action;
...@@ -213,12 +205,12 @@ ...@@ -213,12 +205,12 @@
font-style: normal; font-style: normal;
} }
%emphasis-alpha { %emphasis-1 {
@extend %emphasis; @extend %emphasis;
@extend %t-weight3; @extend %t-weight3;
} }
%emphasis-bravo { %emphasis-2 {
@extend %emphasis; @extend %emphasis;
@extend %t-weight2; @extend %t-weight2;
} }
apps/openassessment/xblock/static/sass/xb/utilities/_variables.scss
...@@ -10,13 +10,6 @@ ...@@ -10,13 +10,6 @@
$baseline-v: 20px; // vertical baseline $baseline-v: 20px; // vertical baseline
$baseline-h: 40px; // horizontal baseline $baseline-h: 40px; // horizontal baseline
// units: spacing presets
$spacing-alpha: ($baseline-v*2);
$spacing-bravo: $baseline-v;
$spacing-charlie: ($baseline-v/2);
$spacing-delta: ($baseline-v/4);
// -------------------- // --------------------
// layout - grid (neat-based - http://neat.bourbon.io/) // layout - grid (neat-based - http://neat.bourbon.io/)
// -------------------- // --------------------
......
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