Commit d9784f69 authored by Curtis Adam's avatar Curtis Adam

Update the cardset label layout

parent eb2d6ca2
......@@ -3066,7 +3066,7 @@ $themes: (
}
}
//transcript bonus colors
.transcript-info-text {
.transcript-info-text, .label-transcript-info {
color: $transcript_bonus_info_text !important;
background-color: $transcript_bonus_info_background !important;
}
......
<template name="cardsetLabels">
{{#unless gotTranscriptBonusAndIsNotShuffled this._id}}
{{#unless gotTranscriptBonusAndIsNotShuffled this.cardset_id}}
<span class="label label-count" title="{{_ "cardset.info.quantity"}}">
{{getCardsetCardCount}}
</span>
<span class="label-group">
{{#unless gotTranscriptBonusAndIsNotShuffled this._id}}
{{#unless gotTranscriptBonusAndIsNotShuffled this.cardset_id}}
<span class="label label-count" title="{{_ "cardset.info.quantity"}}">
{{getCardsetCardCount}}
</span>
{{/unless}}
{{/unless}}
{{#if gotTranscriptBonus this._id}}
<span class="label label-count cardset-list-badge-transcript" title="{{_ "transcriptForm.info.submissions"}}">
{{getTranscriptSubmissions this}}
</span>
{{/if}}
{{#unless isTranscriptRoute}}
{{#unless isBonusTranscriptsRoute}}
{{{getKind this.kind 0}}}
{{{getShuffleLabel this.shuffled}}}
{{/unless}}
{{/unless}}
{{/unless}}
{{#if gotTranscriptBonus this._id}}
<span class="label label-count cardset-list-badge-transcript" title="{{_ "transcriptForm.info.submissions"}}">
{{getTranscriptSubmissions this}}
</span>
{{/if}}
{{#unless isTranscriptRoute}}
{{#unless isBonusTranscriptsRoute}}
{{{getKind this.kind 0}}}
{{{getShuffleLabel this.shuffled}}}
{{#unless this.shuffled}}
{{{getCardTypeLabel this.cardType}}}
{{{getDifficultyLabel this.cardType this.difficulty}}}
{{/unless}}
{{/unless}}
{{#unless this.shuffled}}
{{{getCardTypeLabel this.cardType}}}
{{{getDifficultyLabel this.cardType this.difficulty}}}
{{/unless}}
{{{getBonusLabel this.learningActive}}}
{{{getTranscriptBonusLabel this}}}
{{{getBonusLabel this.learningActive}}}
{{{getTranscriptBonusLabel this}}}
{{> filterIndexItemBottomDeadline}}
</span>
</template>
<template name="filterIndexItemBottomDeadline">
{{#if isBonusTranscriptsRoute}}
<span class="hidden-xs hidden-sm label transcript-info-text">
<span class="hidden-xs hidden-sm label label-transcript-info">
{{getBonusLectureDeadline}}
</span>
{{/if}}
......
......@@ -28,7 +28,6 @@
<div class="resultItemHeaderBottomArea row">
<div class="col-xs-12 col-sm-8 collapseButton resultItemHeaderBottomAreaLabels">
{{> cardsetLabels}}
{{> filterIndexItemBottomDeadline}}
</div>
<div class="col-xs-12 col-sm-4 collapseButton resultItemHeaderBottomAreaButtons">
{{#unless isSelectingCardsetToLearn}}
......
......@@ -867,6 +867,14 @@ kbd {
border-radius: 3px;
}
.label-count {
margin-right: 5px;
.label-group {
.label {
margin-right: 2px;
}
.label:first-child {
margin-right: 4px;
}
.label:last-child {
margin-right: 0;
}
}
\ No newline at end of file
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