Commit b6fae32d authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Bug 1909034: Peer assessment alignment style fixes"

parents 70bb0942 61ac427e
......@@ -22,7 +22,7 @@
{/if}
<br />
<span class="postedon text-small">
<span class="postedon text-small detail">
{$item->date}
{if $item->updated}
<p class="metadata">[{str tag=Updated}: {$item->updated}]</p>
......
{if $noassessment && $editing}
<p class="editor-description">{$noassessment}</p>
{else}
<div class="card-body">
{if $allowfeedback}
<a id="add_assessment_feedback_link" class="js-peerassessment-modal feedback link-blocktype" href="#" data-toggle="modal-docked" data-target="#assessment_feedbackform_{$blockid}" data-blockid="{$blockid}">
<span class="icon icon-plus" role="presentation" aria-hidden="true"></span>
......@@ -15,7 +14,6 @@
</div>
{/if}
{/if}
</div>
{/if}
{if !$editing}
{* Do not change the id because it is used by paginator.js *}
......
<!-- The "feedbacktable" class is used as an identifier by Javascript -->
<div class="list-group list-group-lite">
<div class="list-group list-group-lite list-group-top-border">
{foreach from=$data item=item}
<div id="assessment{$item->id}" class="comment-item list-group-item {cycle name=rows values='r0,r1'} {if $item->attachments}has-attachment{/if} {if $item->private}draft{/if}">
<div class="usericon-heading">
<span class="user-icon float-left" role="presentation" aria-hidden="true">
<span class="user-icon user-icon-30 float-left" role="presentation" aria-hidden="true">
{if $item->author && !$item->author->deleted}
<img src="{profile_icon_url user=$item->author maxheight=40 maxwidth=40}" valign="middle" alt="{str tag=profileimagetext arg1=$item->author|display_default_name}"/>
<img src="{profile_icon_url user=$item->author maxheight=30 maxwidth=30}" valign="middle" alt="{str tag=profileimagetext arg1=$item->author|display_default_name}"/>
{else}
<img src="{profile_icon_url user=null maxheight=40 maxwidth=40}" valign="middle" alt="{str tag=profileimagetextanonymous}"/>
<img src="{profile_icon_url user=null maxheight=30 maxwidth=30}" valign="middle" alt="{str tag=profileimagetextanonymous}"/>
{/if}
</span>
<h4 class="float-left list-group-item-heading">
<h3 class="list-group-item-heading text-inline">
{if $item->author && !$item->author->deleted}
<a href="{$item->author->profileurl}">
<span>{$item->author|display_name}</span>
......@@ -22,15 +22,15 @@
{/if}
<br />
<span class="postedon text-small">
<span class="postedon text-small detail">
{$item->date}
{if $item->updated}
<p class="metadata">[{str tag=Updated}: {$item->updated}]</p>
{/if}
</span>
</h4>
</h3>
<!-- The "assessment-item-buttons" class is used as an identifier by Javascript -->
<div class="btn-group float-right assessment-item-buttons">
<div class="btn-group btn-group-top assessment-item-buttons">
{if $item->editlink}
{$item->editlink|safe}
{/if}
......
......@@ -427,6 +427,11 @@ div.toolbarhtml {
background-color: $accent-bg !important;
}
}
.peerinstructions {
div.fieldset-body {
margin-bottom: $spacing-base !important;
}
}
.viewinstruction-export {
border: $card-border-width solid $card-border-color;
padding: $card-spacer-y $card-spacer-x;
......
......@@ -154,3 +154,10 @@ fieldset.btn-group {
margin-top: -0.8125rem; // -13px;
}
}
// peer assessment block
.bt-peerassessment {
.comment-item .assessment-item-buttons {
margin-top: -0.8125rem; // -13px;
}
}
......@@ -7,12 +7,14 @@
font-family: $font-family-base;
font-weight: $font-weight-normal;
margin-left: 0;
margin-bottom: $spacing-base;
}
}
.col-width-100 .bt-comment &,
.viewfooter &,
.modal-docked.active & {
.modal-docked.active &,
.bt-peerassessment & {
.comment-content {
padding-left: 2.875rem; // 46px;
}
......
......@@ -161,7 +161,7 @@ a {
display: inline-block;
}
&.js-peerassessment-modal {
float: none;
margin: $spacing-base 0;
}
}
......
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