Skip to content

Commit ef5260d

Browse files
hiteshaggarwalhiteshaggarwal
committed
Merge branch 'master' into dev
2 parents ef131f0 + 9f56033 commit ef5260d

19 files changed

+2941
-50
lines changed

‎astroid/astroid-framework/astroid.xml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!DOCTYPE install PUBLIC "-//Joomla! 2.5//DTD template 1.0//EN" "https://www.joomla.org/xml/dtd/1.6/template-install.dtd">
33
<extension version="3.1" type="library" method="upgrade">
4-
<name>Astroid Framework</name>
5-
<libraryname>astroid</libraryname>
6-
<author>JoomDev</author>
7-
<creationDate>March 2019</creationDate>
8-
<version>2.1.0</version>
9-
<url>https://www.astroidframework.com</url>
10-
<copyright>Copyright (C) 2019 Joomdev, Inc. All rights reserved.</copyright>
11-
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
12-
<authorEmail>[email protected]</authorEmail>
13-
<authorUrl>https://www.joomdev.com</authorUrl>
14-
<description>Astroid Template Framework by JoomDev</description>
15-
<scriptfile>script.php</scriptfile>
16-
<files>
17-
<file>script.php</file>
18-
<folder>framework</folder>
19-
<folder>plugins</folder>
20-
</files>
21-
<media folder="media" destination="astroid">
22-
<folder>assets</folder>
23-
<folder>jd</folder>
24-
</media>
25-
<languages folder="language/en-GB">
26-
<language tag="en-GB">en-GB.astroid.ini</language>
27-
<language tag="en-GB">en-GB.astroid.sys.ini</language>
28-
</languages>
29-
<updateservers>
30-
<server type="extension" priority="1" name="Astroid Framework">https://cdn.joomdev.com/updates/astroid_framework.xml</server>
31-
</updateservers>
4+
<name>Astroid Framework</name>
5+
<libraryname>astroid</libraryname>
6+
<author>JoomDev</author>
7+
<creationDate>March 2019</creationDate>
8+
<version>2.1.0</version>
9+
<url>https://www.astroidframework.com</url>
10+
<copyright>Copyright (C) 2019 Joomdev, Inc. All rights reserved.</copyright>
11+
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
12+
<authorEmail>[email protected]</authorEmail>
13+
<authorUrl>https://www.joomdev.com</authorUrl>
14+
<description>Astroid Template Framework by JoomDev</description>
15+
<scriptfile>script.php</scriptfile>
16+
<files>
17+
<file>script.php</file>
18+
<folder>framework</folder>
19+
<folder>plugins</folder>
20+
</files>
21+
<media folder="media" destination="astroid">
22+
<folder>assets</folder>
23+
<folder>jd</folder>
24+
</media>
25+
<languages folder="language/en-GB">
26+
<language tag="en-GB">en-GB.astroid.ini</language>
27+
<language tag="en-GB">en-GB.astroid.sys.ini</language>
28+
</languages>
29+
<updateservers>
30+
<server type="extension" priority="1" name="Astroid Framework">https://cdn.joomdev.com/updates/astroid_framework.xml</server>
31+
</updateservers>
3232
</extension>

‎astroid/astroid-framework/framework/article.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* @package Astroid Framework
45
* @author JoomDev https://www.joomdev.com
@@ -73,7 +74,7 @@ public function addMeta() {
7374
return;
7475
}
7576
$config = JFactory::getConfig();
76-
77+
7778
$og_title = $this->article->title;
7879
if (!empty($this->article->params->get('astroid_og_title', ''))) {
7980
$og_title = $this->article->params->get('astroid_og_title', '');
@@ -408,4 +409,4 @@ public static function getArticleRating($id) {
408409
}
409410
}
410411

411-
}
412+
}

‎astroid/astroid-framework/framework/layouts/fields/astroidsocialprofiles.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@
4141
<input type="text" ng-model="profile.link" class="form-control" autocomplete="off">
4242
</div>
4343
</div>
44-
<div ng-if="profile.id=='custom'" class="row mt-2">
44+
<div ng-if="profile.id == 'custom'" class="row mt-2">
4545
<div class="col-sm-4">
4646
<label class="astroid-label"><?php echo JText::_('TPL_ASTROID_ICON_CLASS'); ?></label>
4747
</div>
4848
<div class="col-sm-8">
4949
<input type="text" ng-model="profile.icon" class="form-control" autocomplete="off">
5050
</div>
5151
</div>
52-
<div ng-if="profile.id!='custom'" class="row mt-2" ng-show="profile.icons.length > 1">
52+
<div ng-if="profile.id != 'custom'" class="row mt-2" ng-show="profile.icons.length > 1">
5353
<div class="col-sm-4">
5454
<label class="astroid-label"><?php echo JText::_('TPL_ASTROID_ICON'); ?></label>
5555
</div>
@@ -59,7 +59,7 @@
5959
</ul>
6060
</div>
6161
</div>
62-
<div ng-if="profile.id=='custom'" class="mt-2 row">
62+
<div ng-if="profile.id == 'custom'" class="mt-2 row">
6363
<div class="col-sm-4">
6464
<label class="astroid-label"><?php echo JText::_('TPL_ASTROID_COLOR'); ?></label>
6565
</div>

‎astroid/astroid-template-zero/frontend/logo.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,4 @@
6767
<!-- image logo ends -->
6868
<?php endif; ?>
6969
<!-- </div> -->
70-
<!-- logo ends -->
70+
<!-- logo ends -->

‎astroid/astroid-template-zero/scss/astroid/joomla/_frontend.scss‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
ul.categories-module {
2+
li {
3+
&.active {
4+
background: inherit;
5+
a {
6+
color: $secondary;
7+
}
8+
}
9+
a {
10+
font-size: 1rem;
11+
}
12+
}
13+
}

‎astroid/astroid-template-zero/scss/astroid/joomla/_joomla.scss‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
@import "language_switcher";
2-
@import "mod_articles_categories";
2+
@import "mod_articles_categories";
3+
@import "frontend";

‎astroid/astroid-template-zero/scss/astroid/joomla/_mod_article_latest.scss‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)