aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles/prosilver/template/viewtopic_body.html
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/styles/prosilver/template/viewtopic_body.html')
-rw-r--r--phpBB/styles/prosilver/template/viewtopic_body.html40
1 files changed, 38 insertions, 2 deletions
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 9498db8698..8d7af4e434 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -48,10 +48,10 @@
<form method="get" id="topic-search" action="{S_SEARCHBOX_ACTION}">
<fieldset>
<input class="inputbox search tiny" type="search" name="keywords" id="search_keywords" size="20" placeholder="{L_SEARCH_TOPIC}" />
- <button class="button" type="submit" title="{L_SEARCH}">
+ <button class="button button-search" type="submit" title="{L_SEARCH}">
<i class="icon fa-search fa-fw" aria-hidden="true"></i><span class="sr-only">{L_SEARCH}</span>
</button>
- <a href="{U_SEARCH}" class="button" title="{L_SEARCH_ADV}">
+ <a href="{U_SEARCH}" class="button button-search-end" title="{L_SEARCH_ADV}">
<i class="icon fa-cog fa-fw" aria-hidden="true"></i><span class="sr-only">{L_SEARCH_ADV}</span>
</a>
{S_SEARCH_LOCAL_HIDDEN_FIELDS}
@@ -232,43 +232,73 @@
<!-- EVENT viewtopic_body_post_buttons_before -->
<!-- IF postrow.U_EDIT -->
<li>
+<<<<<<< HEAD
+ <a href="{postrow.U_EDIT}" title="{L_EDIT_POST}" class="button button-icon-only">
+ <i class="icon fa-pencil fa-fw"></i><span class="sr-only">{L_BUTTON_EDIT}</span>
+=======
<a href="{postrow.U_EDIT}" title="{L_EDIT_POST}" class="button icon-button">
<i class="icon fa-pencil fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_EDIT}</span>
+>>>>>>> hanakin/ticket/14199
</a>
</li>
<!-- ENDIF -->
<!-- IF postrow.U_DELETE -->
<li>
+<<<<<<< HEAD
+ <a href="{postrow.U_DELETE}" title="{L_DELETE_POST}" class="button button-icon-only">
+ <i class="icon fa-times fa-fw"></i><span class="sr-only">{L_DELETE_POST}</span>
+=======
<a href="{postrow.U_DELETE}" title="{L_DELETE_POST}" class="button icon-button">
<i class="icon fa-times fa-fw" aria-hidden="true"></i><span class="sr-only">{L_DELETE_POST}</span>
+>>>>>>> hanakin/ticket/14199
</a>
</li>
<!-- ENDIF -->
<!-- IF postrow.U_REPORT -->
<li>
+<<<<<<< HEAD
+ <a href="{postrow.U_REPORT}" title="{L_REPORT_POST}" class="button button-icon-only">
+ <i class="icon fa-exclamation fa-fw"></i><span class="sr-only">{L_REPORT_POST}</span>
+=======
<a href="{postrow.U_REPORT}" title="{L_REPORT_POST}" class="button icon-button">
<i class="icon fa-exclamation fa-fw" aria-hidden="true"></i><span class="sr-only">{L_REPORT_POST}</span>
+>>>>>>> hanakin/ticket/14199
</a>
</li>
<!-- ENDIF -->
<!-- IF postrow.U_WARN -->
<li>
+<<<<<<< HEAD
+ <a href="{postrow.U_WARN}" title="{L_WARN_USER}" class="button button-icon-only">
+ <i class="icon fa-exclamation-triangle fa-fw"></i><span class="sr-only">{L_WARN_USER}</span>
+=======
<a href="{postrow.U_WARN}" title="{L_WARN_USER}" class="button icon-button">
<i class="icon fa-exclamation-triangle fa-fw" aria-hidden="true"></i><span class="sr-only">{L_WARN_USER}</span>
+>>>>>>> hanakin/ticket/14199
</a>
</li>
<!-- ENDIF -->
<!-- IF postrow.U_INFO -->
<li>
+<<<<<<< HEAD
+ <a href="{postrow.U_INFO}" title="{L_INFORMATION}" class="button button-icon-only">
+ <i class="icon fa-info fa-fw"></i><span class="sr-only">{L_INFORMATION}</span>
+=======
<a href="{postrow.U_INFO}" title="{L_INFORMATION}" class="button icon-button">
<i class="icon fa-info fa-fw" aria-hidden="true"></i><span class="sr-only">{L_INFORMATION}</span>
+>>>>>>> hanakin/ticket/14199
</a>
</li>
<!-- ENDIF -->
<!-- IF postrow.U_QUOTE -->
<li>
+<<<<<<< HEAD
+ <a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}" class="button button-icon-only">
+ <i class="icon fa-quote-left fa-fw"></i><span class="sr-only">{L_QUOTE}</span>
+=======
<a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}" class="button icon-button">
<i class="icon fa-quote-left fa-fw" aria-hidden="true"></i><span class="sr-only">{L_QUOTE}</span>
+>>>>>>> hanakin/ticket/14199
</a>
</li>
<!-- ENDIF -->
@@ -405,9 +435,15 @@
<!-- IF .quickmod -->
<div class="quickmod dropdown-container dropdown-container-left dropdown-up dropdown-{S_CONTENT_FLOW_END} dropdown-button-control" id="quickmod">
+<<<<<<< HEAD
+ <span title="{L_QUICK_MOD}" class="button button-secondary dropdown-trigger dropdown-select">
+ <i class="icon fa-gavel fa-fw"></i><span class="sr-only">{L_QUICK_MOD}</span>
+ <span class="caret"><i class="icon fa-sort-down fa-fw"></i></span>
+=======
<span title="{L_QUICK_MOD}" class="button dropdown-trigger dropdown-select">
<i class="icon fa-gavel fa-fw" aria-hidden="true"></i><span class="sr-only">{L_QUICK_MOD}</span>
<span class="caret"><i class="icon fa-sort-down fa-fw" aria-hidden="true"></i></span>
+>>>>>>> hanakin/ticket/14199
</span>
<div class="dropdown">
<div class="pointer"><div class="pointer-inner"></div></div>