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

Merge "Bug 1907719: Fix styling issues"

parents b81b87e9 51c4aa83
......@@ -813,7 +813,7 @@ class ArtefactTypePeerassessment extends ArtefactType {
'renderer' => 'oneline',
'plugintype' => 'artefact',
'pluginname' => 'peerassessment',
'class' => 'form-as-button pull-left assessbtn last',
'class' => 'form-as-button float-left assessbtn last',
'jsform' => true,
'successcallback' => 'delete_assessment_submit',
'jssuccesscallback' => 'modifyPeerassessmentSuccess',
......
......@@ -2428,7 +2428,7 @@ function friendscontrol_submit(Pieform $form, $values) {
function acceptfriend_form($friendid, $modalmode='') {
$value = ($modalmode == 'modal' ? get_string('approverequest', 'group') : '<span class="icon icon-check text-success left" role="presentation" aria-hidden="true"></span>' . get_string('approve', 'group'));
$elementclass = $modalmode == 'modal' ? 'form-as-button' : 'form-as-button pull-left';
$elementclass = $modalmode == 'modal' ? 'form-as-button' : 'form-as-button float-left';
$class = $modalmode == 'modal' ? 'link-unstyled' : 'default btn-secondary btn-sm first';
return pieform(array(
......
.sidebar {
.profile-block.card-header {
min-height: 5.75rem; // 92px;
.username {
&:hover {
text-decoration: underline;
......
......@@ -57,7 +57,7 @@
{if $alltags}
<div class="tags">
<strong>{str tag=tags}:</strong>
{str tag=tags}:
{list_tags owner=$owner tags=$alltags view=$viewid}
{if $moretags}
<a href="#" class="moretags">
......
......@@ -3,7 +3,7 @@
{if $artefact->get('tags')}
<div class="tags">
<strong>{str tag=tags}:</strong> {list_tags owner=$artefact->get('owner') tags=$artefact->get('tags')}
{str tag=tags}: {list_tags owner=$artefact->get('owner') tags=$artefact->get('tags')}
</div>
{/if}
......
......@@ -13,7 +13,7 @@
</div>
{if $annotation.tags}
<div class="tags">
<strong>{str tag=tags}:</strong> {list_tags owner=0 tags=$annotation.tags}
{str tag=tags}: {list_tags owner=0 tags=$annotation.tags}
</div>
{/if}
<div class="annotationfeedback">
......
......@@ -57,7 +57,7 @@
<span class="text-small">
{str tag='postedin' section='blocktype.blog/recentposts'}
{if $canviewblog}
<a href="{$WWWROOT}artefact/blog/view/index.php?id={$post->parent}" class="inner-link">
<a href="{$WWWROOT}artefact/blog/view/index.php?id={$post->parent}">
{$post->parenttitle}
</a>
{else}
......
......@@ -78,8 +78,7 @@
</div>
<div class="tags text-small text-midtone">
<span class="icon icon-tags" role="presentation" aria-hidden="true"></span>
<strong>{str tag=tags}:</strong>
{list_tags owner=$post->owner tags=$post->taglist view=$view}
{str tag=tags}: {list_tags owner=$post->owner tags=$post->taglist view=$view}
</div>
<div class="detail list-group-item-detail content-text">
......
......@@ -19,11 +19,11 @@
{/if}
{if $tags}
<p class="text-midtone tags">
<strong>{str tag=tags}:</strong> {list_tags owner=$owner tags=$tags view=$view}
{str tag=tags}: {list_tags owner=$owner tags=$tags view=$view}
</p>
{/if}
{if $description || $tags}
</div>
</div>
{/if}
{if $posts.tablerows}
......
......@@ -13,12 +13,11 @@
<div id="{$blog.id}_desc" class="detail d-none">{$blog.description|clean_html|safe}</div>
{if $blog.tags}
<div class="tags text-small text-midtone">
<strong>{str tag=tags}:</strong> {list_tags owner=0 tags=$blog.tags}
{str tag=tags}: {list_tags owner=0 tags=$blog.tags}
</div>
{/if}
<div class="posts">
<strong>{str tag=blogpost section=artefact.blog}:</strong>
{str tag=nposts section=artefact.blog arg1=count($blog.entryposts)}
{str tag=blogpost section=artefact.blog}: {str tag=nposts section=artefact.blog arg1=count($blog.entryposts)}
</div>
<!-- TODO Display existing journals and jounrnal count with section title -->
<!-- {if $blog.existingitems}
......@@ -84,7 +83,7 @@
<strong class="text-warning">{str tag=duplicatedpost section=artefact.blog}</strong>
</div>
{/if}
<!-- {if $post.existingitems}
<!-- {if $post.existingitems}
<div class="existingposts">
<div class="existingblogs">
<strong>{str tag=existingposts section=artefact.blog}</strong>
......
......@@ -43,24 +43,17 @@
</div>
<div id="postdetails_{$post->id}" class="postdetails postdate text-small text-midtone">
<span class="icon icon-regular icon-calendar-alt left" role="presentation" aria-hidden="true"></span>
<strong>
{str tag=postedon section=artefact.blog}:
</strong>
{$post->ctime}
{str tag=postedon section=artefact.blog}: {$post->ctime}
{if $post->lastupdated}
<br>
<span class="icon icon-regular icon-calendar-alt left" role="presentation" aria-hidden="true"></span>
<strong>
{str tag=updatedon section=artefact.blog}:
</strong>
{$post->lastupdated}
{str tag=updatedon section=artefact.blog}: {$post->lastupdated}
{/if}
{if $post->tags}
<p id="posttags_{$post->id}" class="tags">
<span class="icon icon-tags left" role="presentation" aria-hidden="true"></span>
<strong>{str tag=tags}:</strong>
{list_tags owner=$post->author tags=$post->tags}
{str tag=tags}: {list_tags owner=$post->author tags=$post->tags}
</p>
{/if}
</div>
......
......@@ -23,8 +23,7 @@
{if $artefacttags}
<div class="tags text-small text-midtone">
<span class="icon icon-tags" role="presentation" aria-hidden="true"></span>
<strong>{str tag=tags}:</strong>
{list_tags owner=$artefactowner tags=$artefacttags view=$artefactview}
{str tag=tags}: {list_tags owner=$artefactowner tags=$artefacttags view=$artefactview}
</div>
{/if}
......
......@@ -19,7 +19,7 @@
</div>
{if $blog->get('tags')}
<div class="tags">
<strong>{str tag=tags}:</strong> {list_tags owner=$blog->get('owner') tags=$blog->get('tags')}
{str tag=tags}: {list_tags owner=$blog->get('owner') tags=$blog->get('tags')}
</div>
{/if}
......
......@@ -35,8 +35,7 @@
{if $post->tags}
<div class="tags text-small text-midtone">
<span class="icon icon-tags left" role="presentation" aria-hidden="true"></span>
<strong>{str tag=tags}:</strong>
{list_tags owner=$post->owner tags=$post->tags view=$options.viewid}
{str tag=tags}: {list_tags owner=$post->owner tags=$post->tags view=$options.viewid}
</div>
{/if}
</div>
......
......@@ -38,7 +38,7 @@
<span class="sr-only">{str tag=Details section=artefact.file}</span>
</a>
{else}
<span class="inner-link">{$file.title}</span>
<span>{$file.title}</span>
{/if}
</h3>
......
<ul class="list-group">
{foreach $files file}
<li class="filedownload-item list-group-item">
<a class="inner-link file-icon-link" href="{$WWWROOT}artefact/artefact.php?artefact={$file.id}&view={$viewid}">
<a class="file-icon-link" href="{$WWWROOT}artefact/artefact.php?artefact={$file.id}&view={$viewid}">
{if $file.iconsrc}
<img src="{$file.iconsrc}" alt="" class="file-icon text-inline" />
{else}
......@@ -10,7 +10,7 @@
</a>
<h3 class="title list-group-item-heading text-inline">
<a href="{$WWWROOT}artefact/artefact.php?artefact={$file.id}&view={$viewid}" class="inner-link">
<a href="{$WWWROOT}artefact/artefact.php?artefact={$file.id}&view={$viewid}">
{$file.title} [export_info/files/{$file.id}-{$file.title}]
<span class="sr-only">
{str tag=Details section=artefact.file}
......
......@@ -6,8 +6,7 @@
{if $tags}
<div class="tags">
<strong>{str tag=tags}</strong>:
{list_tags owner=$owner tags=$tags view=$viewid}
{str tag=tags}: {list_tags owner=$owner tags=$tags view=$viewid}
</div>
{/if}
......
......@@ -8,8 +8,7 @@
{/if}
{if $tags}
<div class="tags">
<strong>{str tag=tags}</strong>:
{list_tags owner=$owner tags=$tags view=$viewid}
{str tag=tags}: {list_tags owner=$owner tags=$tags view=$viewid}
</div>
{/if}
{if $description || $tags}
......@@ -56,7 +55,7 @@
{/if}
<span class="title">
{if !$editing}
<a class="modal_link inner-link" title="{$child->hovertitle}" data-toggle="modal-docked" data-target="#configureblock" href="#" data-blockid="{$blockid}" data-artefactid="{$child->id}">
<a class="modal_link" title="{$child->hovertitle}" data-toggle="modal-docked" data-target="#configureblock" href="#" data-blockid="{$blockid}" data-artefactid="{$child->id}">
{/if}
<span class="text-small">{$child->title}</span>
{if !$editing}
......
......@@ -8,8 +8,7 @@
{/if}
{if $tags}
<div class="tags">
<strong>{str tag=tags}</strong>:
{list_tags owner=$owner tags=$tags view=$viewid}
{str tag=tags}: {list_tags owner=$owner tags=$tags view=$viewid}
</div>
{/if}
{if $description || $tags}
......@@ -26,7 +25,7 @@
<ul class="list-group">
{foreach from=$children item=child}
<li class="filedownload-item list-group-item">
<a class="inner-link file-icon-link" href="{$WWWROOT}artefact/artefact.php?artefact={$child->id}&amp;view={$viewid}" title="{$child->hovertitle}">
<a class="file-icon-link" href="{$WWWROOT}artefact/artefact.php?artefact={$child->id}&amp;view={$viewid}" title="{$child->hovertitle}">
{if $child->iconsrc}
<img src="{$child->iconsrc}" alt="{$child->artefacttype}" class="file-icon text-inline">
{else}
......@@ -34,7 +33,7 @@
{/if}
</a>
<h3 class="title list-group-item-heading text-inline">
<a href="{$WWWROOT}artefact/artefact.php?artefact={$child->id}&amp;view={$viewid}" class="inner-link" title="{$child->hovertitle}">
<a href="{$WWWROOT}artefact/artefact.php?artefact={$child->id}&amp;view={$viewid}" title="{$child->hovertitle}">
{$child->title}
</a>
<span class="filedate metadata">
......
......@@ -73,14 +73,14 @@
</td>
<td class="filename">
{if $file->artefacttype == 'folder'}
<a href="{$querybase|safe}folder={$file->id}{if $owner}&owner={$owner}{if $ownerid}&ownerid={$ownerid}{/if}{/if}" id="changefolder:{$file->id}" class="inner-link changefolder">
<a href="{$querybase|safe}folder={$file->id}{if $owner}&owner={$owner}{if $ownerid}&ownerid={$ownerid}{/if}{/if}" id="changefolder:{$file->id}" class="changefolder">
<span class="sr-only">{str tag=folder section=artefact.file}:</span>
<span class="display-title {if $file->isparent}accessible-hidden{/if}">{$displaytitle}</span>
</a>
{elseif !$publishable}
<span class="display-title">{$displaytitle}</span>
{else}
<a href="{$WWWROOT}artefact/file/download.php?file={$file->id}" title="{str tag=downloadfile section=artefact.file arg1=$displaytitle}" class="file-download-link inner-link {if $file->artefacttype == 'image' || $file->artefacttype == 'profileicon'}img-modal-preview{/if}">
<a href="{$WWWROOT}artefact/file/download.php?file={$file->id}" title="{str tag=downloadfile section=artefact.file arg1=$displaytitle}" class="file-download-link {if $file->artefacttype == 'image' || $file->artefacttype == 'profileicon'}img-modal-preview{/if}">
<span class="display-title">{$displaytitle}</span>
</a>
{/if}
......
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