From e01b90c4c62d0ad7484c05c5d848e5749617e820 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 29 Apr 2016 10:26:41 +0200 Subject: css fixes --- view/css/bootstrap-red.css | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'view') 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 */ -- cgit v1.2.3 From b797528b78107b707dc1c56d70e07136d7c31028 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 29 Apr 2016 13:18:42 +0200 Subject: some work on making mod editpost use status_editor() - if you find anything related to jot broken please revert this commit --- view/js/mod_settings.js | 2 +- view/tpl/jot.tpl | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'view') 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 @@ {{/if}} - {{if $noloc}} - {{/if}} @@ -115,7 +115,7 @@ {{/if}} - {{if $writefiles || $weblink || $setloc || $noloc || $feature_expire || $feature_encrypt || $feature_voting}} + {{if $writefiles || $weblink || $setloc || $clearloc || $feature_expire || $feature_encrypt || $feature_voting}}
+

{{$header}}

@@ -31,8 +31,8 @@ {{$hub.hubloc_addr}} {{$hub.hubloc_url}} - {{if $hub.primary}}{{else}}{{/if}} - + {{if $hub.primary}}{{else}}{{/if}} + {{/if}} {{/foreach}} diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl index 5e5d9808d..249e13a04 100755 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -15,22 +15,22 @@
{{if $mail.attachments}}
- +
{{/if}}
diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index f928aa3ee..762c82479 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -9,11 +9,11 @@ {{/if}} {{if $profile.canlike}} {{/if}} {{if $editmenu.multi}} -  {{$editmenu.edit.3}} +  {{$editmenu.edit.3}} {{elseif $editmenu}} -  {{$editmenu.edit.3}} +  {{$editmenu.edit.3}} {{/if}}

{{$title}}

@@ -71,7 +71,7 @@ {{if $f == 'marital'}} {{if $profile.marital}}
-
 {{$profile.marital.0}}
+
 {{$profile.marital.0}}
{{$profile.marital.1}}{{if in_array('with',$fields)}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{/if}}{{if in_array('howlong',$fields)}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}{{/if}}
{{/if}} @@ -277,7 +277,7 @@ {{$item.term}} {{if $profile.canlike}}
{{/if}} {{if $item.like_count}} diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index 4908646b9..deabc2795 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -2,24 +2,24 @@