diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-10-07 14:41:30 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-10-07 14:41:30 +0200 |
| commit | d7109fb130511c213859ede614a11e9fbccf0c75 (patch) | |
| tree | 493cf91028c39332463b5021b0d2c709da8a927d /phpBB | |
| parent | ebb3169d56975e29571acba6488e627fa221cd0e (diff) | |
| parent | 5e2ccb2dd7c89109dc567eb8fba70436394128de (diff) | |
| download | forums-d7109fb130511c213859ede614a11e9fbccf0c75.tar forums-d7109fb130511c213859ede614a11e9fbccf0c75.tar.gz forums-d7109fb130511c213859ede614a11e9fbccf0c75.tar.bz2 forums-d7109fb130511c213859ede614a11e9fbccf0c75.tar.xz forums-d7109fb130511c213859ede614a11e9fbccf0c75.zip | |
Merge pull request #3947 from marc1706/ticket/14199
[ticket/14199] Correctly resolve merge conflicts
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/styles/prosilver/template/viewtopic_body.html | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index d6291f8ff3..62dfcb1ebb 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -232,73 +232,43 @@ <!-- 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 --> @@ -435,15 +405,9 @@ <!-- 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> |