diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/bootstrap-red.css | 6 | ||||
| -rw-r--r-- | view/js/mod_settings.js | 2 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 10 |
3 files changed, 7 insertions, 11 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 777bf69eb..aa8b40365 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -21,7 +21,7 @@ nav .badge { } } -nav i { +#navbar-collapse-1 i { font-size: 14px; } @@ -50,10 +50,6 @@ nav .navbar-collapse .navbar-right { float: right; } -nav .navbar-toggle { - margin-bottom: 7px; -} - /* nav overrides end */ diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js index e28a18b9f..3fd57995a 100644 --- a/view/js/mod_settings.js +++ b/view/js/mod_settings.js @@ -127,4 +127,4 @@ function channel_privacy_macro(n) { $('#id_profile_in_directory_onoff .off').addClass('hidden'); $('#id_profile_in_directory').val(1); } -}
\ No newline at end of file +} diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 9c5ddc620..34952596a 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -86,8 +86,8 @@ <i id="profile-location" class="icon-globe jot-icons"></i> </button> {{/if}} - {{if $noloc}} - <button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" title="{{$noloc}}" onclick="jotClearLocation();return false;" disabled="disabled"> + {{if $clearloc}} + <button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" title="{{$clearloc}}" onclick="jotClearLocation();return false;" disabled="disabled"> <i id="profile-nolocation" class="icon-circle-blank jot-icons"></i> </button> {{/if}} @@ -115,7 +115,7 @@ </button> {{/if}} </div> - {{if $writefiles || $weblink || $setloc || $noloc || $feature_expire || $feature_encrypt || $feature_voting}} + {{if $writefiles || $weblink || $setloc || $clearloc || $feature_expire || $feature_encrypt || $feature_voting}} <div class="btn-group visible-xs visible-sm"> <button type="button" id="more-tools" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> <i id="more-tools-icon" class="icon-caret-down jot-icons"></i> @@ -131,8 +131,8 @@ i {{if $setloc}} <li><a href="#" onclick="jotGetLocation(); return false;"><i class="icon-globe"></i> {{$setloc}}</a></li> {{/if}} - {{if $noloc}} - <li><a href="#" onclick="jotClearLocation(); return false;"><i class="icon-circle-blank"></i> {{$noloc}}</a></li> + {{if $clearloc}} + <li><a href="#" onclick="jotClearLocation(); return false;"><i class="icon-circle-blank"></i> {{$clearloc}}</a></li> {{/if}} {{/if}} {{if $feature_expire}} |