Merge branch '3.3.x'

iMattPro · May 30, 2024 · f5b14a9 · f5b14a9
2 parents cfeb747 + df5fcaf
commit f5b14a9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/phpBB/styles/prosilver/template/posting_pm_header.html b/phpBB/styles/prosilver/template/posting_pm_header.html
@@ -34,7 +34,9 @@
 								{% for recipient in to_recipient %}
 									<li>
 										{% if not S_EDIT_POST %}
-											<input type="submit" name="remove_{{ recipient.TYPE }}[{{ recipient.UG_ID }}]" value="x" class="button1 button button-form-bold">
+											<button type="submit" name="remove_{{ recipient.TYPE }}[{{ recipient.UG_ID }}]">
+												{{ Icon('font', 'xmark', lang('REMOVE'), true, 'c-warning-icon') }}
+											</button>
 										{% endif %}
 										{% if recipient.IS_GROUP %}
 											<a href="{{ recipient.U_VIEW }}" style="color: {{ recipient.COLOUR }}"><strong>{{ recipient.NAME }}</strong></a>
@@ -57,7 +59,9 @@
 								{% for recipient in bcc_recipient %}
 									<li>
 										{% if not S_EDIT_POST %}
-											<input type="submit" name="remove_{{ recipient.TYPE }}[{{ recipient.UG_ID }}]" value="x" class="button1 button button-form-bold">
+											<button type="submit" name="remove_{{ recipient.TYPE }}[{{ recipient.UG_ID }}]">
+												{{ Icon('font', 'xmark', lang('REMOVE'), true, 'c-warning-icon') }}
+											</button>
 										{% endif %}
 										{% if recipient.IS_GROUP %}
 											<a href="{{ recipient.U_VIEW }}" style="color: {{ recipient.COLOUR }}"><strong>{{ recipient.NAME }}</strong></a>
@@ -90,14 +94,16 @@
 							<ul class="recipients">
 								{% for recipient in to_recipient %}
 									<li>
+										{% if not S_EDIT_POST %}
+											<button type="submit" name="remove_{{ recipient.TYPE }}[{{ recipient.UG_ID }}]">
+												{{ Icon('font', 'xmark', lang('REMOVE'), true, 'c-warning-icon') }}
+											</button>
+										{% endif %}
 										{% if recipient.IS_GROUP %}
 											<a href="{{ recipient.U_VIEW }}"><strong>{{ recipient.NAME }}</strong></a>
 										{% else %}
 											{{ recipient.NAME_FULL }}
 										{% endif %}
-										{% if not S_EDIT_POST %}
-											&nbsp;<input type="submit" name="remove_{{ recipient.TYPE }}[{{ recipient.UG_ID }}]" value="x" class="button1 button button-form-bold">
-										{% endif %}
 									</li>
 								{% endfor %}
 							</ul>

diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
@@ -867,12 +867,6 @@ fieldset.fields1 dd.recipients {
 	margin-left: 11px;
 }
 
-fieldset.fields1 ul.recipients input.button2 {
-	font-size: 12px;
-	margin-right: 0;
-	padding: 0;
-}
-
 fieldset.fields1 dl.pmlist > dt {
 	width: auto !important;
 }