diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-06-19 18:07:29 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-06-19 18:07:29 +0200 |
| commit | 450e5b36b89dc5570a89a3bc28dcd4cf21b1b783 (patch) | |
| tree | 50115a86ac7decb91c6be803c28e8e2236123ea5 /phpBB/styles | |
| parent | 70b04016eb123e02868a5391677d75fffc1155ea (diff) | |
| parent | aaa99b471913e40ef5a31c12cba70d9fbb653de6 (diff) | |
| download | forums-450e5b36b89dc5570a89a3bc28dcd4cf21b1b783.tar forums-450e5b36b89dc5570a89a3bc28dcd4cf21b1b783.tar.gz forums-450e5b36b89dc5570a89a3bc28dcd4cf21b1b783.tar.bz2 forums-450e5b36b89dc5570a89a3bc28dcd4cf21b1b783.tar.xz forums-450e5b36b89dc5570a89a3bc28dcd4cf21b1b783.zip | |
Merge branch '3.1.x' into 3.2.x
Conflicts:
phpBB/styles/prosilver/template/search_results.html
phpBB/styles/prosilver/template/viewforum_body.html
phpBB/styles/subsilver2/template/mcp_forum.html
phpBB/styles/subsilver2/template/search_results.html
phpBB/styles/subsilver2/template/viewforum_body.html
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_forum.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/search_results.html | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/viewforum_body.html | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html index da0d3a4ddf..acef09dc47 100644 --- a/phpBB/styles/prosilver/template/mcp_forum.html +++ b/phpBB/styles/prosilver/template/mcp_forum.html @@ -62,7 +62,7 @@ <!-- ENDIF --> <!-- IF topicrow.S_MOVED_TOPIC and S_CAN_DELETE --> <a href="{topicrow.U_DELETE_TOPIC}" class="topictitle">[ {L_DELETE_SHADOW_TOPIC} ]</a><!-- ENDIF --> <br /> - + <!-- EVENT topiclist_row_topic_title_after --> <div class="responsive-show" style="display: none;"> <!-- IF topicrow.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <!-- ENDIF --> {L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} « {topicrow.LAST_POST_TIME}<br /> diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index ea558fd7ae..8dc91555dc 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -134,6 +134,7 @@ </ul> </div> <!-- ENDIF --> + <!-- EVENT topiclist_row_topic_title_after --> <!-- EVENT topiclist_row_append --> </div> diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index 05f57ee8a6..446a9906dd 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -180,6 +180,7 @@ </a> <!-- ENDIF --> <br /> + <!-- EVENT topiclist_row_topic_title_after --> <!-- IF not S_IS_BOT --> <div class="responsive-show" style="display: none;"> |