Merge pull request #198 from joomdev/dev

Dev
joomdev · Oct 27, 2020 · 55ff0bb · 55ff0bb
2 parents 4308bec + ceaf0e2
commit 55ff0bb
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/astroid/astroid-framework/astroid.xml b/astroid/astroid-framework/astroid.xml
@@ -4,7 +4,7 @@
    <libraryname>astroid</libraryname>
    <author>JoomDev</author>
    <creationDate>Oct 2020</creationDate>
-   <version>2.4.6</version>
+   <version>2.4.7</version>
    <url>https://www.astroidframework.com</url>
    <copyright>Copyright (C) 2020 Joomdev, Inc. All rights reserved.</copyright>
    <license>GNU General Public License version 2 or later; see LICENSE.txt</license>

diff --git a/astroid/astroid-framework/framework/library/astroid/Document.php b/astroid/astroid-framework/framework/library/astroid/Document.php
@@ -1081,12 +1081,19 @@ public function astroidCSS()
         // css on page
         $css = $this->renderCss();
         if (Framework::isSite()) {
+            // page css
+            $pageCSSHash = md5($css);
+            $pageCSS = ASTROID_TEMPLATE_PATH . '/css/compiled-' . $pageCSSHash . '.css';
+            if (!file_exists($pageCSS)) {
+                Helper::putContents($pageCSS, $css);
+            }
+            $this->addStyleSheet('css/compiled-' . $pageCSSHash . '.css');
             // custom css
             if (file_exists(ASTROID_TEMPLATE_PATH . '/css/custom.css')) {
                 $this->addStyleSheet('css/custom.css');
             }
-            // return page css
-            return '<style>' . $css . '</style>';
+            // return
+            return '';
         } else {
             $minifier = new Minify\CSS($css);
             return '<style>' . $minifier->minify() . '</style>';

diff --git a/astroid/astroid-framework/framework/library/astroid/Element/Section.php b/astroid/astroid-framework/framework/library/astroid/Element/Section.php
@@ -15,7 +15,7 @@
 
 class Section extends BaseElement
 {
-    protected $_tag = 'div';
+    protected $_tag = 'section';
     public $hasComponent = false;
     public $hasHeader = false;
     public $hasFooter = false;

diff --git a/astroid/astroid-framework/framework/library/astroid/Helper/Constants.php b/astroid/astroid-framework/framework/library/astroid/Helper/Constants.php
@@ -13,7 +13,7 @@
 
 class Constants 
 {
-    public static $astroid_version = '2.4.6';
+    public static $astroid_version = '2.4.7';
     public static $fontawesome_version = '5.14.0';
     public static $animatecss_version = '3.7.0';
     public static $forum_link = 'https://www.joomdev.com/forum/astroid-framework';

diff --git a/astroid/astroid-framework/plugins/astroid/astroid.xml b/astroid/astroid-framework/plugins/astroid/astroid.xml
@@ -3,7 +3,7 @@
    <name>Astroid Plugin</name>
    <author>JoomDev</author>
    <creationDate>Oct 2020</creationDate>
-   <version>2.4.6</version>
+   <version>2.4.7</version>
    <url>https://www.astroidframework.com</url>
    <copyright>Copyright (C) 2020 Joomdev, Inc. All rights reserved.</copyright>
    <license>GNU General Public License version 2 or later; see LICENSE.txt</license>

diff --git a/pkg_astroid.xml b/pkg_astroid.xml
@@ -6,7 +6,7 @@
    <packagerurl>https://www.astroidframework.com</packagerurl>
    <author>JoomDev</author>
    <creationDate>Oct 2020</creationDate>
-   <version>2.4.6</version>
+   <version>2.4.7</version>
    <url>https://www.joomdev.com</url>
    <copyright>Copyright (C) 2020 Joomdev, Inc. All rights reserved.</copyright>
    <license>GNU General Public License version 2 or later; see LICENSE.txt</license>