diff options
| author | zotlabs <mike@macgirvin.com> | 2018-01-13 15:54:45 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-01-13 15:54:45 -0800 |
| commit | 76c8bbf7b83d6cdbd0b16ebbdaa4cab48662221f (patch) | |
| tree | fb5d58779c5f4984a2e9cf354e154e06c997c1c9 /view/tpl | |
| parent | e8958b1fb85ebcc4c51632a2de746b9aec6f354e (diff) | |
| parent | ce10a44e722c9bbaceff64273641c3e08c6ad7a5 (diff) | |
| download | volse-hubzilla-76c8bbf7b83d6cdbd0b16ebbdaa4cab48662221f.tar.gz volse-hubzilla-76c8bbf7b83d6cdbd0b16ebbdaa4cab48662221f.tar.bz2 volse-hubzilla-76c8bbf7b83d6cdbd0b16ebbdaa4cab48662221f.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/connections.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/follow.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/peoplefind.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/searchbox.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/wiki.tpl | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl index 3b152ef5e..cfb7ae67e 100755 --- a/view/tpl/connections.tpl +++ b/view/tpl/connections.tpl @@ -19,7 +19,7 @@ <form action="{{$cmd}}" method="get" > <div class="input-group form-group"> <input type="text" name="search" id="contacts-search" class="form-control" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" /> - <div class="input-group-btn"> + <div class="input-group-append"> <button id="contacts-search-submit" class="btn btn-outline-secondary" type="submit" name="submit" value="{{$submit}}"><i class="fa fa-fw fa-search"></i></button> </div> </div> diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl index 4def1415d..2fb753784 100755 --- a/view/tpl/follow.tpl +++ b/view/tpl/follow.tpl @@ -3,7 +3,7 @@ <form action="follow" method="post" /> <div class="input-group"> <input class="form-control form-control-sm" type="text" name="url" title="{{$hint}}" placeholder="{{$desc}}" /> - <div class="input-group-btn"> + <div class="input-group-append"> <button class="btn btn-success" type="submit" name="submit" value="{{$follow}}" title="{{$follow}}"><i class="fa fa-fw fa-plus"></i></button> </div> </div> diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index 2ecfbaff9..5f420f6d0 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -3,7 +3,7 @@ <form action="directory" method="post" /> <div class="input-group form-group"> <input class="form-control form-control-sm" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" /> - <div class="input-group-btn"> + <div class="input-group-append"> <button class="btn btn-outline-secondary" type="submit" name="submit"><i class="fa fa-fw fa-search"></i></button> </div> </div> diff --git a/view/tpl/searchbox.tpl b/view/tpl/searchbox.tpl index 8f7ac5162..abcdb8933 100644 --- a/view/tpl/searchbox.tpl +++ b/view/tpl/searchbox.tpl @@ -2,7 +2,7 @@ <input type="hidden" name="f" value="" /> <div id="{{$id}}" class="input-group"> <input class="form-control form-control-sm" type="text" name="search" id="search-text" value="{{$s}}" onclick="this.submit();" /> - <div class="input-group-btn"> + <div class="input-group-append"> <button type="submit" name="submit" class="btn btn-outline-secondary" id="search-submit" value="{{$search_label}}"><i class="fa fa-search"></i></button> {{if $savedsearch}} <button type="submit" name="searchsave" class="btn btn-outline-secondary" id="search-save" value="{{$save_label}}"><i class="fa fa-floppy-o"></i></button> diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 22480be5b..f1ab1ebad 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -66,7 +66,7 @@ <div id="id_{{$commitMsg.0}}_wrapper" class="field input" style="display: none"> <div class="input-group"> <input class="form-control form-control-sm" name="{{$commitMsg.0}}" id="id_{{$commitMsg.0}}" type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}> - <div class="input-group-btn"> + <div class="input-group-append"> <button id="save-page" type="button" class="btn btn-primary disabled">Save</button> </div> </div> |