Skip to content

Commit

Permalink
Merge pull request #4438 from bolt/fix/22-no-scrolling-panes-on-userlist
Browse files Browse the repository at this point in the history
[2.2] No scrolling panes on userlist.
  • Loading branch information
SahAssar committed Nov 13, 2015
2 parents 426af1f + 41eec99 commit 80d78b2
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions app/view/twig/users/_userlist.twig
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<div class="table-responsive">
<table class="table-striped dashboardlisting userlist">
<thead>
<tr>
<th>{{ __('Id') }}</th>
<th>{{ __('Username') }}</th>
<th>{{ __('Last seen') }}</th>
<th class="hidden-xs">{{ __('Last seen') }}</th>
<th>{{ __('Roles') }}</th>
<th>{{ __('Actions') }}</th>
</tr>
Expand All @@ -26,7 +25,7 @@
{% if user.enabled == 0 %}</s>{% endif %}
</td>

<td>
<td class="hidden-xs">
{% if user.lastseen|date('Y') > "1901" %}
<time class="moment" datetime="{{ user.lastseen|date("c") }}" title="{{ user.lastseen }}">{{ user.lastseen }}</time>
{% else %}
Expand All @@ -51,4 +50,3 @@
</tbody>

</table>
</div>

0 comments on commit 80d78b2

Please sign in to comment.