diff options
| author | redmatrix <git@macgirvin.com> | 2016-04-26 16:14:10 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-04-26 16:14:10 -0700 |
| commit | 509f25e46a37d7fae1a2d1934c6143e96aa6497d (patch) | |
| tree | 900e91ef3e02863cd16cc34f5ceae2c5bf5a9e0b /view | |
| parent | f99daf8ff9b3cd9c0ad61f9fcfec04c6c4042a59 (diff) | |
| parent | 607125e795ca624fe6d3ee83acdd65e3100a22a4 (diff) | |
| download | volse-hubzilla-509f25e46a37d7fae1a2d1934c6143e96aa6497d.tar.gz volse-hubzilla-509f25e46a37d7fae1a2d1934c6143e96aa6497d.tar.bz2 volse-hubzilla-509f25e46a37d7fae1a2d1934c6143e96aa6497d.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/autocomplete.js | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/narrow_navbar.css | 4 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 8 |
3 files changed, 8 insertions, 6 deletions
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 84cc075dc..21ce2d150 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -265,7 +265,7 @@ function string2bb(element) { $.fn.bbco_autocomplete = function(type) { if(type=='bbcode') { - var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'superscript', 'subscript', 'quote', 'code', 'spoiler', 'map', 'nobb', 'list', 'ul', 'ol', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'zrl', 'zmg', 'rpost', 'qr', 'observer']; + var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'superscript', 'subscript', 'quote', 'code', 'open', 'spoiler', 'map', 'nobb', 'list', 'ul', 'ol', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'zrl', 'zmg', 'rpost', 'qr', 'observer']; var open_elements = ['observer.baseurl', 'observer.address', 'observer.photo', 'observer.name', 'observer.webname', 'observer.url', '*', 'hr', ]; var elements = open_close_elements.concat(open_elements); diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css index e7c1e9f40..faa18dfe5 100644 --- a/view/theme/redbasic/css/narrow_navbar.css +++ b/view/theme/redbasic/css/narrow_navbar.css @@ -1,11 +1,11 @@ @media screen and (min-width: 760px) { aside { - padding: 52px 7px 0px 7px; + padding-top: 52px; } section { - padding: 52px 7px 200px 7px; + padding-top: 52px; } .navbar-nav > li > a { diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 026c586a0..44e010e77 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -115,18 +115,20 @@ <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> </button> - <ul class="dropdown-menu dropdown-menu-right" role="menu"> + <ul class="dropdown-menu dropdown-menu" role="menu"> <li class="visible-xs"><a href="#" onclick="preview_post();return false;"><i class="icon-eye-open"></i> {{$preview}}</a></li> {{if $visitor}} <li class="divider visible-xs"></li> - {{if $writefiles}}<li class="visible-xs"><a id="wall-file-upload-sub" href="#" ><i class="icon-paper-clip"></i> {{$attach}}</a></li>{{/if}} - <li class="visible-xs"><a href="#" onclick="jotGetLink(); return false;"><i class="icon-link"></i> {{$weblink}}</a></li> + {{if $writefiles}} + <li class="visible-xs"><a id="wall-file-upload-sub" href="#" ><i class="icon-paper-clip"></i> {{$attach}}</a></li> {{/if}} + <li class="visible-xs"><a href="#" onclick="jotGetLink(); return false;"><i class="icon-link"></i> {{$weblink}}</a></li> <li class="divider visible-xs"></li> <li class="visible-xs visible-sm"><a href="#" onclick="jotGetLocation(); return false;"><i class="icon-globe"></i> {{$setloc}}</a></li> {{if $noloc}} <li class="visible-xs visible-sm"><a href="#" onclick="jotClearLocation(); return false;"><i class="icon-circle-blank"></i> {{$noloc}}</a></li> {{/if}} + {{/if}} {{if $feature_expire}} <li class="visible-xs visible-sm"><a href="#" onclick="jotGetExpiry(); return false;"><i class="icon-eraser"></i> {{$expires}}</a></li> {{/if}} |