Skip to content

Commit de62a33

Browse files
itxchandanitxchandan
authored
Merge pull request #217 from joomdev/dev
Dev
2 parents 430dccb + 37fc4fc commit de62a33

File tree

294 files changed

+3554
-11587
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

294 files changed

+3554
-11587
lines changed

‎astroid/astroid-framework/assets/css/astroid-framework.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎astroid/astroid-framework/assets/css/astroid-framework.css.map‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎astroid/astroid-framework/assets/js/astroid-framework.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ astroidFramework.directive("astroidmediagallery", ["$http", function ($http) {
4343
ngModel.$setViewValue("");
4444
try {
4545
Admin.checkForm();
46-
} catch (e) {}
46+
} catch (e) { }
4747
};
4848
$scope.selectImage = function (_id, _value) {
4949
ngModel.$setViewValue(_value);
5050
$scope.selectMedia = false;
5151
try {
5252
Admin.checkForm();
53-
} catch (e) {}
53+
} catch (e) { }
5454
};
5555
$scope.getLibrary = function (folder, tab) {
5656
$("a#" + tab).tab("show");
@@ -59,7 +59,7 @@ astroidFramework.directive("astroidmediagallery", ["$http", function ($http) {
5959
$scope.bradcrumb = [];
6060
$.ajax({
6161
method: "GET",
62-
url: BASE_URL + "index.php?option=com_ajax&astroid=media&action=library&folder=" + folder + "&asset=com_templates&author=",
62+
url: BASE_URL + "index.php?option=com_ajax&astroid=media&action=library&folder=" + folder + "&asset=com_templates&ts=" + Date.now() + "&author=",
6363
success: function (response) {
6464
if (response.status == "error") {
6565
$.notify(response.message, {
@@ -321,7 +321,7 @@ astroidFramework.directive("astroidsocialprofiles", ["$http", function ($http) {
321321
try {
322322
$scope.setProfiles();
323323
Admin.checkForm();
324-
} catch (e) {}
324+
} catch (e) { }
325325
};
326326
$scope.setProfiles = function () {
327327
var _profiles = [];
@@ -412,13 +412,13 @@ astroidFramework.directive("dropzone", function () {
412412
}
413413
try {
414414
Admin.checkForm();
415-
} catch (e) {}
415+
} catch (e) { }
416416
},
417417
complete: function (file) {
418418
this.removeAllFiles(true);
419419
try {
420420
Admin.checkForm();
421-
} catch (e) {}
421+
} catch (e) { }
422422
},
423423
sending: function (file, xhr, formData) {
424424
if (_dir) {
@@ -608,7 +608,7 @@ astroidFramework.directive("astroidSwitch", function () {
608608
}
609609
try {
610610
Admin.checkForm();
611-
} catch (e) {}
611+
} catch (e) { }
612612
};
613613
var updateElementFromModel = function () {
614614
if (ngModel.$viewValue == 1) {

‎astroid/astroid-framework/assets/js/astroid.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎astroid/astroid-framework/assets/vendor/astroid/scss/_error.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,8 @@
77
display: flex;
88
align-items: center;
99
padding: 30px 0px;
10+
}
11+
12+
.alert-notice {
13+
@extend .alert-warning;
1014
}

‎astroid/astroid-framework/assets/vendor/astroid/scss/_layouts.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,4 +217,8 @@ ul.fa-ul {
217217
@extend .rounded;
218218
@extend .p-3;
219219
@extend .mb-4;
220+
}
221+
222+
.breadcrumb li span.divider:before {
223+
display: none;
220224
}

‎astroid/astroid-framework/assets/vendor/astroid/scss/_mixins.scss‎

Lines changed: 36 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,77 +7,88 @@
77

88
$foreground-color: nth($color, 1);
99
$background-color: transparent !default;
10-
@if (length($color) == 2) {
10+
11+
@if length($color)==2 {
1112
$background-color: nth($color, 2);
1213
}
1314

14-
@if ($direction == up) or ($direction == down) or ($direction == right) or ($direction == left) {
15+
@if $direction==up or $direction==down or $direction==right or $direction==left {
1516

1617
$width: $width / 2;
1718

18-
@if $direction == up {
19+
@if $direction==up {
1920
border-left: $width solid $background-color;
2021
border-right: $width solid $background-color;
2122
border-bottom: $height solid $foreground-color;
2223

23-
} @else if $direction == right {
24+
}
25+
26+
@else if $direction==right {
2427
border-top: $width solid $background-color;
2528
border-bottom: $width solid $background-color;
2629
border-left: $height solid $foreground-color;
2730

28-
} @else if $direction == down {
31+
}
32+
33+
@else if $direction==down {
2934
border-left: $width solid $background-color;
3035
border-right: $width solid $background-color;
3136
border-top: $height solid $foreground-color;
3237

33-
} @else if $direction == left {
38+
}
39+
40+
@else if $direction==left {
3441
border-top: $width solid $background-color;
3542
border-bottom: $width solid $background-color;
3643
border-right: $height solid $foreground-color;
3744
}
3845
}
3946

40-
@else if ($direction == up-right) or ($direction == up-left) {
47+
@else if $direction==up-right or $direction==up-left {
4148
border-top: $height solid $foreground-color;
4249

43-
@if $direction == up-right {
44-
border-left: $width solid $background-color;
50+
@if $direction==up-right {
51+
border-left: $width solid $background-color;
52+
53+
}
4554

46-
} @else if $direction == up-left {
55+
@else if $direction==up-left {
4756
border-right: $width solid $background-color;
4857
}
4958
}
5059

51-
@else if ($direction == down-right) or ($direction == down-left) {
60+
@else if $direction==down-right or $direction==down-left {
5261
border-bottom: $height solid $foreground-color;
5362

54-
@if $direction == down-right {
55-
border-left: $width solid $background-color;
63+
@if $direction==down-right {
64+
border-left: $width solid $background-color;
65+
66+
}
5667

57-
} @else if $direction == down-left {
68+
@else if $direction==down-left {
5869
border-right: $width solid $background-color;
5970
}
6071
}
6172

62-
@else if ($direction == inset-up) {
73+
@else if $direction==inset-up {
6374
border-width: $height $width;
6475
border-style: solid;
6576
border-color: $background-color $background-color $foreground-color;
6677
}
6778

68-
@else if ($direction == inset-down) {
79+
@else if $direction==inset-down {
6980
border-width: $height $width;
7081
border-style: solid;
7182
border-color: $foreground-color $background-color $background-color;
7283
}
7384

74-
@else if ($direction == inset-right) {
85+
@else if $direction==inset-right {
7586
border-width: $width $height;
7687
border-style: solid;
7788
border-color: $background-color $background-color $background-color $foreground-color;
7889
}
7990

80-
@else if ($direction == inset-left) {
91+
@else if $direction==inset-left {
8192
border-width: $width $height;
8293
border-style: solid;
8394
border-color: $background-color $foreground-color $background-color $background-color;
@@ -90,12 +101,14 @@
90101
height: $size;
91102
width: $size;
92103
color: $color;
93-
&:before{
104+
105+
&:before {
94106
border-radius: 50%;
95107
border: $border solid currentColor;
96108
opacity: .15;
97109
}
98-
&:after{
110+
111+
&:after {
99112
-webkit-animation: loader $speed linear;
100113
animation: loader $speed linear;
101114
-webkit-animation-iteration-count: infinite;
@@ -106,7 +119,9 @@
106119
border-top-color: currentColor;
107120
box-shadow: 0 0 0 1px transparent;
108121
}
109-
&:before, &:after{
122+
123+
&:before,
124+
&:after {
110125
width: $size;
111126
height: $size;
112127
margin: -($size/2) 0 0 -($size/2);

‎astroid/astroid-framework/astroid.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<libraryname>astroid</libraryname>
55
<author>JoomDev</author>
66
<creationDate>Oct 2020</creationDate>
7-
<version>2.4.7</version>
7+
<version>2.5.1</version>
88
<url>https://www.astroidframework.com</url>
99
<copyright>Copyright (C) 2020 Joomdev, Inc. All rights reserved.</copyright>
1010
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎astroid/astroid-framework/framework/elements/banner/banner.php‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,12 @@
3131
return;
3232
}
3333
}
34-
$style = [];
34+
$style = ['display:flex', 'align-items:center'];
35+
36+
$banner_height = $params->get('astroid_banner_height', '');
37+
if (!empty($banner_height)) {
38+
$style[] = 'height:' . $banner_height;
39+
}
3540

3641
$astroid_banner_enabled = $params->get('astroid_banner_enabled');
3742
if ($astroid_banner_enabled) {
@@ -91,8 +96,8 @@
9196
$style[] = 'background-image:url(' . $astroid_banner_bgimage . ')';
9297
}
9398
$style = !empty($style) ? 'style="' . implode(';', $style) . '"' : '';
94-
$styletext = [];
95-
$stylesubtext = [];
99+
$styletext = ['width:100%'];
100+
$stylesubtext = ['width:100%'];
96101
if (!empty($astroid_banner_textcolor)) {
97102
$styletext[] = 'color:' . $astroid_banner_textcolor;
98103
}

‎astroid/astroid-framework/framework/forms/banner.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@
9292
<field showon="astroid_banner_enabled:1" name="astroid_banner_class" type="text" label="ASTROID_BANNER_CLASS_LABEL">
9393
</field>
9494

95+
<field showon="astroid_banner_enabled:1" name="astroid_banner_height" type="text" label="ASTROID_BANNER_HEIGHT_LABEL">
96+
</field>
97+
9598
<field showon="astroid_banner_enabled:1" name="astroid_banner_wrapper" type="list" default="container" label="ASTROID_BANNER_LAUOUT_LABEL">
9699
<option value="">TPL_ASTROID_DEFAULT</option>
97100
<option value="container">ASTROID_CONTAINER</option>

0 commit comments

Comments
 (0)