diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-13 16:45:31 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-13 16:45:31 +0100 |
| commit | 0178840c19978cf4b0378609df0bcc004c6d36ae (patch) | |
| tree | c8a8bcb86661f6278e9e08439c9621638d387d1e /view | |
| parent | d04c73ae0000bcd7cf854a936f25583355e78def (diff) | |
| parent | 5d0646c9e1f207fa05fd923bcccd9f5844de2664 (diff) | |
| download | volse-hubzilla-0178840c19978cf4b0378609df0bcc004c6d36ae.tar.gz volse-hubzilla-0178840c19978cf4b0378609df0bcc004c6d36ae.tar.bz2 volse-hubzilla-0178840c19978cf4b0378609df0bcc004c6d36ae.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view')
| -rw-r--r-- | view/theme/redbasic/schema/bluegrid.css | 2 | ||||
| -rwxr-xr-x | view/tpl/photo_album.tpl | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css index 2c6f34558..3c856c5e2 100644 --- a/view/theme/redbasic/schema/bluegrid.css +++ b/view/theme/redbasic/schema/bluegrid.css @@ -299,7 +299,7 @@ input { border: 1px solid rgba(255,255,255,.5); } -.contact-entry-edit a:hover, .contact-entry-edit a:focus, .generic-content-wrapper-styled > p > span.btn.btn-default > a:hover,.generic-content-wrapper-styled > p > span.btn.btn-default > a:focus, div#profile-edit-links a:hover, div#profile-edit-links a:focus { +.contact-entry-edit:hover a, .contact-entry-edit:focus a, .generic-content-wrapper-styled > p > span.btn.btn-default > a:hover,.generic-content-wrapper-styled > p > span.btn.btn-default > a:focus, div#profile-edit-links a:hover, div#profile-edit-links a:focus { color: #43488A; } diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index d22f82f8e..bbcdcefc1 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,7 +1,9 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> <div class="pull-right"> + {{if $order}} <a class="btn btn-default btn-xs" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a> + {{/if}} <div class="btn-group btn-group"> {{if $album_edit.1}} <i class="icon-pencil btn btn-default btn-xs" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i> |