Skip to content

Commit

Permalink
Merge pull request #92 from templaza/developer
Browse files Browse the repository at this point in the history
Update version 2.5.14
  • Loading branch information
sonvnn authored Feb 11, 2022
2 parents 7d4ea5c + 617db71 commit ae70d39
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 19 deletions.
5 changes: 3 additions & 2 deletions assets/vendor/fontawesome/css/all.min.css

Large diffs are not rendered by default.

Binary file modified assets/vendor/fontawesome/webfonts/fa-brands-400.ttf
Binary file not shown.
Binary file modified assets/vendor/fontawesome/webfonts/fa-brands-400.woff2
Binary file not shown.
Binary file modified assets/vendor/fontawesome/webfonts/fa-regular-400.ttf
Binary file not shown.
Binary file modified assets/vendor/fontawesome/webfonts/fa-regular-400.woff2
Binary file not shown.
Binary file modified assets/vendor/fontawesome/webfonts/fa-solid-900.ttf
Binary file not shown.
Binary file modified assets/vendor/fontawesome/webfonts/fa-solid-900.woff2
Binary file not shown.
Binary file not shown.
Binary file not shown.
8 changes: 4 additions & 4 deletions astroid.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<name>Astroid Framework</name>
<libraryname>astroid</libraryname>
<author>JoomDev/TemPlaza</author>
<creationDate>January 2022</creationDate>
<version>2.5.13</version>
<url>https://www.templaza.com</url>
<creationDate>February 2022</creationDate>
<version>2.5.14</version>
<url>https://astroidframe.work/</url>
<copyright>Copyright (C) 2022 TemPlaza, Inc. All rights reserved.</copyright>
<license>GNU General Public License version 3 or later; see LICENSE.txt</license>
<authorEmail>[email protected]</authorEmail>
Expand All @@ -29,4 +29,4 @@
<updateservers>
<server type="extension" priority="1" name="Astroid Framework">https://raw.githubusercontent.com/templaza/astroid-framework/master/astroid_framework.xml</server>
</updateservers>
</extension>
</extension>
8 changes: 4 additions & 4 deletions astroid_framework.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<updates>
<update>
<name>Astroid Framework</name>
<version>2.5.13</version>
<infourl title="Astroid Framework">https://github.com/templaza/astroid-framework</infourl>
<version>2.5.14</version>
<infourl title="Astroid Framework">https://astroidframe.work/</infourl>
<element>astroid</element>
<type>library</type>
<client>0</client>
<downloads>
<downloadurl type="full" format="zip">https://github.com/templaza/astroid-framework/releases/download/v2.5.13/astroid-framework-2.5.13.zip</downloadurl>
<downloadurl type="full" format="zip">https://github.com/templaza/astroid-framework/releases/download/v2.5.14/astroid-framework-2.5.14.zip</downloadurl>
</downloads>
<tags>
<tag>stable</tag>
Expand All @@ -16,4 +16,4 @@
<maintainerurl>https://www.templaza.com</maintainerurl>
<targetplatform name="joomla" version="(3.)|(4.)"/>
</update>
</updates>
</updates>
14 changes: 7 additions & 7 deletions framework/library/astroid/Helper/Constants.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@

class Constants
{
public static $astroid_version = '2.5.13';
public static $fontawesome_version = '5.14.0';
public static $astroid_version = '2.5.14';
public static $fontawesome_version = '6.0.0';
public static $animatecss_version = '3.7.0';
public static $forum_link = 'https://github.com/templaza/astroid-framework/issues';
public static $documentation_link = 'https://github.com/templaza/astroid-framework/wiki';
public static $video_tutorial_link = 'https://www.youtube.com/playlist?list=PLv9TlpLcSZTBBVpJqe3SdJ34A6VvicXqM';
public static $video_tutorial_link = 'https://www.youtube.com/channel/UCUHl1uU0Ofkyo-1ke-K4_xg';
public static $github_link = 'https://github.com/templaza/astroid-framework';
public static $download_link = 'https://github.com/templaza/astroid-framework/releases/latest';
public static $releases_link = 'https://github.com/templaza/astroid-framework/releases';
public static $joomdev_link = 'https://www.templaza.com';
public static $joomdev_products_link = 'https://www.templaza.com/joomla-templates.html';
public static $joomdev_templates_link = 'https://www.templaza.com/joomla-templates.html';
public static $jd_builder_link = 'https://www.templaza.com/joomla-templates.html';
public static $astroid_link = 'https://astroidframe.work/';
public static $joomdev_products_link = 'https://astroidframe.work/resources/template-providers';
public static $joomdev_templates_link = 'https://astroidframe.work/resources/template-providers';
public static $jd_builder_link = 'https://astroidframe.work/';

public static $bootstrap_colors = [
'' => 'TPL_COLOR_DEFAULT',
Expand Down
6 changes: 4 additions & 2 deletions framework/library/astroid/Helper/Style.php
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,11 @@ public static function renderTypography($selector, $object, $defaultObject = nul
if (is_object($font_size)) {
foreach (['desktop', 'tablet', 'mobile'] as $device) {
$unit = isset($font_size_unit->{$device}) ? $font_size_unit->{$device} : 'em';
$style->addCss('font-size', $font_size->{$device} . $unit, $device);
if ($font_size->{$device}) {
$style->addCss('font-size', $font_size->{$device} . $unit, $device);
}
}
} else {
} elseif ($font_size) {
$style->addCss('font-size', $font_size . $font_size_unit);
}
}
Expand Down

0 comments on commit ae70d39

Please sign in to comment.