mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-26 03:22:37 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Marc Alexander
2017-03-19 00:07:30 +01:00
parent 6676aefa36 25d5f94d19
commit 02c584636f
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
phpBB/adm/style/admin.css
View File

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

10
phpBB/styles/prosilver/theme/print.css
View File

@@ -213,4 +213,12 @@ ul {
.codebox p { .codebox p {
display: none; 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 */