diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 7 | ||||
| -rw-r--r-- | view/theme/redbasic/php/config.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 2 | ||||
| -rwxr-xr-x | view/tpl/photo_albums.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 20 |
6 files changed, 10 insertions, 25 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 1e8d18269..8853a56c3 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -865,7 +865,7 @@ a .generic-icons:hover { .generic-icons-nav { - font-size: 1.2em; + font-size: 1rem; margin-right: 7px; } diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index fb048518e..14b977b80 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -3,13 +3,6 @@ */ $(document).ready(function() { - //this is a hotfix to make collapsible bs panels work again. this needs fixing in bootstrap. - $('a').on('click', function(e) { - if($(this).data('toggle') == 'collapse') { - e.preventDefault(); - } - }); - // CSS3 calc() fallback (for unsupported browsers) $('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>'); if( $('#css3-calc').width() == 10) { diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 042a495e5..752a02a6a 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -96,7 +96,7 @@ class RedbasicConfig { '$background_image' => array('redbasic_background_image', t('Set the background image'), $arr['background_image']), '$item_colour' => array('redbasic_item_colour', t('Set the background color of items'), $arr['item_colour']), '$comment_item_colour' => array('redbasic_comment_item_colour', t('Set the background color of comments'), $arr['comment_item_colour']), - '$font_size' => array('redbasic_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 87.5%, 14px')), + '$font_size' => array('redbasic_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 1rem, 100%, 16px')), '$font_colour' => array('redbasic_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']), '$radius' => array('redbasic_radius', t('Set radius of corners'), $arr['radius'], t('Example: 4px')), '$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $arr['shadow']), diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index ab760fdc1..a666f96f2 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -95,7 +95,7 @@ if (! $comment_item_colour) if (! $item_opacity) $item_opacity = '1'; if (! $font_size) - $font_size = '1rem'; + $font_size = '0.875rem'; if (! $font_colour) $font_colour = '#4d4d4d'; if (! $radius) diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl index c565ccaf1..a238e61bc 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}}</a></li> {{if $albums}} {{foreach $albums as $al}} {{if $al.shorttext}} diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index ed726d027..2431329ec 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -7,26 +7,18 @@ <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"> <i class="fa fa-cog"></i> {{$tools_label}} </button> - <ul class="dropdown-menu dropdown-menu-right"> + <div class="dropdown-menu dropdown-menu-right flex-column"> {{if $tools}} - <li class="nav-item"> - <a class="nav-link" href="{{$tools.profile.0}}"><i class="fa fa-user"></i> {{$tools.profile.1}}</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="{{$tools.cover.0}}"><i class="fa fa-picture-o"></i> {{$tools.cover.1}}</a> - </li> + <a class="dropdown-item" href="{{$tools.profile.0}}"><i class="fa fa-user"></i> {{$tools.profile.1}}</a> + <a class="dropdown-item" href="{{$tools.cover.0}}"><i class="fa fa-picture-o"></i> {{$tools.cover.1}}</a> {{/if}} {{if $map}} - <li class="nav-item"> - <a class="nav-link" href="#" onclick="var pos = $('#photo-map').css('position'); if(pos === 'absolute') { $('#photo-map').css( { position: 'relative', left: 'auto', top: 'auto' }); } else { $('#photo-map').css( { position: 'absolute', left: '-9999px', top: '-9999px' }); } return false; " ><i class="fa fa-globe"></i> {{$map_text}}</a> - </li> + <a class="dropdown-item" href="#" onclick="var pos = $('#photo-map').css('position'); if(pos === 'absolute') { $('#photo-map').css( { position: 'relative', left: 'auto', top: 'auto' }); } else { $('#photo-map').css( { position: 'absolute', left: '-9999px', top: '-9999px' }); } return false; " ><i class="fa fa-globe"></i> {{$map_text}}</a> {{/if}} {{if $edit}} - <li class="nav-item"> - <a class="nav-link acl-form-trigger" href="#" title="" onclick="openClose('photo-edit'); return false;" data-form_id="photo_edit_form"><i class="fa fa-pencil"></i> {{$edit.edit}}</a> - </li> + <a class="dropdown-item acl-form-trigger" href="#" title="" onclick="openClose('photo-edit'); return false;" data-form_id="photo_edit_form"><i class="fa fa-pencil"></i> {{$edit.edit}}</a> {{/if}} - </ul> + </div> </div> {{/if}} {{if $lock}} |