Skip to content

Commit e941f2a

Browse files
authored
Merge pull request #226 from joomdev/dev
v2.5.3
2 parents 0b4967c + deac022 commit e941f2a

63 files changed

Lines changed: 592 additions & 1292 deletions

Some content is hidden

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

astroid/astroid-framework/assets/css/frontend-editing-j4.css

Whitespace-only changes.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ astroidFramework.directive("astroidsocialprofiles", ["$http", function ($http) {
340340
icons: [],
341341
id: "custom",
342342
link: "#",
343-
title: "Custom social profile"
343+
title: "My Social Link"
344344
};
345345
var _profiles = $scope.profiles;
346346
_profiles.push(angular.copy(_profile));

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/js/megamenu.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,18 @@
108108
var _rightoverflow = _container.offset().left + _container.outerWidth();
109109
_content.css('max-width', _container.outerWidth());
110110
}
111-
var _top = _container.outerHeight() - $(this).outerHeight();
111+
112+
if ($(this).height() * 2 <= _container.height()) {
113+
var _top = 0
114+
} else {
115+
var _top = _container.outerHeight() - $(this).outerHeight();
116+
}
117+
112118
var _arrow = $(this).children('.arrow');
113119
_content.css('left', '0px');
114120

115121
if (settings.headerOffset) {
116122
_arrow.css('margin-bottom', -(_top / 2));
117-
var _top = _container.outerHeight() - $(this).outerHeight();
118123
_content.css('top', (_top / 2) + $(this).outerHeight());
119124
} else {
120125
_content.css('top', '100%');

astroid/astroid-framework/assets/vendor/astroid/js/script.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,12 @@
168168
$(_this).css('animation-duration', _duration + 'ms');
169169
setTimeout(function () {
170170
$(_this).css('visibility', 'visible');
171-
$(_this).addClass('animated');
171+
$(_this).addClass('animate');
172172
$(_this).addClass(_animation);
173173
$(_this).addClass('animation-done');
174174
setTimeout(function () {
175-
$(_this).removeClass('animated');
175+
$(_this).removeClass('animate');
176+
$(_this).addClass('animated');
176177
$(_this).removeClass(_animation);
177178
}, (_duration + _delay));
178179
}, _delay);

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,15 @@
1111

1212
.alert-notice {
1313
@extend .alert-warning;
14+
}
15+
16+
.invalid {
17+
border-color: #B94A48;
18+
background: #F2DEDE
19+
}
20+
21+
label.invalid,
22+
label.required span {
23+
color: #B94A48;
24+
background: none
1425
}

astroid/astroid-framework/assets/vendor/astroid/scss/_pagination.scss

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1-
.pagination{
1+
ul.pagination{
22
justify-content: center;
33
.page-item:first-child .page-link,
44
.page-item:last-child .page-link {
5-
border-radius: 0;
5+
// border-radius: 0;
66
}
77
}
88

9+
div.pagination {
10+
display: block;
11+
width: 100%;
12+
text-align: center;
13+
}
14+
915
.pagenavigation .pagination{
1016
justify-content: space-between;
1117
}
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
.tag-category {
2+
3+
form {
4+
.filters {
5+
justify-content: space-between;
6+
width: 100%;
7+
.clearfix {
8+
display: none;
9+
}
10+
input.inputbox[type="text"] {
11+
padding: 10px 15px;
12+
}
13+
}
14+
select.inputbox {
15+
background: #eaedf0;
16+
border: 1px solid #ddd;
17+
padding: 10px;
18+
padding-right: 9px;
19+
}
20+
}
21+
22+
.element-invisible {
23+
font-size: 0;
24+
}
25+
26+
ul.category {
27+
padding: 0;
28+
list-style: none;
29+
margin-top: 20px;
30+
li {
31+
border: 1px solid rgba(0, 0, 0, 0.125);
32+
margin-bottom: -1px;
33+
padding: .75rem 1.25rem;
34+
h3 {
35+
margin: 0;
36+
}
37+
}
38+
}
39+
}

astroid/astroid-framework/assets/vendor/astroid/scss/components/_components.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
@import "banner";
33
@import "blog";
44
@import "badge";
5-
@import "rating";
5+
@import "rating";
6+
@import "com-tags";

astroid/astroid-framework/assets/vendor/astroid/scss/joomla/joomla4.scss

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,31 @@
44

55
.com-content-category__no-articles {
66
width: 100%;
7+
}
8+
9+
// Tags View
10+
11+
.com-tags-tag {
12+
13+
form {
14+
.com-tags-tags__filter {
15+
margin-bottom: 20px;
16+
.inputbox {
17+
padding: 10px;
18+
}
19+
}
20+
.form-select {
21+
background: #eaedf0;
22+
border: 1px solid #ddd;
23+
padding: 10px;
24+
padding-right: 9px;
25+
}
26+
.float-end {
27+
float: right;
28+
}
29+
}
30+
31+
.visually-hidden {
32+
font-size: 0;
33+
}
734
}

0 commit comments

Comments
 (0)