1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-11 11:24:23 +02:00

Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2017-03-19 00:07:30 +01:00
commit 02c584636f
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
2 changed files with 18 additions and 1 deletions
phpBB
adm/style
styles/prosilver/theme

@ -2691,3 +2691,12 @@ fieldset.permissions .padding {
word-wrap: break-word;
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 */

@ -213,4 +213,12 @@ ul {
.codebox p {
display: none;
}
/* stylelint-enable */
/* stylelint-disable declaration-property-unit-whitelist */
.emoji {
min-height: 18px;
min-width: 18px;
height: 1em;
width: 1em;
}
/* stylelint-enable declaration-property-unit-whitelist */