Commit 579b66d9 by Vik Paruchuri

Redesign header css

parent 5365d542
...@@ -16,6 +16,21 @@ h2 { ...@@ -16,6 +16,21 @@ h2 {
} }
} }
div.name{
padding-bottom: 15px;
h2{
display: inline;
}
.progress-container
{
display: inline;
float: right;
padding-top: 3px;
}
}
.inline-error { .inline-error {
color: darken($error-red, 10%); color: darken($error-red, 10%);
} }
...@@ -24,6 +39,13 @@ section.combined-open-ended { ...@@ -24,6 +39,13 @@ section.combined-open-ended {
@include clearfix; @include clearfix;
.status-bar .status-bar
{ {
float: right;
display: inline-block;
.problemtype{
display: inline;
margin-right: 140px;
}
.status-container .status-container
{ {
...@@ -31,15 +53,11 @@ section.combined-open-ended { ...@@ -31,15 +53,11 @@ section.combined-open-ended {
display: inline-block; display: inline-block;
padding-right: 20px padding-right: 20px
} }
.progress-container
{
padding-bottom: 5px;
display: inline-block;
}
} }
.item-container .item-container
{ {
padding-bottom: 10px; padding-bottom: 10px;
display: inline-block;
} }
.result-container .result-container
...@@ -76,7 +94,6 @@ section.combined-open-ended-status { ...@@ -76,7 +94,6 @@ section.combined-open-ended-status {
padding: 10px; padding: 10px;
display: inline; display: inline;
width: 20%; width: 20%;
margin-right: 20px;
.show-results { .show-results {
margin-top: .3em; margin-top: .3em;
text-align:right; text-align:right;
......
<section id="combined-open-ended" class="combined-open-ended" data-location="${location}" data-ajax-url="${ajax_url}" data-allow_reset="${allow_reset}" data-state="${state}" data-task-count="${task_count}" data-task-number="${task_number}" data-accept-file-upload = "${accept_file_upload}"> <section id="combined-open-ended" class="combined-open-ended" data-location="${location}" data-ajax-url="${ajax_url}" data-allow_reset="${allow_reset}" data-state="${state}" data-task-count="${task_count}" data-task-number="${task_number}" data-accept-file-upload = "${accept_file_upload}">
<h2>${display_name}</h2> <div class="name">
<div class="status-bar"> <h2>${display_name}</h2>
<div class="status-container">
${status|n}
</div>
<div class="progress-container"> <div class="progress-container">
Progress: ${human_state} Progress: ${human_state}
</div> </div>
</div> </div>
<div class="status-bar">
<div class="problemtype">
Open Response Assessment
</div>
Assessments: <div class="status-container">
${status|n}
</div>
</div>
<div class="item-container"> <div class="item-container">
<h4>Prompt <a href="#" class="question-header">(Hide)</a> </h4> <h4>Prompt <a href="#" class="question-header">(Hide)</a> </h4>
......
...@@ -10,9 +10,6 @@ ...@@ -10,9 +10,6 @@
${status['human_task']} ${status['human_task']}
</div> </div>
%if i<len(status_list)-1:
<i class="icon-caret-right"></i>
%endif
%endfor %endfor
</section> </section>
</div> </div>
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