Skip to content

Commit

Permalink
Merge pull request #622 from templaza/v3
Browse files Browse the repository at this point in the history
v3.0.13
  • Loading branch information
sonvnn authored Apr 3, 2024
2 parents 418342b + 31e1c89 commit 9690e3d
Show file tree
Hide file tree
Showing 169 changed files with 8,888 additions and 3,328 deletions.
5 changes: 5 additions & 0 deletions assets/vendor/astroid/scss/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,11 @@

header .logo-wrapper {
align-self: center;
.site-tagline {
font-size: 0.8rem;
margin: 0;
line-height: 1;
}
}

.astroid-logo {
Expand Down
4 changes: 2 additions & 2 deletions astroid.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<name>Astroid Framework</name>
<libraryname>astroid</libraryname>
<author>Astroid Framework Team</author>
<creationDate>March 2024</creationDate>
<version>3.0.12</version>
<creationDate>April 2024</creationDate>
<version>3.0.13</version>
<url>https://astroidframe.work/</url>
<copyright>Copyright (C) 2024 TemPlaza, Inc. All rights reserved.</copyright>
<license>GNU General Public License version 3 or later; see LICENSE.txt</license>
Expand Down
4 changes: 2 additions & 2 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>3.0.12</version>
<version>3.0.13</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/v3.0.12/astroid-framework-3.0.12.zip</downloadurl>
<downloadurl type="full" format="zip">https://github.com/templaza/astroid-framework/releases/download/v3.0.13/astroid-framework-3.0.13.zip</downloadurl>
</downloads>
<tags>
<tag>stable</tag>
Expand Down
59 changes: 8 additions & 51 deletions framework/astroid.php
Original file line number Diff line number Diff line change
@@ -1,52 +1,9 @@
<?php

jimport('astroid.framework.template');

abstract class AstroidFramework
{

public static $template = null;
public static $stylesheets = [];
public static $javascripts = ['head' => [], 'body' => []];
public static $styles = [];
public static $scripts = ['head' => [], 'body' => []];

public static function getTemplate()
{
if (!self::$template) {
self::$template = self::createTemplate();
}

return self::$template;
}

public static function setTemplate($template)
{
self::$template = $template;
}

public static function addStyleSheet($url)
{
self::$stylesheets[] = $url;
}

public static function addStyleDeclaration($css)
{
self::$styles[] = $css;
}

public static function addScript($url, $position = 'head')
{
self::$javascripts[$position][] = $url;
}

public static function addScriptDeclaration($js, $position = 'head')
{
self::$scripts[$position][] = $js;
}

public static function createTemplate()
{
return new AstroidFrameworkTemplate(JFactory::getApplication()->getTemplate(true));
}
}
/**
* @package Astroid Framework
* @author Astroid Framework Team https://astroidframe.work
* @copyright Copyright (C) 2023 AstroidFrame.work.
* @license https://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or Later
*/
defined('_JEXEC') or die;
abstract class AstroidFramework extends \Astroid\Framework {}
101 changes: 0 additions & 101 deletions framework/audit.php

This file was deleted.

4 changes: 1 addition & 3 deletions framework/constants.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,4 @@
*/
defined('_JEXEC') or die;

class AstroidFrameworkConstants extends Astroid\Helper\Constants
{
}
class AstroidFrameworkConstants extends Astroid\Helper\Constants {}
Loading

0 comments on commit 9690e3d

Please sign in to comment.