Skip to content
GitLab
Commit 02f0cb3e authored by Pat Kira's avatar Pat Kira Committed by Jono Mingard
Browse files

Minor style fixes part 2 (bug: 1465107) 

Task no: 24843, 24842, 24841
Also quick fix on switchbox styling

Change-Id: I082de8afddaf4dffff1cd278d3d4046fcb027edb
behatnotneeded: styling only
(cherry picked from commit 37b839e8)
parent d09ba0a1
Hide whitespace changes
Inline Side-by-side
htdocs/artefact/resume/lib.php
View file @ 02f0cb3e
......@@ -1025,7 +1025,7 @@ EOF;
return "
function (r, d) {
if (!{$bodystring} && !{$attachstring}) {
return TD(null, STRONG(null, {$titlestring}), DIV({'class': 'detail text-lighttone'}, {$extrastring}));
return TD(null, SPAN(null, {$titlestring}), DIV({'class': 'detail text-lighttone'}, {$extrastring}));
}
var link = A({'class': 'toggle textonly', 'href': ''}, {$titlestring});
connect(link, 'onclick', function (e) {
......@@ -1174,7 +1174,7 @@ function listAttachments(attachments) {
var item = attachments[i];
var href = self.config.wwwroot + 'artefact/file/download.php?file=' + attachments[i].id;
var link = A({'href': href}, {$downloadstr});
appendChildNodes(tbody, TR(null, TD(null, item.title + ' (' + formatSize(item.size) + ') - ', STRONG(null, link))));
appendChildNodes(tbody, TR(null, TD(null, item.title + ' (' + formatSize(item.size) + ') - ', SPAN(null, link))));
}
return TABLE({'class': 'table'}, thead, tbody);
}
......
htdocs/theme/raw/sass/components/_btn.scss
View file @ 02f0cb3e
......@@ -224,19 +224,24 @@ td.btn-group {
.btn-group-vertical {
.indicator {
margin-left: -4px;
font-size: 9px;
padding: 10px 5px 0 0;
font-size: $font-size-base - 3;
padding: 7px 5px 0 0;
vertical-align: top;
&.icon-arrows {
vertical-align: middle;
margin-left: -7px;
}
}
.title {
margin-left: 10px;
white-space: normal;
margin-left: 5px;
display: inline-block;
}
.block-icon {
vertical-align: middle;
margin-left:-2px;
display: inline-block;
vertical-align: top;
margin-top: 5px;
margin-left: -2px;
font-size: 14px;
.col-collapsed & {
margin-left: 2px;
......@@ -273,7 +278,7 @@ td.btn-group {
padding-right: 5px;
padding-top: 3px;
width: auto;
max-width: 90%;
max-width: 85%;
margin-left: 2px;
}
}
......
htdocs/theme/raw/sass/components/_indicator.scss
View file @ 02f0cb3e
.expand-indicator,
.move-indicator {
@extend .text-muted;
font-size: 9px;
font-size: $font-size-base - 3;
vertical-align: middle;
margin-left: -4px;
opacity: 0.7;
......@@ -12,9 +11,9 @@
}
.panel-secondary & {
float: left;
margin-top: -5px;
margin-left: -6px;
margin-right: -2px;
margin-top: 5px;
margin-left: 0;
margin-right: 4px;
}
}
......@@ -65,6 +64,7 @@ a[data-toggle="collapse"] {
}
.expand-indicator {
@extend .text-muted;
font-size: 12px;
padding-right: 5px;
+ .icon {
......
htdocs/theme/raw/sass/components/_switch.scss
View file @ 02f0cb3e
......@@ -115,8 +115,7 @@ $height: 28px;
border: 1px solid rgba(darken($brand-danger, 5%), 0.8);
position: absolute;
top: 3px;
//bottom: 0;
right: 38px;
right: 3.5rem;
}
input:checked + .switch-label .switch-indicator {
......@@ -125,7 +124,7 @@ $height: 28px;
border: 1px solid rgba(darken($brand-success, 5%), 0.8);
~ .off {
text-indent: 50%;
text-indent: 55%;
}
~ .on {
......@@ -143,12 +142,12 @@ $height: 28px;
margin-top:-$height;
&.off {
padding-left: 30px;
padding-left: 45%;
text-indent: 0;
}
&.on {
text-indent: -50%;
text-indent: -55%;
}
}
}
htdocs/theme/raw/sass/layout/_profile-block.scss
View file @ 02f0cb3e
......@@ -3,6 +3,7 @@
.username {
padding: 10px 75px 10px 15px;
display: block;
word-break: break-all;
}
.user-icon {
z-index: 5;
......@@ -38,3 +39,7 @@
}
}
}
.loginas {
padding-right: 60px;
}
htdocs/theme/raw/sass/typography/_tables.scss
View file @ 02f0cb3e
......@@ -80,7 +80,7 @@ td.tiny {
width: 50px;
.movedown,
.moveup {
color: #000000;
@extend .text-midtone;
font-size: 20px;
}
}
......
htdocs/theme/raw/templates/admin/users/edit.tpl
View file @ 02f0cb3e
......@@ -36,20 +36,18 @@
<img src="{profile_icon_url user=$user maxheight=100 maxwidth=100}" alt="{str tag=profileimagetext arg1=$user|display_default_name}">
</a>
</h3>
<div class="panel-body">
{if $loginas}
<div id="loginas">
<a class="btn btn-link" href="{$WWWROOT}admin/users/changeuser.php?id={$user->id}">
<p id="loginas" class="loginas">
<a href="{$WWWROOT}admin/users/changeuser.php?id={$user->id}">
{str tag=loginasthisuser section=admin}
</a>
</div>
</p>
{/if}
<div class="list-group">
{if $suspendable && $deletable}
<button type="button" class="btn btn-link" data-toggle="modal" data-target="#suspenddeletemodal">
{str tag=suspendordeletethisuser section=admin}
</button>
<a href="" data-toggle="modal" data-target="#suspenddeletemodal">
{str tag=suspendordeletethisuser section=admin}
</a>
{/if}
</div>
</div>
......@@ -85,9 +83,6 @@
</div>
{/if}
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
......
htdocs/theme/raw/templates/collection/views.json.tpl
View file @ 02f0cb3e
......@@ -4,21 +4,21 @@
{if $views.count > 1}
{if $view->displayorder == $views.min}
<a class="btn btn-xs text-default order-sort-control single-arrow-down" href="{$displayurl}&amp;view={$view->view}&amp;direction=down">
<span class="icon icon-lg icon-long-arrow-down"></span>
<span class="icon icon-lg icon-long-arrow-down text-midtone"></span>
<span class="sr-only">{str tag=moveitemdown}</span>
</a>
{elseif $view->displayorder == $views.max}
<a class="btn btn-xs text-default order-sort-control single-arrow-up" href="{$displayurl}&amp;view={$view->view}&amp;direction=up">
<a class="btn btn-xs text-default order-sort-control single-arrow-up text-midtone" href="{$displayurl}&amp;view={$view->view}&amp;direction=up">
<span class="icon icon-lg icon-long-arrow-up left"></span>
<span class="sr-only">{str tag=moveitemup}</span>
</a>
{else}
<a class="btn btn-xs text-default order-sort-control" href="{$displayurl}&amp;view={$view->view}&amp;direction=up">
<span class="icon icon-lg icon-long-arrow-up left"></span>
<span class="icon icon-lg icon-long-arrow-up left text-midtone"></span>
<span class="sr-only">{str tag=moveitemup}</span>
</a>
<a class="btn btn-xs text-default order-sort-control" href="{$displayurl}&amp;view={$view->view}&amp;direction=down">
<span class="icon icon-lg icon-long-arrow-down "></span>
<span class="icon icon-lg icon-long-arrow-down text-midtone"></span>
<span class="sr-only">{str tag=moveitemdown}</span>
</a>
{/if}
......
htdocs/theme/raw/templates/collection/views.tpl
View file @ 02f0cb3e
......@@ -39,22 +39,22 @@
<li class="list-group-item" id="row_{$view->view}">
{if $views.count > 1}
{if $view->displayorder == $views.min}
<a class="btn btn-xs text-default order-sort-control single-arrow-down" href="{$displayurl}&amp;view={$view->view}&amp;direction=down">
<a class="btn btn-xs text-default order-sort-control single-arrow-down text-midtone" href="{$displayurl}&amp;view={$view->view}&amp;direction=down">
<span class="icon icon-lg icon-long-arrow-down"></span>
<span class="sr-only">{str tag=moveitemdown}</span>
</a>
{elseif $view->displayorder == $views.max}
<a class="btn btn-xs text-default order-sort-control single-arrow-up" href="{$displayurl}&amp;view={$view->view}&amp;direction=up">
<a class="btn btn-xs text-default order-sort-control single-arrow-up text-midtone" href="{$displayurl}&amp;view={$view->view}&amp;direction=up">
<span class="icon icon-lg icon-long-arrow-up left"></span>
<span class="sr-only">{str tag=moveitemup}</span>
</a>
{else}
<a class="btn btn-xs text-default order-sort-control" href="{$displayurl}&amp;view={$view->view}&amp;direction=up">
<span class="icon icon-lg icon-long-arrow-up left"></span>
<span class="icon icon-lg icon-long-arrow-up left text-midtone"></span>
<span class="sr-only">{str tag=moveitemup}</span>
</a>
<a class="btn btn-xs text-default order-sort-control" href="{$displayurl}&amp;view={$view->view}&amp;direction=down">
<span class="icon icon-lg icon-long-arrow-down"></span>
<span class="icon icon-lg icon-long-arrow-down text-midtone"></span>
<span class="sr-only">{str tag=moveitemdown}</span>
</a>
{/if}
......
htdocs/theme/raw/templates/form/authlist.tpl
View file @ 02f0cb3e
......@@ -56,10 +56,10 @@
for(i = 0; i < displayArray.length; i++) {
if(displayArray.length > 1) {
if (i + 1 != displayArray.length) {
getFirstElementByTagAndClassName('span', 'authIcons', displayArray[i]).innerHTML += '<a class="btn btn-link" href="" onclick="move_down('+outputArray[i]+'); return false;"><span class="icon icon-long-arrow-down"></span><span class="sr-only">'+get_string('moveitemdown')+'</span></a>'+"\n";
getFirstElementByTagAndClassName('span', 'authIcons', displayArray[i]).innerHTML += '<a class="btn btn-link text-midtone" href="" onclick="move_down('+outputArray[i]+'); return false;"><span class="icon icon-long-arrow-down"></span><span class="sr-only">'+get_string('moveitemdown')+'</span></a>'+"\n";
}
if(i != 0) {
getFirstElementByTagAndClassName('span', 'authIcons', displayArray[i]).innerHTML += '<a class="btn btn-link" href="" onclick="move_up('+outputArray[i]+'); return false;"><span class="icon icon-long-arrow-up"></span><span class="sr-only">'+get_string('moveitemup')+'</span></a>'+"\n";
getFirstElementByTagAndClassName('span', 'authIcons', displayArray[i]).innerHTML += '<a class="btn btn-link text-midtone" href="" onclick="move_up('+outputArray[i]+'); return false;"><span class="icon icon-long-arrow-up"></span><span class="sr-only">'+get_string('moveitemup')+'</span></a>'+"\n";
}
}
......@@ -193,13 +193,13 @@ IMPORTANT: do not introduce any new whitespace into the instanceList div.
</label>
<span class="authIcons" id="arrows{{$instance->id}}">
{{if $instance->index + 1 < $instance->total}}
<a class="btn btn-link" href="" onclick="move_down({{$instance->id}}); return false;">
<a class="btn btn-link text-midtone" href="" onclick="move_down({{$instance->id}}); return false;">
<span class="icon icon-long-arrow-down"></span>
<span class="sr-only">{{str tag=moveitemdown}}</span>
</a>
{{/if}}
{{if $instance->index != 0 }}
<a class="btn btn-link" href="" onclick="move_up({{$instance->id}}); return false;">
<a class="btn btn-link text-midtone" href="" onclick="move_up({{$instance->id}}); return false;">
<span class="icon icon-long-arrow-up"></span>
<span class="sr-only">{{str tag=moveitemup}}</span>
</a>
......
htdocs/theme/raw/templates/sideblocks/onlineusers.tpl
View file @ 02f0cb3e
<div class="panel panel-default">
<h3 class="panel-heading">
{str tag="onlineusers" args=$sbdata.count}
<span id="lastminutes" class="pull-right metadata">({str tag="lastminutes" args=$sbdata.lastminutes})</span>
<br>
<span id="lastminutes" class="metadata">({str tag="lastminutes" args=$sbdata.lastminutes})</span>
</h3>
<ul class="list-group">
{foreach from=$sbdata.users item=user}
......
Supports Markdown
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