diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-29 16:11:50 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-03-29 16:11:50 -0700 |
| commit | 2d4f84563b8832d2a5996e7ee59a3123f998c433 (patch) | |
| tree | d6a220cfdf5db2eac2c2513ab41b629e4fe2ddfa /view | |
| parent | ad3a3273660600be7932229a7af0293c1f04e28b (diff) | |
| parent | 3b6a0d8e5cb787bace27aee67f7ae0f4130e3132 (diff) | |
| download | volse-hubzilla-2d4f84563b8832d2a5996e7ee59a3123f998c433.tar.gz volse-hubzilla-2d4f84563b8832d2a5996e7ee59a3123f998c433.tar.bz2 volse-hubzilla-2d4f84563b8832d2a5996e7ee59a3123f998c433.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/bootstrap-red.css | 1 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 13 | ||||
| -rwxr-xr-x | view/tpl/admin_channels.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/photo_albums.tpl | 2 |
4 files changed, 15 insertions, 7 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 73f71fe7f..0df56f621 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -33,7 +33,6 @@ nav .badge { padding: 0.2rem 0; } - #navbar-collapse-1 i { font-size: 0.9rem; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 156df07ff..601124227 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -878,14 +878,22 @@ margin-right: 50px; list-style-type: none; } -.generic-icons { +.generic-icons, +a .generic-icons { font-size: 1rem; margin-right: 0.5rem; + color: $font_colour; +} + +.generic-icons:hover, +a .generic-icons:hover { + color: $font_colour; } .generic-icons-right { font-size: 1rem; margin-left: 0.5rem; + color: $font_colour; } @@ -901,7 +909,8 @@ margin-right: 50px; .drop-icons, a .drop-icons { - font-size: 1.2em; + font-size: 1rem; + color: $font_colour; text-decoration: none; cursor: pointer; } diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl index 087ce6d3c..452e0eeec 100755 --- a/view/tpl/admin_channels.tpl +++ b/view/tpl/admin_channels.tpl @@ -34,9 +34,9 @@ <td class='channel_address'>{{$c.channel_address}}</td> <td class="checkbox_bulkedit"><input type="checkbox" class="channels_ckbx" id="id_channel_{{$c.channel_id}}" name="channel[]" value="{{$c.channel_id}}"/></td> <td class="tools"> - <a href="{{$baseurl}}/admin/channels/block/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-outline-secondary btn-sm" title='{{if ($c.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='fa fa-ban admin-icons {{if ($c.blocked)}}dim{{/if}}'></i></a> - <a href="{{$baseurl}}/admin/channels/code/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-outline-secondary btn-sm" title='{{if ($c.allowcode)}}{{$uncode}}{{else}}{{$code}}{{/if}}'><i class='fa fa-terminal admin-icons {{if ($c.allowcode)}}dim{{/if}}'></i></a> - <a href="{{$baseurl}}/admin/channels/delete/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-outline-secondary btn-sm" title='{{$delete}}' onclick="return confirm_delete('{{$c.channel_name}}')"><i class='fa fa-trash-o admin-icons'></i></a> + <a href="{{$baseurl}}/admin/channels/block/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($c.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='fa fa-ban admin-icons {{if ($c.blocked)}}dim{{/if}}'></i></a> + <a href="{{$baseurl}}/admin/channels/code/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs{{if ($c.allowcode)}} btn-danger{{/if}}" title='{{if ($c.allowcode)}}{{$uncode}}{{else}}{{$code}}{{/if}}'><i class='fa fa-terminal admin-icons {{if ($c.allowcode)}}dim{{/if}}'></i></a> + <a href="{{$baseurl}}/admin/channels/delete/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$c.channel_name}}')"><i class='fa fa-trash-o admin-icons'></i></a> </td> </tr> {{/foreach}} diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl index aa78c513a..c565ccaf1 100755 --- a/view/tpl/photo_albums.tpl +++ b/view/tpl/photo_albums.tpl @@ -1,7 +1,7 @@ <div id="side-bar-photos-albums" class="widget"> <h3>{{$title}}</h3> <ul class="nav nav-pills flex-column"> - <li class="nav-item"><a class="nav-link"href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$recent_photos}}</a></li> + <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$recent_photos}}</a></li> {{if $albums}} {{foreach $albums as $al}} {{if $al.shorttext}} |