Skip to content

Commit 2669525

Browse files
severdiaseverdia
committed
Updates to Bootstrap and FontAwesome
1 parent 8fcf810 commit 2669525

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

‎atomic/component.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151

152152
<?php // Load remote Bootstrap 4.5 CSS framework from CDN
153153
if(($bootstrapcdn == null) && ($bootstrapsource == 1)) : ?>
154-
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" integrity="sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z" crossorigin="anonymous">
154+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css" integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous">
155155
<?php elseif(($bootstrapcdn == null) && ($bootstrapsource == 2)) : ?>
156156
<?php echo $bootstrapcdn ?>
157157
<?php else : ?>
@@ -164,9 +164,9 @@
164164

165165
<?php // Load FontAwesome 5.14
166166
if($fontawesome == 1) : ?>
167-
<script defer src="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.14.0/js/all.min.js"></script>
167+
<script defer src="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.1/js/all.min.js"></script>
168168
<?php elseif($fontawesome == 2) : ?>
169-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.14.0/css/all.min.css">
169+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.1/css/all.min.css">
170170
<?php elseif($fontawesome == 3) : ?>
171171
<link rel="stylesheet" href="<?php echo $fontawesomecdn; ?>">
172172
<?php elseif($fontawesome == 4) : ?>
@@ -293,7 +293,7 @@ function gtag(){dataLayer.push(arguments);}
293293

294294
</div>
295295

296-
<?php // Use jQuery Migrate 3.0.1
296+
<?php // Use jQuery Migrate 3.3.1
297297
if($jqmigrate == 1) : ?>
298298
<script src="https://code.jquery.com/jquery-migrate-3.3.1.min.js" crossorigin="anonymous"></script>
299299
<?php endif; ?>
@@ -302,18 +302,18 @@ function gtag(){dataLayer.push(arguments);}
302302
// If CDN empty and load BS 3 remotely
303303
if(($bootstrapcdn == null) && ($bootstrapsource == 1)) : ?>
304304
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
305-
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" integrity="sha384-B4gt1jrGC7Jh4AgTPSdUtOBvfO8shuf57BaghqFfPlYxofvL8/KUEfYiJOMMV+rV" crossorigin="anonymous"></script>
305+
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ho+j7jyWK8fNQe+A12Hb8AhRq26LrZ/JpcUGGOn+Y7RsweNrtN/tE3MoK7ZeZDyx" crossorigin="anonymous"></script>
306306

307307
<?php // If CDN empty and load BS 4 remotely
308308
elseif(($bootstrapcdn == null) && ($bootstrapsource == 3)) : ?>
309309
<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
310310
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
311-
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" integrity="sha384-B4gt1jrGC7Jh4AgTPSdUtOBvfO8shuf57BaghqFfPlYxofvL8/KUEfYiJOMMV+rV" crossorigin="anonymous"></script>
311+
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ho+j7jyWK8fNQe+A12Hb8AhRq26LrZ/JpcUGGOn+Y7RsweNrtN/tE3MoK7ZeZDyx" crossorigin="anonymous"></script>
312312

313313
<?php // If CDN empty and load BS 4 remotely, but full jQuery 3 is loaded
314314
elseif(($bootstrapcdn == null) && ($bootstrapsource == 3) && ($jqlibrary == 2)) : ?>
315315
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
316-
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" integrity="sha384-B4gt1jrGC7Jh4AgTPSdUtOBvfO8shuf57BaghqFfPlYxofvL8/KUEfYiJOMMV+rV" crossorigin="anonymous"></script>
316+
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ho+j7jyWK8fNQe+A12Hb8AhRq26LrZ/JpcUGGOn+Y7RsweNrtN/tE3MoK7ZeZDyx" crossorigin="anonymous"></script>
317317
<?php else : ?>
318318
<?php endif; ?>
319319

‎atomic/index.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152

153153
<?php // Load local or remote Bootstrap 4.5 CSS framework, or from CDN
154154
if(($bootstrapcdn == null) && ($bootstrapsource == 1)) : ?>
155-
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" integrity="sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z" crossorigin="anonymous">
155+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css" integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous">
156156
<?php elseif(($bootstrapcdn == null) && ($bootstrapsource == 2)) : ?>
157157
<?php echo $bootstrapcdn ?>
158158
<?php else : ?>
@@ -210,9 +210,9 @@
210210

211211
<?php // Load FontAwesome 5.14
212212
if($fontawesome == 1) : ?>
213-
<script defer src="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.14.0/js/all.min.js"></script>
213+
<script defer src="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.1/js/all.min.js"></script>
214214
<?php elseif($fontawesome == 2) : ?>
215-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.14.0/css/all.min.css">
215+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.1/css/all.min.css">
216216
<?php elseif($fontawesome == 3) : ?>
217217
<link rel="stylesheet" href="<?php echo $fontawesomecdn; ?>">
218218
<?php elseif($fontawesome == 4) : ?>
@@ -458,7 +458,7 @@ function gtag(){dataLayer.push(arguments);}
458458
<jdoc:include type="modules" name="debug" style="basic" />
459459
</div>
460460

461-
<?php // Use jQuery Migrate 3.0.1
461+
<?php // Use jQuery Migrate 3.3.1
462462
if($jqmigrate == 1) : ?>
463463
<script src="https://code.jquery.com/jquery-migrate-3.3.1.min.js" crossorigin="anonymous"></script>
464464
<?php endif; ?>
@@ -467,18 +467,18 @@ function gtag(){dataLayer.push(arguments);}
467467
// If CDN empty and load BS 3 remotely
468468
if(($bootstrapcdn == null) && ($bootstrapsource == 1)) : ?>
469469
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
470-
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" integrity="sha384-B4gt1jrGC7Jh4AgTPSdUtOBvfO8shuf57BaghqFfPlYxofvL8/KUEfYiJOMMV+rV" crossorigin="anonymous"></script>
470+
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ho+j7jyWK8fNQe+A12Hb8AhRq26LrZ/JpcUGGOn+Y7RsweNrtN/tE3MoK7ZeZDyx" crossorigin="anonymous"></script>
471471

472472
<?php // If CDN empty and load BS 4 remotely
473473
elseif(($bootstrapcdn == null) && ($bootstrapsource == 3)) : ?>
474474
<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
475475
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
476-
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" integrity="sha384-B4gt1jrGC7Jh4AgTPSdUtOBvfO8shuf57BaghqFfPlYxofvL8/KUEfYiJOMMV+rV" crossorigin="anonymous"></script>
476+
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ho+j7jyWK8fNQe+A12Hb8AhRq26LrZ/JpcUGGOn+Y7RsweNrtN/tE3MoK7ZeZDyx" crossorigin="anonymous"></script>
477477

478478
<?php // If CDN empty and load BS 4 remotely, but full jQuery 3 is loaded
479479
elseif(($bootstrapcdn == null) && ($bootstrapsource == 3) && ($jqlibrary == 2)) : ?>
480480
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
481-
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" integrity="sha384-B4gt1jrGC7Jh4AgTPSdUtOBvfO8shuf57BaghqFfPlYxofvL8/KUEfYiJOMMV+rV" crossorigin="anonymous"></script>
481+
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ho+j7jyWK8fNQe+A12Hb8AhRq26LrZ/JpcUGGOn+Y7RsweNrtN/tE3MoK7ZeZDyx" crossorigin="anonymous"></script>
482482
<?php else : ?>
483483
<?php endif; ?>
484484

‎atomic/language/en-GB/en-GB.tpl_atomic.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ TPL_ATOMIC_FIXED="Fixed width"
2525
TPL_ATOMIC_FLUID="Fluid width"
2626

2727
TPL_ATOMIC_BOOTSTRAP_LABEL="Load Bootstrap 4"
28-
TPL_ATOMIC_BOOTSTRAP_DESC="Load Bootstrap 4.5 from CDN."
29-
TPL_ATOMIC_BS4_REMOTE="Bootstrap 4.5 (CDN)"
28+
TPL_ATOMIC_BOOTSTRAP_DESC="Load Bootstrap 4.5,3 from CDN."
29+
TPL_ATOMIC_BS4_REMOTE="Bootstrap 4.5.3 (CDN)"
3030
TPL_ATOMIC_BS4_CUSTOM="Custom Bootstrap URL"
3131

3232
TPL_ATOMIC_BOOTSTRAPCDN_LABEL="Custom Bootstrap CDN"
@@ -102,7 +102,7 @@ TPL_ATOMIC_NOCONFLICT_DESC="Prevent conflicts between jQuery and MooTools. This
102102
TPL_ATOMIC_JQUERYMIGRATE_LABEL="Use jQuery Migrate"
103103
TPL_ATOMIC_JQUERYMIGRATE_DESC="Load the jQuery Migrate library to support older APIs."
104104
TPL_ATOMIC_JQUERYMIGRATE_DEFAULT="jQuery Migrate 1.4.1 (Joomla Default)"
105-
TPL_ATOMIC_JQUERYMIGRATE_3="jQuery Migrate 3.1.0"
105+
TPL_ATOMIC_JQUERYMIGRATE_3="jQuery Migrate 3.3.1"
106106
TPL_ATOMIC_JQUERYMIGRATE_NONE="None"
107107

108108
TPL_ATOMIC_INSTANT_LABEL="Use Instant.page"
@@ -126,7 +126,7 @@ TPL_ATOMIC_LOADFAVICONS_DESC="Either load the Atomic favicons or use the default
126126
TPL_ATOMIC_LOADAPPLEICONS_LABEL="Load Apple/Android icons"
127127
TPL_ATOMIC_LOADAPPLEICONS_DESC="Load precomposed Apple and Android icons. Put icons with the following sizes in the root level of your website: 57x57, 72x72, 76x76, 114x114, 120x120, 144x144, 152x152, 180x180, 192x192"
128128
TPL_ATOMIC_FONTAWESOME_LABEL="Load FontAwesome 5.14 icons"
129-
TPL_ATOMIC_FONTAWESOME_DESC="You can load the local or remote copy of FontAwesome 5.14 or none."
129+
TPL_ATOMIC_FONTAWESOME_DESC="You can load the local or remote copy of FontAwesome 5.15.1 or none."
130130
TPL_ATOMIC_FAREMOTEJS="Use SVG and JS"
131131
TPL_ATOMIC_FAREMOTECSS="Use Web Fonts and CSS"
132132
TPL_ATOMIC_FACUSTOMCSS="Custom FontAwesome CSS URL"

0 commit comments

Comments
 (0)