Skip to content

GitLab

mahara
mahara
Commit a081099b authored by Evonne Cheung's avatar Evonne Cheung
1 Browse files
Options

Bug #1823253 Plan block layout is broken on edit screen 

Found the class .pull-right no longer existed in raw, so changed
all .pull-right to .float-right

behatnotneeded

Change-Id: I3411004af8632c7d9d557ea8feef20652d706af7
parent b4764131
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 13 deletions
htdocs/theme/primaryschool/sass/layout/card/_card-footer.scss
View file @ a081099b
......@@ -6,11 +6,11 @@ a.card-footer {
.icon {
color: scale-color($theme-primary-color, $lightness: 5%);
}
.icon.pull-right { //only apply link colorto right aligned icons
.icon.float-right { //only apply link colorto right aligned icons
color: scale-color($theme-primary-color, $lightness: 5%);
}
}
.icon.pull-right {
.icon.float-right {
color: $theme-primary-color;
}
}
htdocs/theme/raw/plugintype/artefact/peerassessment/templates/assessmentlist.tpl
View file @ a081099b
......@@ -30,7 +30,7 @@
</span>
</h5>
<!-- The "assessment-item-buttons" class is used as an identifier by Javascript -->
<div class="btn-group pull-right assessment-item-buttons">
<div class="btn-group float-right assessment-item-buttons">
{if $item->editlink}
{$item->editlink|safe}
{/if}
......
htdocs/theme/raw/plugintype/artefact/plans/blocktype/plans/templates/content.tpl
View file @ a081099b
......@@ -4,7 +4,7 @@
{foreach from=$plans item=plan}
<div class="card-body flush">
{if $editing}
<div class="pull-right btn-group">
<div class="float-right btn-group">
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/edit/index.php?id={$plan.id}{if $plan.view}&view={$plan.view}{/if}" title="{str(tag=editspecific arg1=$plan.title)|escape:html|safe}">
<span class="icon icon-pencil"></span>
<span class="sr-only">{str tag='edit'}</span>
......
htdocs/theme/raw/plugintype/artefact/plans/templates/taskrows.tpl
View file @ a081099b
......@@ -2,7 +2,7 @@
{if $task->completed == -1}
<div class="task-item plan_incomplete list-group-item {if $task->description || $task->tags}list-group-item-default{/if}">
{if $editing}
<div class="pull-right btn-group">
<div class="float-right btn-group">
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/edit/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='editthistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-pencil text-default"></span></a>
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/delete/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='deletethistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-trash text-danger"></span></a>
</div>
......@@ -41,7 +41,7 @@
{else}
<div class="task-item list-group-item {if $task->description || $task->tags}list-group-item-default{/if}">
{if $editing}
<div class="pull-right btn-group">
<div class="float-right btn-group">
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/edit/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='editthistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-pencil text-default"></span></a>
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/delete/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='deletethistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-trash text-danger"></span></a>
</div>
......
htdocs/theme/raw/plugintype/blocktype/recentforumposts/templates/latestforumposts.tpl
View file @ a081099b
......@@ -33,7 +33,7 @@
<span class="metadata">
({$postinfo->filecount})
</span>
<span class="icon icon-chevron-down collapse-indicator pull-right" role="presentation" aria-hidden="true"></span>
<span class="icon icon-chevron-down collapse-indicator float-right" role="presentation" aria-hidden="true"></span>
</a>
</h5>
<div class="collapse" id="post-attach-{$postinfo->id}">
......@@ -56,7 +56,7 @@
<span class="metadata"> - [{$file->size|display_size}]</span>
</a>
</span>
<span class="icon icon-download icon-lg pull-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>
</li>
{/foreach}
</ul>
......
htdocs/theme/raw/plugintype/blocktype/recentforumposts/templates/recentforumposts.tpl
View file @ a081099b
......@@ -30,7 +30,7 @@
<span class="metadata">
({$postinfo->filecount})
</span>
<span class="icon icon-chevron-down collapse-indicator pull-right" role="presentation" aria-hidden="true"></span>
<span class="icon icon-chevron-down collapse-indicator float-right" role="presentation" aria-hidden="true"></span>
</a>
</h5>
<div class="collapse" id="post-attach-{$postinfo->id}">
......@@ -53,7 +53,7 @@
<span class="metadata"> - [{$file->size|display_size}]</span>
</a>
</span>
<span class="icon icon-download icon-lg pull-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>
</li>
{/foreach}
</ul>
......
htdocs/theme/raw/sass/components/_btn-group.scss
View file @ a081099b
......@@ -121,6 +121,7 @@
.btn-group {
z-index: 3;
margin-left: 5px;
}
// Chrome bug - flex container doesn't work on fieldset tag
......
htdocs/theme/raw/sass/components/_list-group.scss
View file @ a081099b
......@@ -198,7 +198,7 @@
margin-top: 5px;
}
@include media-breakpoint-up(lg) {
margin-top: -10px;
margin-top: -13px;
}
}
}
......@@ -218,8 +218,13 @@
display: block;
margin: 0 10px 0 0;
&.small-icon {
width: 35px;
height: 35px;
padding: 0;
width: 20px;
height: 20px;
img {
width: 22px;
height: 22px;
}
}
}
.list-group-item-heading {
......
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