Commit c0cc88de authored by Evonne's avatar Evonne Committed by Robert Lyon

Bug 1845104 Various theme fixes part 4

Fixing plans blocktype markup, inbox blocktype redundant classes,
alignment of add blocks button, modal thumbnail not floating right,
resume attachment inconsistencies (to be continued)

behatnotneeded

Change-Id: Ic7c0cc5498dbd3f95f140581cc71b175e944a0d9
parent b084c205
...@@ -7,86 +7,81 @@ ...@@ -7,86 +7,81 @@
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/task/delete.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='deletethistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-trash-alt text-danger"></span></a> <a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/task/delete.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='deletethistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-trash-alt text-danger"></span></a>
</div> </div>
{/if} {/if}
{if $task->description || $task->tags} <a class="link-block collapsed" href="#expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}" data-toggle="collapse" aria-expanded="false" aria-controls="expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}">{/if} {if $task->description || $task->tags}
<span class="overdue-task"> <a class="outer-link collapsed" href="#expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}" data-toggle="collapse" aria-expanded="false" aria-controls="expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}">
<div class="collapse-inline"> <span class="sr-only">{$task->title}</span>
<span class="icon icon-times text-danger icon-lg left task{$task->id}{if $editing || $canedit} plan-task-icon{/if}" role="presentation" aria-hidden="true" data-task="{$task->id}"></span> <span class="icon icon-chevron-down right collapse-indicator float-right" role="presentation" aria-hidden="true"></span>
<span class="text-danger">{$task->title}</span> </a>
{if $task->completiondate} - {/if}
<span class="text-small text-midtone"> <span class="overdue-task">
{str tag='completiondate' section='artefact.plans'}: {$task->completiondate} <span class="icon icon-times text-danger icon-lg left task{$task->id}{if $editing || $canedit} plan-task-icon{/if}" role="presentation" aria-hidden="true" data-task="{$task->id}"></span>
</span> <div class="plan-task-heading">
{/if} <span class="text-danger">{$task->title}</span>
</div> {if $task->completiondate}
<br />
{if $task->description || $task->tags} <span class="text-small text-midtone">
<span class="icon icon-chevron-down right collapse-indicator float-right" role="presentation" aria-hidden="true"></span> {str tag='completiondate' section='artefact.plans'}: {$task->completiondate}
</span>
{/if} {/if}
</span> </div>
{if $task->description || $task->tags}</a>{/if}
{if $task->description || $task->tags} {if $task->description || $task->tags}
<div class="collapse" id="expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}"> <div class="collapse plan-task-detail" id="expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}">
<div class="card-body"> {if $task->description}
{if $task->description} {$task->description|clean_html|safe}
{$task->description|clean_html|safe} {/if}
{/if} {if $task->tags}
{if $task->tags} <div class="tags text-small">
<div class="tags text-small"> <strong>{str tag=tags}:</strong> {list_tags owner=$task->owner tags=$task->tags view=$view}
<strong>{str tag=tags}:</strong> {list_tags owner=$task->owner tags=$task->tags view=$view} </div>
</div> {/if}
{/if}
</div>
</div> </div>
{/if} {/if}
</span>
</div> </div>
{else} {else}
<div class="task-item list-group-item {if $task->description || $task->tags}list-group-item-default{/if}"> <div class="task-item list-group-item">
{if $editing} {if $editing}
<div class="float-right btn-group"> <div class="float-right btn-group">
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/task/edit.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='editthistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-pencil-alt text-default"></span></a> <a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/task/edit.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='editthistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-pencil-alt text-default"></span></a>
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/task/delete.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='deletethistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-trash-alt text-danger"></span></a> <a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/task/delete.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='deletethistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-trash-alt text-danger"></span></a>
</div> </div>
{/if} {/if}
{if $task->description || $task->tags}<a class="link-block collapsed" href="#expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}" data-toggle="collapse" aria-expanded="false" aria-controls="expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}">{/if} {if $task->description || $task->tags}
<span class="complete-task"> <a class="outer-link collapsed" href="#expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}" data-toggle="collapse" aria-expanded="false" aria-controls="expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}">
<div class="collapse-inline"> <span class="sr-only">{$task->title}</span>
{if $task->completed == 1} <span class="icon icon-chevron-down right collapse-indicator float-right" role="presentation" aria-hidden="true"></span>
<span class="icon icon-regular icon-check-square icon-lg text-success left task{$task->id}{if $editing || $canedit} plan-task-icon{/if}" role="presentation" aria-hidden="true" data-task="{$task->id}"></span> </a>
<span class="sr-only">{str tag=completed section=artefact.plans}</span> {/if}
{else} <span class="complete-task">
<span class="icon-regular icon-square icon icon-lg text-midtone left task{$task->id}{if $editing || $canedit} plan-task-icon{/if}" role="presentation" aria-hidden="true" data-task="{$task->id}"></span> {if $task->completed == 1}
<span class="sr-only">{str tag=incomplete section=artefact.plans}</span> <span class="icon icon-regular icon-check-square icon-lg text-success left task{$task->id}{if $editing || $canedit} plan-task-icon{/if}" role="presentation" aria-hidden="true" data-task="{$task->id}"></span>
{/if} <span class="sr-only">{str tag=completed section=artefact.plans}</span>
{else}
<span class="text-default">{$task->title}</span> <span class="icon-regular icon-square icon icon-lg text-midtone left task{$task->id}{if $editing || $canedit} plan-task-icon{/if}" role="presentation" aria-hidden="true" data-task="{$task->id}"></span>
{if $task->completiondate} - <span class="sr-only">{str tag=incomplete section=artefact.plans}</span>
<span class="text-midtone text-small"> {/if}
{str tag='completiondate' section='artefact.plans'}: {$task->completiondate} <div class="plan-task-heading">
</span> <span class="text-default">{$task->title}</span>
{/if} {if $task->completiondate}
</div> <br />
<span class="text-midtone text-small">
{if $task->description || $task->tags} {str tag='completiondate' section='artefact.plans'}: {$task->completiondate}
<span class="icon icon-chevron-down right collapse-indicator float-right" role="presentation" aria-hidden="true"></span> </span>
{/if} {/if}
</span> </div>
</span>
{if $task->description || $task->tags}</a>{/if}
{if $task->description || $task->tags} {if $task->description || $task->tags}
<div class="collapse" id="expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}"> <div class="collapse plan-task-detail" id="expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}">
<div class="card-body"> {if $task->description}
{if $task->description} {$task->description|clean_html|safe}
{$task->description|clean_html|safe} {/if}
{/if} {if $task->tags}
{if $task->tags} <div class="tags text-small">
<div class="tags text-small"> <strong>{str tag=tags}:</strong> {list_tags owner=$task->owner tags=$task->tags view=$view}
<strong>{str tag=tags}:</strong> {list_tags owner=$task->owner tags=$task->tags view=$view}
</div>
{/if}
</div> </div>
</div> {/if}
</div>
{/if} {/if}
</div> </div>
{/if} {/if}
......
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
{/if} {/if}
{if $row->attachments} {if $row->attachments}
<h5 class="has-attachment list-group-item-heading"> <h5 class="list-group-item-heading attachment-title">
<span class="icon icon-paperclip left" role="presentation" aria-hidden="true"></span> <span class="icon icon-paperclip left" role="presentation" aria-hidden="true"></span>
<span class="text-small">{str tag='attachedfiles' section='artefact.blog'}</span> <span class="text-small">{str tag='attachedfiles' section='artefact.blog'}</span>
({$row->clipcount}) ({$row->clipcount})
......
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
{/if} {/if}
{if $row->attachments} {if $row->attachments}
<h5 class="has-attachment list-group-item-heading"> <h5 class="list-group-item-heading attachment-title">
<span class="icon icon-paperclip left" role="presentation" aria-hidden="true"></span> <span class="icon icon-paperclip left" role="presentation" aria-hidden="true"></span>
<span class="text-small">{str tag='attachedfiles' section='artefact.blog'}</span> <span class="text-small">{str tag='attachedfiles' section='artefact.blog'}</span>
({$row->clipcount}) ({$row->clipcount})
......
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
{/if} {/if}
{if $row->attachments} {if $row->attachments}
<div class="has-attachment list-group-item-heading"> <div class="list-group-item-heading attachment-title">
<span class="icon icon-paperclip left" role="presentation" aria-hidden="true"></span> <span class="icon icon-paperclip left" role="presentation" aria-hidden="true"></span>
<span class="text-small">{str tag='attachedfiles' section='artefact.blog'}</span> <span class="text-small">{str tag='attachedfiles' section='artefact.blog'}</span>
({$row->clipcount}) ({$row->clipcount})
......
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
{/if} {/if}
{if $row->attachments} {if $row->attachments}
<div class="has-attachment list-group-item-heading"> <div class="list-group-item-heading attachment-title">
<span class="icon icon-paperclip left" role="presentation" aria-hidden="true"></span> <span class="icon icon-paperclip left" role="presentation" aria-hidden="true"></span>
<span class="text-small">{str tag='attachedfiles' section='artefact.blog'}</span> <span class="text-small">{str tag='attachedfiles' section='artefact.blog'}</span>
({$row->clipcount}) ({$row->clipcount})
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
{/if} {/if}
{if $row->attachments} {if $row->attachments}
<h5 class="has-attachment list-group-item-heading"> <h5 class="list-group-item-heading attachment-title">
<span class="icon icon-paperclip left" role="presentation" aria-hidden="true"></span> <span class="icon icon-paperclip left" role="presentation" aria-hidden="true"></span>
<span class="text-small">{str tag='attachedfiles' section='artefact.blog'}</span> <span class="text-small">{str tag='attachedfiles' section='artefact.blog'}</span>
({$row->clipcount}) ({$row->clipcount})
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
{else} {else}
<div id="inboxblock" class="inboxblock list-group"> <div id="inboxblock" class="inboxblock list-group">
{foreach from=$items item=i} {foreach from=$items item=i}
<div class="has-attachment card collapsible list-group-item{if !$i->read} js-card-unread{/if}" data-requesturl="{$WWWROOT}module/multirecipientnotification/indexin.json.php"> <div class="collapsible list-group-item{if !$i->read} js-card-unread{/if}" data-requesturl="{$WWWROOT}module/multirecipientnotification/indexin.json.php">
{if $i->message} {if $i->message}
<a class="collapsed link-block{if !$i->read} unread{/if}" data-toggle="collapse" href="#message_content_{$i->type}_{$i->id}" data-id="{$i->id}" data-list="{$i->table}" aria-expanded="false"> <a class="collapsed link-block{if !$i->read} unread{/if}" data-toggle="collapse" href="#message_content_{$i->type}_{$i->id}" data-id="{$i->id}" data-list="{$i->table}" aria-expanded="false">
{if $i->type == 'usermessage'} {if $i->type == 'usermessage'}
......
...@@ -21,30 +21,32 @@ ...@@ -21,30 +21,32 @@
margin: 20px 0; margin: 20px 0;
} }
// Plans // Plan
.task-item { .card.card-secondary .list-group .task-item {
.complete-task, &:first-child {
.overdue-task { border-top: 1px solid $list-group-border-color;
margin-left: 15px; }
.icon { a[data-toggle="collapse"] .collapse-indicator,
margin-left: -22px; // correct alignment a[data-toggle="collapse"].collapsed .collapse-indicator {
padding-right: 2px; margin-right: 90px;
} margin-top: 17px;
}
.plan-task-icon {
vertical-align: top;
padding-top: 4px;
}
.plan-task-heading {
max-width: 60%;
display: inline-block;
} }
.card-body { .plan-task-detail {
padding-bottom: 0; margin-left: 22px;
margin-top: 10px;
.tags { .tags {
margin-bottom: 0; margin-bottom: 0;
} }
} }
} }
.task-item .btn-group {
margin-right: -8px; // correct alignment
a {
font-size: 10px;
padding: 2px 8px;
}
}
.no-results { .no-results {
@extend .lead; @extend .lead;
......
...@@ -298,6 +298,11 @@ td.action-list-copy { ...@@ -298,6 +298,11 @@ td.action-list-copy {
margin-left: 5px; margin-left: 5px;
} }
} }
.hide-title-collapsed {
.title {
margin-left: 2px;
}
}
.block-icon { .block-icon {
display: inline-block; display: inline-block;
@include media-breakpoint-up(lg) { @include media-breakpoint-up(lg) {
......
...@@ -427,3 +427,12 @@ ...@@ -427,3 +427,12 @@
} }
} }
} }
// filelist in modal
.modal-body {
.list-group-item {
.list-group-item-heading {
float: none;
}
}
}
...@@ -222,3 +222,7 @@ ...@@ -222,3 +222,7 @@
} }
} }
} }
.post .has-attachment {
margin-bottom: 10px;
}
...@@ -87,14 +87,26 @@ ...@@ -87,14 +87,26 @@
padding: 0; padding: 0;
} }
&.bt-resumefield { &.bt-resumefield,
.resume-content { &.bt-entireresume {
border: 1px solid $card-border-color; .resume-content {
padding: 10px 15px; padding: 8px 0;
.list-group-item-heading { .attachment-title {
font-size: .75001rem; font-family: $font-family-sans-serif;
font-weight: 700;
font-size: $font-size-sm;
.icon {
font-size: 1rem;
}
}
.file-icon {
vertical-align: top;
}
.title {
max-width: 80%;
display: inline-block;
}
} }
}
} }
} }
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class='btn-group-vertical'> <div class='btn-group-vertical'>
{/if} {/if}
{foreach from=$blocktypes item=blocktype}{strip} {foreach from=$blocktypes item=blocktype}{strip}
<a class="{if !$accessible} not-accessible{/if} blocktype-drag blocktypelink btn btn-primary hide-title-collapsed text-left" href="#" title="{$blocktype.title}"> <a class="{if !$accessible} not-accessible{/if} blocktype-drag blocktypelink btn btn-primary hide-title-collapsed" href="#" title="{$blocktype.title}">
<input type="radio" id="blocktype-list-radio-{$blocktype.name}" class="blocktype-radio" name="blocktype" value="{$blocktype.name}"> <input type="radio" id="blocktype-list-radio-{$blocktype.name}" class="blocktype-radio" name="blocktype" value="{$blocktype.name}">
<span class="icon icon-{$blocktype.cssicon} {$blocktype.cssicontype} icon-lg" title="{$blocktype.title}" role="presentation" aria-hidden="true"></span> <span class="icon icon-{$blocktype.cssicon} {$blocktype.cssicontype} icon-lg" title="{$blocktype.title}" role="presentation" aria-hidden="true"></span>
<label for="blocktype-list-radio-{$blocktype.name}" class="blocktypetitle title"> <label for="blocktype-list-radio-{$blocktype.name}" class="blocktypetitle title">
......
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