Commit 5c5db761 authored by Evonne's avatar Evonne Committed by Robert Lyon

Bug 1845104 Various theme fixes part 2

Fixing metadata inheriting title fonts, plans alignment, comments.

behatnotneeded

Change-Id: Ice9dc3e5b090ad89340bcc6debfd0286d3609395
parent 65103626
<!-- The "feedbacktable" class is used as an identifier by Javascript --> <!-- The "feedbacktable" class is used as an identifier by Javascript -->
<div class="list-group list-group-lite"> <div class="list-group list-group-lite">
{foreach from=$data item=item} {foreach from=$data item=item}
<div id="comment{$item->id}" class="comment-item list-group-item {if $item->pubmessage}list-group-item-warning{elseif $item->deletedmessage}deleted {/if} {cycle name=rows values='r0,r1'} {if $item->indent} indent-{$item->indent}{/if} {if !$item->deletedmessage && $item->attachments}has-attachment{/if}"> <div id="comment{$item->id}" class="comment-item list-group-item {if $item->pubmessage}list-group-item-private{elseif $item->deletedmessage}deleted {/if} {cycle name=rows values='r0,r1'} {if $item->indent} indent-{$item->indent}{/if} {if !$item->deletedmessage && $item->attachments}has-attachment{/if}">
<div class="usericon-heading"> <div class="usericon-heading">
<span class="user-icon user-icon-40 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} {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} {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} {/if}
</span> </span>
<h5 class="float-left list-group-item-heading"> <h5 class="float-left list-group-item-heading">
......
...@@ -45,13 +45,12 @@ ...@@ -45,13 +45,12 @@
</span> </span>
{/if} {/if}
</h4> </h4>
<div> <br />
<span class="text-small text-midtone"> <span class="text-small text-midtone">
{$file.ctime|format_date:'strftimedaydate'} {$file.ctime|format_date:'strftimedaydate'}
[{$file.size|display_size}] [{$file.size|display_size}]
</span> </span>
<span class="icon icon-download icon-lg float-right text-watermark icon-action" role="presentation" aria-hidden="true"></span> <span class="icon icon-download icon-lg float-right text-watermark icon-action" role="presentation" aria-hidden="true"></span>
</div>
{if $file.description} {if $file.description}
<div class="file-description"> <div class="file-description">
<p class="text-small"> <p class="text-small">
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<p>{$plan.description}</p> <p>{$plan.description}</p>
{if $plan.tags} {if $plan.tags}
<div class="tags"> <div class="tags text-small">
<strong>{str tag=tags}:</strong> {list_tags owner=$plan.owner tags=$plan.tags view=$plan.view} <strong>{str tag=tags}:</strong> {list_tags owner=$plan.owner tags=$plan.tags view=$plan.view}
</div> </div>
{/if} {/if}
......
...@@ -20,23 +20,21 @@ ...@@ -20,23 +20,21 @@
<div class="text-tiny">{$templatetext}</div> <div class="text-tiny">{$templatetext}</div>
{/if} {/if}
</h3> </h3>
<div class="list-group-item-controls"> <div class="float-right btn-group btn-group-top">
<div class="float-right btn-group btn-group-top"> {if $canedit}
{if $canedit} <a href="{$WWWROOT}artefact/plans/plan/edit.php?{$groupurlquery}id={$plan->id}" title="{str(tag=editspecific arg1=$plan->title)|escape:html|safe}" class="btn btn-secondary btn-sm">
<a href="{$WWWROOT}artefact/plans/plan/edit.php?{$groupurlquery}id={$plan->id}" title="{str(tag=editspecific arg1=$plan->title)|escape:html|safe}" class="btn btn-secondary btn-sm"> <span class="icon icon-lg icon-pencil-alt" role="presentation" aria-hidden="true"></span>
<span class="icon icon-lg icon-pencil-alt" role="presentation" aria-hidden="true"></span> <span class="sr-only">{str tag=edit}</span>
<span class="sr-only">{str tag=edit}</span> </a>
</a> <a href="{$WWWROOT}artefact/plans/plan/view.php?{$groupurlquery}id={$plan->id}" title="{str tag=managetasks section=artefact.plans}" class="btn btn-secondary btn-sm">
<a href="{$WWWROOT}artefact/plans/plan/view.php?{$groupurlquery}id={$plan->id}" title="{str tag=managetasks section=artefact.plans}" class="btn btn-secondary btn-sm"> <span class="icon icon-lg icon-cog" role="presentation" aria-hidden="true"></span>
<span class="icon icon-lg icon-cog" role="presentation" aria-hidden="true"></span> <span class="sr-only">{str tag=managetasks section=artefact.plans}</span>
<span class="sr-only">{str tag=managetasks section=artefact.plans}</span> </a>
</a> <a href="{$WWWROOT}artefact/plans/plan/delete.php?{$groupurlquery}id={$plan->id}" title="{str(tag=deletespecific arg1=$plan->title)|escape:html|safe}" class="btn btn-secondary btn-sm">
<a href="{$WWWROOT}artefact/plans/plan/delete.php?{$groupurlquery}id={$plan->id}" title="{str(tag=deletespecific arg1=$plan->title)|escape:html|safe}" class="btn btn-secondary btn-sm"> <span class="icon icon-trash-alt text-danger icon-lg" role="presentation" aria-hidden="true"></span>
<span class="icon icon-trash-alt text-danger icon-lg" role="presentation" aria-hidden="true"></span> <span class="sr-only">{str tag=delete}</span>
<span class="sr-only">{str tag=delete}</span> </a>
</a> {/if}
{/if}
</div>
</div> </div>
</div> </div>
...@@ -45,7 +43,7 @@ ...@@ -45,7 +43,7 @@
</div> </div>
{if $plan->tags} {if $plan->tags}
<div class="tags"> <div class="tags text-small">
<strong>{str tag=tags}</strong>: <strong>{str tag=tags}</strong>:
{list_tags tags=$plan->tags owner=$plan->owner} {list_tags tags=$plan->tags owner=$plan->owner}
</div> </div>
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
{$task->description|clean_html|safe} {$task->description|clean_html|safe}
{/if} {/if}
{if $task->tags} {if $task->tags}
<div class="tags"> <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}
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
{$task->description|clean_html|safe} {$task->description|clean_html|safe}
{/if} {/if}
{if $task->tags} {if $task->tags}
<div class="tags"> <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}
......
...@@ -9,12 +9,12 @@ ...@@ -9,12 +9,12 @@
</a> </a>
<h4 class="title list-group-item-heading"> <h4 class="title list-group-item-heading">
<a href="{$WWWROOT}interaction/forum/topic.php?id={$postinfo->topic}&post={$postinfo->id}"> <a href="{$WWWROOT}interaction/forum/topic.php?id={$postinfo->topic}&post={$postinfo->id}">
{$postinfo->topicname} {$postinfo->topicname}<br />
<span class="metadata text-small"> <span class="metadata text-small">
{if !$postinfo->author->deleted} {if !$postinfo->author->deleted}
- {$postinfo->author|display_name} {$postinfo->author|display_name}
{else} {else}
- {$postinfo->author|full_name} {$postinfo->author|full_name}
{/if} {/if}
</span> </span>
</a> </a>
......
...@@ -21,11 +21,23 @@ ...@@ -21,11 +21,23 @@
margin: 20px 0; margin: 20px 0;
} }
.task-item .complete-task .icon, // Plans
.task-item .overdue-task .icon { .task-item {
margin-left: -8px; // correct alignment .complete-task,
.overdue-task {
margin-left: 15px;
.icon {
margin-left: -22px; // correct alignment
padding-right: 2px;
}
}
.card-body {
padding-bottom: 0;
.tags {
margin-bottom: 0;
}
}
} }
.task-item .btn-group { .task-item .btn-group {
margin-right: -8px; // correct alignment margin-right: -8px; // correct alignment
a { a {
......
...@@ -125,12 +125,18 @@ ...@@ -125,12 +125,18 @@
width: 20px; width: 20px;
vertical-align: top; vertical-align: top;
} }
.icon-lg {
width: 24px;
}
a { a {
word-break: break-all; word-break: break-all;
} }
.file-description { .file-description {
padding-left: 30px; padding-left: 30px;
} }
.text-small {
margin-left: 28px;
}
} }
.filelist-wrapper { .filelist-wrapper {
......
...@@ -265,14 +265,18 @@ label.lead { ...@@ -265,14 +265,18 @@ label.lead {
margin: 10px 0; margin: 10px 0;
} }
.metadata { .metadata {
font-family: $font-family-sans-serif; font-family: $font-family-sans-serif;
font-size: 0.8em; font-size: $font-size-sm;
color: $gray-500; font-weight: 400;
.title & { color: $theme-text-midtone-color;
margin-left: 5px; }
}
.postedon {
font-family: $font-family-sans-serif;
font-size: $font-size-sm;
font-weight: 400;
color: $theme-text-midtone-color;
} }
.license { .license {
......
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