diff options
| -rw-r--r-- | Zotlabs/Module/Settings/Permcats.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 14 | ||||
| -rwxr-xr-x | view/tpl/abook_edit.tpl | 33 | ||||
| -rwxr-xr-x | view/tpl/prv_message.tpl | 28 |
4 files changed, 31 insertions, 46 deletions
diff --git a/Zotlabs/Module/Settings/Permcats.php b/Zotlabs/Module/Settings/Permcats.php index 35d533196..90dc526bf 100644 --- a/Zotlabs/Module/Settings/Permcats.php +++ b/Zotlabs/Module/Settings/Permcats.php @@ -114,4 +114,4 @@ logger('cmd: ' . \App::$cmd); return $o; } -}
\ No newline at end of file +} diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e7d70d35c..5e579a213 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -952,11 +952,6 @@ margin-right: 50px; margin-right: 7px; } -nav .navbar-collapse.in .generic-icons, -nav .navbar-collapse.collapsing .generic-icons { - color: $nav_active_icon_colour; -} - .admin-icons { font-size: 1.2em; color: $toolicon_colour; @@ -1267,8 +1262,6 @@ img.mail-conv-sender-photo { border-radius: $radiuspx; } -/* nav bootstrap */ - .menu-img-3 { width: 3.3em; height: 3.3em; @@ -1557,13 +1550,6 @@ blockquote { } -/* release the navbar in landscape view on small devices */ -@media screen and (max-height: 320px) { - .navbar-fixed-top { - position: absolute; - } -} - .shareable_element_text { height: 300px; width: 300px; diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index be9fcc2a3..e2f3f3205 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -6,32 +6,31 @@ <button id="connection-dropdown" class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="fa fa-cog"></i> {{$tools_label}} </button> - <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel"> - <li><a href="{{$tools.view.url}}" title="{{$tools.view.title}}">{{$tools.view.label}}</a></li> - <li><a href="{{$tools.recent.url}}" title="{{$tools.recent.title}}">{{$tools.recent.label}}</a></li> + <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel"> + <a class="dropdown-item" href="{{$tools.view.url}}" title="{{$tools.view.title}}">{{$tools.view.label}}</a> + <a class="dropdown-item" href="{{$tools.recent.url}}" title="{{$tools.recent.title}}">{{$tools.recent.label}}</a> {{if $tools.fetchvc}} - <li><a href="{{$tools.fetchvc.url}}" title="{{$tools.fetchvc.title}}">{{$tools.fetchvc.label}}</a></li> + <a class="dropdown-item" href="{{$tools.fetchvc.url}}" title="{{$tools.fetchvc.title}}">{{$tools.fetchvc.label}}</a> {{/if}} - <li><a href="#" title="{{$tools.refresh.title}}" onclick="window.location.href='{{$tools.refresh.url}}'; return false;">{{$tools.refresh.label}}</a></li> - <li><a href="#" title="{{$tools.rephoto.title}}" onclick="window.location.href='{{$tools.rephoto.url}}'; return false;">{{$tools.rephoto.label}}</a></li> - <li class="divider"></li> - <li><a href="#" title="{{$tools.block.title}}" onclick="window.location.href='{{$tools.block.url}}'; return false;">{{$tools.block.label}}</a></li> - <li><a href="#" title="{{$tools.ignore.title}}" onclick="window.location.href='{{$tools.ignore.url}}'; return false;">{{$tools.ignore.label}}</a></li> - <li><a href="#" title="{{$tools.archive.title}}" onclick="window.location.href='{{$tools.archive.url}}'; return false;">{{$tools.archive.label}}</a></li> - <li><a href="#" title="{{$tools.hide.title}}" onclick="window.location.href='{{$tools.hide.url}}'; return false;">{{$tools.hide.label}}</a></li> - <li><a href="#" title="{{$tools.delete.title}}" onclick="window.location.href='{{$tools.delete.url}}'; return false;">{{$tools.delete.label}}</a></li> - </ul> + <a class="dropdown-item" href="#" title="{{$tools.refresh.title}}" onclick="window.location.href='{{$tools.refresh.url}}'; return false;">{{$tools.refresh.label}}</a> + <a class="dropdown-item" href="#" title="{{$tools.rephoto.title}}" onclick="window.location.href='{{$tools.rephoto.url}}'; return false;">{{$tools.rephoto.label}}</a> + <div class="dropdown-divider"></div> + <a class="dropdown-item" href="#" title="{{$tools.block.title}}" onclick="window.location.href='{{$tools.block.url}}'; return false;">{{$tools.block.label}}</a> + <a class="dropdown-item" href="#" title="{{$tools.ignore.title}}" onclick="window.location.href='{{$tools.ignore.url}}'; return false;">{{$tools.ignore.label}}</a> + <a class="dropdown-item" href="#" title="{{$tools.archive.title}}" onclick="window.location.href='{{$tools.archive.url}}'; return false;">{{$tools.archive.label}}</a> <a class="dropdown-item" href="#" title="{{$tools.hide.title}}" onclick="window.location.href='{{$tools.hide.url}}'; return false;">{{$tools.hide.label}}</a> + <a class="dropdown-item" href="#" title="{{$tools.delete.title}}" onclick="window.location.href='{{$tools.delete.url}}'; return false;">{{$tools.delete.label}}</a> + </div> </div> {{if $abook_prev || $abook_next}} <div class="btn-group"> <a href="connedit/{{$abook_prev}}{{if $section}}?f=§ion={{$section}}{{/if}}" class="btn btn-outline-secondary btn-sm{{if ! $abook_prev}} disabled{{/if}}" ><i class="fa fa-backward"></i></a> <button class="btn btn-outline-secondary btn-sm{{if $is_pending}} disabled{{/if}}" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars"></i></button> <a href="connedit/{{$abook_next}}{{if $section}}?f=§ion={{$section}}{{/if}}" class="btn btn-outline-secondary btn-sm{{if ! $abook_next}} disabled{{/if}}" ><i class="fa fa-forward"></i></a> - <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel"> + <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel"> {{foreach $sections as $s}} - <li><a href="{{$s.url}}" title="{{$s.title}}">{{$s.label}}</a></li> + <a class="dropdown-item" href="{{$s.url}}" title="{{$s.title}}">{{$s.label}}</a> {{/foreach}} - </ul> + </div> </div> {{/if}} </div> @@ -470,7 +469,7 @@ </h3> </div> {{/if}} - <div id="perms-tool-collapse" class="panel-collapse collapse{{if $self || $section === 'perms'}} in{{/if}}" role="tabpanel" aria-labelledby="perms-tool"> + <div id="perms-tool-collapse" class="panel-collapse collapse{{if $self || $section === 'perms'}} show{{/if}}" role="tabpanel" aria-labelledby="perms-tool"> <div class="section-content-tools-wrapper"> <div class="section-content-warning-wrapper"> {{if $notself}}{{$permnote}}{{/if}} diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index ba09edcf0..881bf1a55 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -31,12 +31,12 @@ <textarea class="form-control" id="prvmail-text" name="body">{{$text}}</textarea> </div> <div id="prvmail-submit-wrapper" class="form-group"> - <div id="prvmail-submit" class="pull-right btn-group"> + <div id="prvmail-submit" class="float-right btn-group"> <button class="btn btn-outline-secondary btn-sm" id="prvmail-preview" title="{{$preview}}" onclick="preview_mail(); return false;"><i class="fa fa-eye"></i></button> <button class="btn btn-primary btn-sm" type="submit" id="prvmail-submit" name="submit" value="{{$submit}}">{{$submit}}</button> </div> - <div id="prvmail-tools" class="btn-toolbar pull-left"> - <div class="btn-group"> + <div id="prvmail-tools" class="btn-toolbar float-left"> + <div class="btn-group mr-2"> <button id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'prvmail-text'); return false;"> <i class="fa fa-bold jot-icons"></i> </button> @@ -53,7 +53,7 @@ <i class="fa fa-terminal jot-icons"></i> </button> </div> - <div class="btn-group hidden-xs"> + <div class="btn-group hidden-md-down mr-2"> <button id="prvmail-attach-wrapper" class="btn btn-outline-secondary btn-sm" > <i id="prvmail-attach" class="fa fa-paperclip jot-icons" title="{{$attach}}"></i> </button> @@ -62,7 +62,7 @@ </button> </div> {{if $feature_expire || $feature_encrypt}} - <div class="btn-group hidden-sm hidden-xs"> + <div class="btn-group hidden-md-down mr-2"> {{if $feature_expire}} <button id="prvmail-expire-wrapper" class="btn btn-outline-secondary btn-sm" onclick="prvmailGetExpiry();return false;" > <i id="prvmail-expires" class="fa fa-eraser jot-icons" title="{{$expires}}" ></i> @@ -75,22 +75,22 @@ {{/if}} </div> {{/if}} - <div class="btn-group visible-xs visible-sm"> + <div class="btn-group hidden-lg-up"> <button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> <i id="more-tools-icon" class="fa fa-cog jot-icons"></i> </button> - <ul class="dropdown-menu dropdown-menu-right" role="menu"> - <li class="visible-xs"><a href="#" id="prvmail-attach-sub"><i class="fa fa-paperclip"></i> {{$attach}}</a></li> - <li class="visible-xs"><a href="#" onclick="prvmailJotGetLink(); return false;" ><i class="fa fa-link"></i> {{$insert}}</a></li> + <div class="dropdown-menu dropdown-menu-right" role="menu"> + <a class="dropdown-item" href="#" id="prvmail-attach-sub"><i class="fa fa-paperclip"></i> {{$attach}}</a> + <a class="dropdown-item" href="#" onclick="prvmailJotGetLink(); return false;" ><i class="fa fa-link"></i> {{$insert}}</a> {{if $feature_expire || $feature_encrypt}} - <li class="divider visible-xs"></li> - <li class="visible-sm visible-xs"><a href="#" onclick="prvmailGetExpiry(); return false;"><i id="prvmail-expires" class="fa fa-eraser"></i> {{$expires}}</a></li> - <li class="visible-sm visible-xs"><a href="#" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val()); return false;"><i class="fa fa-key"></i> {{$encrypt}}</a></li> + <div class="dropdown-divider"></div> + <a class="dropdown-item" href="#" onclick="prvmailGetExpiry(); return false;"><i id="prvmail-expires" class="fa fa-eraser"></i> {{$expires}}</a> + <a class="dropdown-item" href="#" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val()); return false;"><i class="fa fa-key"></i> {{$encrypt}}</a> {{/if}} - </ul> + </div> </div> </div> - <div id="prvmail-rotator-wrapper" class="pull-left"> + <div id="prvmail-rotator-wrapper" class="float-left"> <div id="prvmail-rotator"></div> </div> <div class="clear"></div> |