1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-29 02:59:52 +02:00

Merge branch '3.3.x'

This commit is contained in:
Marc Alexander
2020-08-06 17:44:03 +02:00
50 changed files with 2914 additions and 9389 deletions

View File

@@ -371,7 +371,7 @@ a.header-avatar img {
}
a.header-avatar span:after {
font: normal normal bold 14px/1 "Font Awesome 5 Free";
font: normal normal normal 14px/1 FontAwesome;
vertical-align: top;
display: inline-block;
padding-top: 2px;

View File

@@ -13,9 +13,9 @@
.button .icon,
blockquote cite:before,
.uncited:before {
font-family: "Font Awesome 5 Free", "Font Awesome 5 Brands";
font-family: FontAwesome;
font-size: 14px;
font-weight: 900;
font-weight: normal;
font-style: normal;
font-variant: normal;
line-height: 1;
@@ -27,11 +27,11 @@ blockquote cite:before,
text-rendering: auto; /* optimizelegibility throws things off #1094 */
}
.icon {
.icon:before {
padding-right: 2px;
}
.button .icon {
.button .icon:before {
padding-right: 0;
}

View File

@@ -7,17 +7,15 @@
--------------------------------------------------------------
*/
@import url("normalize.css?v=4.0");
@import url("base.css?v=4.0");
@import url("utilities.css?v=4.0");
@import url("common.css?v=4.0");
@import url("links.css?v=4.0");
@import url("content.css?v=4.0");
@import url("buttons.css?v=4.0");
@import url("cp.css?v=4.0");
@import url("forms.css?v=4.0");
@import url("icons.css?v=4.0");
@import url("colours.css?v=4.0");
@import url("responsive.css?v=4.0");
@import url("bidi.css?v=4.0");
@import url("tweaks.css?v=4.0");
@import url("normalize.css?hash=e6c08715");
@import url("base.css?hash=9b6738c8");
@import url("utilities.css?hash=b95e1ad4");
@import url("common.css?hash=fe09f059");
@import url("links.css?hash=5fc8ca41");
@import url("content.css?hash=0daf1369");
@import url("buttons.css?hash=f4e39187");
@import url("cp.css?hash=2530357c");
@import url("forms.css?hash=7a849801");
@import url("icons.css?hash=2fcf49a1");
@import url("colours.css?hash=73de7bbf");
@import url("responsive.css?hash=8b3f0a01");