Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bs5&fa6 update to latest 5.3.3. & 6.6.0 versions #5310

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
12 changes: 10 additions & 2 deletions e107_handlers/e_parse_class.php
Original file line number Diff line number Diff line change
Expand Up @@ -4308,14 +4308,22 @@ public function toAvatar($userData = null, $options = array())
$image = (!empty($userData['user_image'])) ? varset($userData['user_image']) : null;

$genericFile = e_IMAGE . 'generic/blank_avatar.jpg';
$genericImg = $tp->thumbUrl($genericFile, 'w=' . $width . '&h=' . $height, true, $full);
$genericImg = $tp->thumbUrl($genericFile, 'w=' . $width . '&h=' . $height, false, $full);

if (!empty($image))
{

if (strpos($image, '://') !== false) // Remote Image
{
$url = $image;
if (@fopen($image, 'r'))
{
$url = $image;
}
else
{
$file = $genericFile;
$url = $genericImg;
}
}
elseif (strpos($image, '-upload-') === 0)
{
Expand Down
12 changes: 6 additions & 6 deletions e107_handlers/library_manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -379,9 +379,9 @@ public function config()
'variants' => array(),
// Override library path to CDN.
//https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css
'library_path' => 'https://cdn.jsdelivr.net/npm/bootstrap@5.2.3',
'library_path' => 'https://cdn.jsdelivr.net/npm/bootstrap@5.3.3',
'path' => '',
'version' => '5.2.3',
'version' => '5.3.3',
);


Expand Down Expand Up @@ -411,7 +411,7 @@ public function config()
'variants' => array(),
'library_path' => '{e_WEB}lib/bootstrap',
'path' => '5',
'version' => '5.2.3',
'version' => '5.3.3',
);


Expand Down Expand Up @@ -1040,7 +1040,7 @@ public function config()
'variants' => array(),
'library_path' => '{e_WEB}lib/font-awesome',
'path' => '6',
'version' => '6.4.2',
'version' => '6.6.0',

);

Expand Down Expand Up @@ -1078,9 +1078,9 @@ public function config()
),
'variants' => array(),
// Override library path to CDN.
'library_path' => 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2',
'library_path' => 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.6.0',
'path' => '',
'version' => '6.4.2',
'version' => '6.6.0',
);


Expand Down
7 changes: 3 additions & 4 deletions e107_web/lib/bootstrap/5/css/bootstrap.min.css

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions e107_web/lib/bootstrap/5/js/bootstrap.bundle.min.js

Large diffs are not rendered by default.

432 changes: 169 additions & 263 deletions e107_web/lib/font-awesome/6/css/all.css

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions e107_web/lib/font-awesome/6/css/all.min.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions e107_web/lib/font-awesome/6/css/v4-shims.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com
* Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Copyright 2023 Fonticons, Inc.
* Copyright 2024 Fonticons, Inc.
*/
.fa.fa-glass:before {
content: "\f000"; }
Expand Down
4 changes: 2 additions & 2 deletions e107_web/lib/font-awesome/6/css/v4-shims.min.css

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions e107_web/lib/font-awesome/6/js/all.min.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions e107_web/lib/font-awesome/6/js/v4-shims.min.js

Large diffs are not rendered by default.

Loading