Skip to content

Commit

Permalink
Updates to Bootstrap and FontAwesome
Browse files Browse the repository at this point in the history
  • Loading branch information
@severdia
severdia committed Oct 14, 2020
1 parent 8fcf810 commit 2669525
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
14 changes: 7 additions & 7 deletions atomic/component.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@

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

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

</div>

<?php // Use jQuery Migrate 3.0.1
<?php // Use jQuery Migrate 3.3.1
if($jqmigrate == 1) : ?>
<script src="https://code.jquery.com/jquery-migrate-3.3.1.min.js" crossorigin="anonymous"></script>
<?php endif; ?>
Expand All @@ -302,18 +302,18 @@ function gtag(){dataLayer.push(arguments);}
// If CDN empty and load BS 3 remotely
if(($bootstrapcdn == null) && ($bootstrapsource == 1)) : ?>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" integrity="sha384-B4gt1jrGC7Jh4AgTPSdUtOBvfO8shuf57BaghqFfPlYxofvL8/KUEfYiJOMMV+rV" crossorigin="anonymous"></script>
<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>

<?php // If CDN empty and load BS 4 remotely
elseif(($bootstrapcdn == null) && ($bootstrapsource == 3)) : ?>
<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" integrity="sha384-B4gt1jrGC7Jh4AgTPSdUtOBvfO8shuf57BaghqFfPlYxofvL8/KUEfYiJOMMV+rV" crossorigin="anonymous"></script>
<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>

<?php // If CDN empty and load BS 4 remotely, but full jQuery 3 is loaded
elseif(($bootstrapcdn == null) && ($bootstrapsource == 3) && ($jqlibrary == 2)) : ?>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" integrity="sha384-B4gt1jrGC7Jh4AgTPSdUtOBvfO8shuf57BaghqFfPlYxofvL8/KUEfYiJOMMV+rV" crossorigin="anonymous"></script>
<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>
<?php else : ?>
<?php endif; ?>

Expand Down
14 changes: 7 additions & 7 deletions atomic/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@

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

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

<?php // Use jQuery Migrate 3.0.1
<?php // Use jQuery Migrate 3.3.1
if($jqmigrate == 1) : ?>
<script src="https://code.jquery.com/jquery-migrate-3.3.1.min.js" crossorigin="anonymous"></script>
<?php endif; ?>
Expand All @@ -467,18 +467,18 @@ function gtag(){dataLayer.push(arguments);}
// If CDN empty and load BS 3 remotely
if(($bootstrapcdn == null) && ($bootstrapsource == 1)) : ?>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" integrity="sha384-B4gt1jrGC7Jh4AgTPSdUtOBvfO8shuf57BaghqFfPlYxofvL8/KUEfYiJOMMV+rV" crossorigin="anonymous"></script>
<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>

<?php // If CDN empty and load BS 4 remotely
elseif(($bootstrapcdn == null) && ($bootstrapsource == 3)) : ?>
<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" integrity="sha384-B4gt1jrGC7Jh4AgTPSdUtOBvfO8shuf57BaghqFfPlYxofvL8/KUEfYiJOMMV+rV" crossorigin="anonymous"></script>
<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>

<?php // If CDN empty and load BS 4 remotely, but full jQuery 3 is loaded
elseif(($bootstrapcdn == null) && ($bootstrapsource == 3) && ($jqlibrary == 2)) : ?>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" integrity="sha384-B4gt1jrGC7Jh4AgTPSdUtOBvfO8shuf57BaghqFfPlYxofvL8/KUEfYiJOMMV+rV" crossorigin="anonymous"></script>
<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>
<?php else : ?>
<?php endif; ?>

Expand Down
8 changes: 4 additions & 4 deletions atomic/language/en-GB/en-GB.tpl_atomic.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ TPL_ATOMIC_FIXED="Fixed width"
TPL_ATOMIC_FLUID="Fluid width"

TPL_ATOMIC_BOOTSTRAP_LABEL="Load Bootstrap 4"
TPL_ATOMIC_BOOTSTRAP_DESC="Load Bootstrap 4.5 from CDN."
TPL_ATOMIC_BS4_REMOTE="Bootstrap 4.5 (CDN)"
TPL_ATOMIC_BOOTSTRAP_DESC="Load Bootstrap 4.5,3 from CDN."
TPL_ATOMIC_BS4_REMOTE="Bootstrap 4.5.3 (CDN)"
TPL_ATOMIC_BS4_CUSTOM="Custom Bootstrap URL"

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

TPL_ATOMIC_INSTANT_LABEL="Use Instant.page"
Expand All @@ -126,7 +126,7 @@ TPL_ATOMIC_LOADFAVICONS_DESC="Either load the Atomic favicons or use the default
TPL_ATOMIC_LOADAPPLEICONS_LABEL="Load Apple/Android icons"
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"
TPL_ATOMIC_FONTAWESOME_LABEL="Load FontAwesome 5.14 icons"
TPL_ATOMIC_FONTAWESOME_DESC="You can load the local or remote copy of FontAwesome 5.14 or none."
TPL_ATOMIC_FONTAWESOME_DESC="You can load the local or remote copy of FontAwesome 5.15.1 or none."
TPL_ATOMIC_FAREMOTEJS="Use SVG and JS"
TPL_ATOMIC_FAREMOTECSS="Use Web Fonts and CSS"
TPL_ATOMIC_FACUSTOMCSS="Custom FontAwesome CSS URL"
Expand Down

0 comments on commit 2669525

Please sign in to comment.