Commit 27cfbf2f authored by Liam Sharpe's avatar Liam Sharpe Committed by Aaron Wells
Browse files

fix line break in group admin area, enlarged text, collapsable advanced options

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I296c53f3d2fbaacde6320a94dec69706541c2ed7
parent 217f4ff9
...@@ -11,6 +11,10 @@ ...@@ -11,6 +11,10 @@
&.text-success { &.text-success {
@extend .text-success; @extend .text-success;
} }
&.text-link {
@extend .text-link;
}
} }
.panel-body & { .panel-body & {
margin-bottom: 0; margin-bottom: 0;
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
margin-top: -5px; margin-top: -5px;
margin-left: -5px; margin-left: -5px;
margin-right: 5px; margin-right: 5px;
max-width: 20%;
} }
img { img {
@include border-radius(3px); @include border-radius(3px);
...@@ -69,6 +70,10 @@ ...@@ -69,6 +70,10 @@
display: inline-block; display: inline-block;
} }
.with-user-icon {
max-width:80%;
}
.panel-heading { .panel-heading {
a.has-user-icon , a.has-user-icon.collapsed { a.has-user-icon , a.has-user-icon.collapsed {
padding-left:65px; //make room for user image padding-left:65px; //make room for user image
......
...@@ -15,6 +15,10 @@ ...@@ -15,6 +15,10 @@
color: #FE6500; color: #FE6500;
} }
.text-link {
color: $link-color;
}
.text-watermark { .text-watermark {
@include text-shadow(0 1px 0 #fff); @include text-shadow(0 1px 0 #fff);
opacity: 0.3; opacity: 0.3;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -61,13 +61,14 @@ ...@@ -61,13 +61,14 @@
<p class="mbm"> <p class="mbm">
<span class="prs fa fa-user"></span> <span class="prs fa fa-user"></span>
<span class="">{str tag=groupadmins section=group}:</span> <span class="">{str tag=groupadmins section=group}:</span>
</p> {foreach name=admins from=$group->admins item=user}
<p class="mbm"> <a href="{profile_url($user)}" class="mbs mls">
{foreach name=admins from=$group->admins item=user}
<a href="{profile_url($user)}" class="label label-default mbs">
<img src="{profile_icon_url user=$user maxwidth=20 maxheight=20}" alt="{str tag=profileimagetext arg1=$user|display_default_name}" class="user-icon-alt"> <img src="{profile_icon_url user=$user maxwidth=20 maxheight=20}" alt="{str tag=profileimagetext arg1=$user|display_default_name}" class="user-icon-alt">
{$user|display_name} {$user|display_name}
</a> </a>
{/foreach} {/foreach}
</p> </p>
</div> </div>
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<img src="{profile_icon_url user=$r maxwidth=40 maxheight=40}" alt="{str tag=profileimagetext arg1=$r|display_default_name}"> <img src="{profile_icon_url user=$r maxwidth=40 maxheight=40}" alt="{str tag=profileimagetext arg1=$r|display_default_name}">
</div> </div>
<div class="pull-left"> <div class="pull-left with-user-icon">
<h4 class="list-group-item-heading"> <h4 class="list-group-item-heading">
{$r.name} {$r.name}
...@@ -18,14 +18,13 @@ ...@@ -18,14 +18,13 @@
<span class="grouprole metadata"> - <span class="grouprole metadata"> -
{$results.roles[$r.role]->display} {$results.roles[$r.role]->display}
{if $caneditroles && $r.canchangerole} {if $caneditroles && $r.canchangerole}
<small> <a href="{$WWWROOT}group/changerole.php?group={$group}&amp;user={$r.id}" class="inner-link text-link">
<a href="{$WWWROOT}group/changerole.php?group={$group}&amp;user={$r.id}" class="inner-link"> [{str tag=changerole section=group}]
[{str tag=changerole section=group}] </a>
</a> {/if}
</small>
{/if}
</span> </span>
{/if} {/if}
</h4> </h4>
{if $r.role} {if $r.role}
<div class="rel"> <div class="rel">
......
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