makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
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
Show stats 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 */