Skip to content

GitLab

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

Bug 1845104 Various theme fixes part 2 

Fixing metadata inheriting title fonts, plans alignment, comments.

behatnotneeded

Change-Id: Ice9dc3e5b090ad89340bcc6debfd0286d3609395
parent 65103626
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 45 deletions
htdocs/theme/raw/plugintype/artefact/comment/templates/commentlist.tpl
View file @ 5c5db761
<!-- The "feedbacktable" class is used as an identifier by Javascript -->
<div class="list-group list-group-lite">
{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">
<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}
<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>
<h5 class="float-left list-group-item-heading">
......
htdocs/theme/raw/plugintype/artefact/file/blocktype/filedownload/templates/filedownload.tpl
View file @ 5c5db761
......@@ -45,13 +45,12 @@
</span>
{/if}
</h4>
<div>
<br />
<span class="text-small text-midtone">
{$file.ctime|format_date:'strftimedaydate'}
[{$file.size|display_size}]
</span>
<span class="icon icon-download icon-lg float-right text-watermark icon-action" role="presentation" aria-hidden="true"></span>
</div>
{if $file.description}
<div class="file-description">
<p class="text-small">
......
htdocs/theme/raw/plugintype/artefact/plans/blocktype/plans/templates/content.tpl
View file @ 5c5db761
......@@ -25,7 +25,7 @@
<p>{$plan.description}</p>
{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}
</div>
{/if}
......
htdocs/theme/raw/plugintype/artefact/plans/templates/indexplans.tpl
View file @ 5c5db761
......@@ -20,7 +20,6 @@
<div class="text-tiny">{$templatetext}</div>
{/if}
</h3>
<div class="list-group-item-controls">
<div class="float-right btn-group btn-group-top">
{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">
......@@ -38,14 +37,13 @@
{/if}
</div>
</div>
</div>
<div class="postdescription">
{$plan->description|clean_html|safe}
</div>
{if $plan->tags}
<div class="tags">
<div class="tags text-small">
<strong>{str tag=tags}</strong>:
{list_tags tags=$plan->tags owner=$plan->owner}
</div>
......
htdocs/theme/raw/plugintype/artefact/plans/templates/view/plantasks.tpl
View file @ 5c5db761
......@@ -32,7 +32,7 @@
{$task->description|clean_html|safe}
{/if}
{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}
</div>
{/if}
......@@ -81,7 +81,7 @@
{$task->description|clean_html|safe}
{/if}
{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}
</div>
{/if}
......
htdocs/theme/raw/plugintype/blocktype/recentforumposts/templates/recentforumposts.tpl
View file @ 5c5db761
......@@ -9,12 +9,12 @@
</a>
<h4 class="title list-group-item-heading">
<a href="{$WWWROOT}interaction/forum/topic.php?id={$postinfo->topic}&post={$postinfo->id}">
{$postinfo->topicname}
{$postinfo->topicname}<br />
<span class="metadata text-small">
{if !$postinfo->author->deleted}
- {$postinfo->author|display_name}
{$postinfo->author|display_name}
{else}
- {$postinfo->author|full_name}
{$postinfo->author|full_name}
{/if}
</span>
</a>
......
htdocs/theme/raw/sass/_custom.scss
View file @ 5c5db761
......@@ -21,11 +21,23 @@
margin: 20px 0;
}
.task-item .complete-task .icon,
.task-item .overdue-task .icon {
margin-left: -8px; // correct alignment
// Plans
.task-item {
.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 {
margin-right: -8px; // correct alignment
a {
......
htdocs/theme/raw/sass/features/_filebrowser.scss
View file @ 5c5db761
......@@ -125,12 +125,18 @@
width: 20px;
vertical-align: top;
}
.icon-lg {
width: 24px;
}
a {
word-break: break-all;
}
.file-description {
padding-left: 30px;
}
.text-small {
margin-left: 28px;
}
}
.filelist-wrapper {
......
htdocs/theme/raw/sass/typography/_typography.scss
View file @ 5c5db761
......@@ -265,14 +265,18 @@ label.lead {
margin: 10px 0;
}
.metadata {
font-family: $font-family-sans-serif;
font-size: 0.8em;
color: $gray-500;
.title & {
margin-left: 5px;
}
font-size: $font-size-sm;
font-weight: 400;
color: $theme-text-midtone-color;
}
.postedon {
font-family: $font-family-sans-serif;
font-size: $font-size-sm;
font-weight: 400;
color: $theme-text-midtone-color;
}
.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