From b4821907b7f8acf84229f95018688636c8aad159 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 11 Feb 2017 11:19:46 +0100
Subject: [PATCH 1/3] [ticket/15083] Fix invalid emoji sizing in ACP & print
 view

PHPBB3-15083
---
 phpBB/adm/style/admin.css              | 7 +++++++
 phpBB/styles/prosilver/theme/print.css | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index d46530700f..2ad964e6bb 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -2691,3 +2691,10 @@ fieldset.permissions .padding {
 	word-wrap: break-word;
 	word-break: break-all;
 }
+
+.emoji {
+	min-height: 18px;
+	min-width: 18px;
+	height: 1em;
+	width: 1em;
+}
diff --git a/phpBB/styles/prosilver/theme/print.css b/phpBB/styles/prosilver/theme/print.css
index a3295ac367..e1ddaca308 100644
--- a/phpBB/styles/prosilver/theme/print.css
+++ b/phpBB/styles/prosilver/theme/print.css
@@ -137,3 +137,10 @@ div.spacer { clear: both; }
 .skip_link { display: none; }
 
 .codebox p { display: none; }
+
+.emoji {
+	min-height: 18px;
+	min-width: 18px;
+	height: 1em;
+	width: 1em;
+}

From 01046c2209cc589268f791d592691b3834a7fdd6 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 22 Feb 2017 21:37:02 +0100
Subject: [PATCH 2/3] [ticket/15083] Add stylelint definitions

PHPBB3-15083
---
 phpBB/styles/prosilver/theme/print.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/phpBB/styles/prosilver/theme/print.css b/phpBB/styles/prosilver/theme/print.css
index e1ddaca308..a83270b742 100644
--- a/phpBB/styles/prosilver/theme/print.css
+++ b/phpBB/styles/prosilver/theme/print.css
@@ -138,9 +138,11 @@ div.spacer { clear: both; }
 
 .codebox p { display: none; }
 
+/* stylelint-disable declaration-property-unit-whitelist */
 .emoji {
 	min-height: 18px;
 	min-width: 18px;
 	height: 1em;
 	width: 1em;
 }
+/* stylelint-enable declaration-property-unit-whitelist */

From f36eb932a4bfe0e56fd01753531dbc7a31db1b1f Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 8 Mar 2017 21:36:27 +0100
Subject: [PATCH 3/3] [ticket/15083] Add stylelint exceptions for admin.css

PHPBB3-15083
---
 phpBB/adm/style/admin.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 2ad964e6bb..2322b3da88 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -2692,9 +2692,11 @@ fieldset.permissions .padding {
 	word-break: break-all;
 }
 
+/* stylelint-disable declaration-property-unit-whitelist */
 .emoji {
 	min-height: 18px;
 	min-width: 18px;
 	height: 1em;
 	width: 1em;
 }
+/* stylelint-enable declaration-property-unit-whitelist */