Commit cfc151e0 authored by Evonne's avatar Evonne Committed by Robert Lyon

Bug 1845104 Various small style bugs

- Chervons missing in inbox block, conflicting with text-small.
- People list h4 wrapping portfolio list, moving it out.
- dashboard editbuttons placement dependent on h1/h2 above, put in
  better conditions so it doesn't need it at all.
- Plans chervon too far in, moved it out as no longer has details.

behatnotneeded

Change-Id: I50e60e2fb2c8be2370856823497a1b9099d1c28f
parent e541a11d
......@@ -32,9 +32,13 @@
}
a[data-toggle="collapse"] .collapse-indicator,
a[data-toggle="collapse"].collapsed .collapse-indicator {
margin-right: 90px;
margin-right: 10px;
margin-top: 17px;
}
& .btn-group + a[data-toggle="collapse"] .collapse-indicator,
& .btn-group + a[data-toggle="collapse"].collapsed .collapse-indicator {
margin-right: 90px;
}
.plan-task-icon {
vertical-align: top;
padding-top: 4px;
......
......@@ -95,6 +95,10 @@
.postedon {
font-family: $font-family-base;
}
.text-small {
font-family: $font-family-base;
}
}
.list-group-item h4.list-group-item-heading {
......
......@@ -175,6 +175,9 @@ $logged-in-height-mobile: 100px;
.dashboard-editable {
margin-top: $grid-gutter-width;
padding: ($grid-gutter-width - 10) 0;
border-top: 1px solid $btn-secondary-border;
#editdashboard {
margin-top: 0;
}
}
......@@ -22,7 +22,6 @@
.text-small {
font-size: $font-size-sm;
font-family: $font-family-base;
}
.text-tiny {
......
......@@ -4,7 +4,7 @@
<div class="user-icon user-icon-40 float-left">
<img src="{profile_icon_url user=$user maxwidth=40 maxheight=40}" alt="{str tag=profileimagetext arg1=$user|display_default_name}">
</div>
<h4 class="list-group-item-heading middle">
<h4 class="list-group-item-heading middle inline">
<a href="{profile_url($user)}" >
<span class="sr-only">{$user->display_name}</span>
{$user->display_name}
......@@ -18,19 +18,18 @@
- {str tag='existingfriend' section='group'}
</span>
{/if}
{if $user->friend && $user->views}
<p class="viewlist">
<strong>
{str tag='Portfolios' section='view'}:
</strong>
{foreach from=$user->views item=view name=addr}
<a href="{$view->fullurl}">{$view->title}</a>{if !$dwoo.foreach.addr.last}, {/if}
{/foreach}
</p>
{/if}
</h4>
{if $user->friend && $user->views}
<p class="viewlist detail text-small">
<strong>
{str tag='Portfolios' section='view'}:
</strong>
{foreach from=$user->views item=view name=addr}
<a href="{$view->fullurl}">{$view->title}</a>{if !$dwoo.foreach.addr.last}, {/if}
{/foreach}
</p>
{/if}
{if $user->institutions}
<div class="memberof detail text-small">
<span class="icon icon-lg text-default icon-university left" role="presentation" aria-hidden="true"></span>
......@@ -38,7 +37,7 @@
</div>
{/if}
{if $user->introduction}
<div class="text-small text-midtone">
<div class="text-small detail text-midtone">
<a class="inner-link text-link collapsed with-introduction" data-toggle="collapse" data-target="#userintro{$user->id}"
href="#userintro{$user->id}" role="button" aria-expanded="false"
aria-controls="userintro{$user->id}">
......
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