mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-29 11:10:18 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2020-08-06 17:44:03 +02:00
parent 21d656907a e10ea1fcf3
commit 5f0b3c2141
50 changed files with 2914 additions and 9389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/styles/prosilver/template/overall_footer.html
View File

@@ -72,7 +72,7 @@
</div>
<script src="{T_JQUERY_LINK}"></script>
<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.4.1.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.5.1.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
<script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
<!-- INCLUDEJS forum_fn.js -->
<!-- INCLUDEJS ajax.js -->
@@ -81,7 +81,7 @@
(function($){
var $fa_cdn = $('head').find('link[rel="stylesheet"]').first(),
$span = $('<span class="fa" style="display:none"></span>').appendTo('body');
if ($span.css('fontFamily') !== 'Font Awesome 5 Free' ) {
if ($span.css('fontFamily') !== 'FontAwesome' ) {
$fa_cdn.after('<link href="{T_ASSETS_PATH}/css/font-awesome.min.css" rel="stylesheet">');
$fa_cdn.remove();
}

1
phpBB/styles/prosilver/template/overall_header.html
View File

@@ -46,7 +46,6 @@
</script>
<!-- ENDIF -->
<link href="{T_FONT_AWESOME_LINK}" rel="stylesheet">
<link href="{T_FONT_AWESOME_V4SHIMS_LINK}" rel="stylesheet">
<link href="{T_STYLESHEET_LINK}" rel="stylesheet">
<link href="{T_STYLESHEET_LANG_LINK}" rel="stylesheet">

2
phpBB/styles/prosilver/template/simple_footer.html
View File

@@ -42,7 +42,7 @@
</div>
<script src="{T_JQUERY_LINK}"></script>
<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.4.1.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.5.1.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
<script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
<!-- INCLUDEJS forum_fn.js -->
<!-- INCLUDEJS ajax.js -->

1
phpBB/styles/prosilver/template/simple_header.html
View File

@@ -24,7 +24,6 @@
</script>
<!-- ENDIF -->
<link href="{T_FONT_AWESOME_LINK}" rel="stylesheet">
<link href="{T_FONT_AWESOME_V4SHIMS_LINK}" rel="stylesheet">
<link href="{T_STYLESHEET_LINK}" rel="stylesheet">
<link href="{T_STYLESHEET_LANG_LINK}" rel="stylesheet">

2
phpBB/styles/prosilver/theme/common.css
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;

8
phpBB/styles/prosilver/theme/icons.css
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;
}

26
phpBB/styles/prosilver/theme/stylesheet.css
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");