Skip to content

Commit 075b6bb

Browse files
minor bug fix
1 parent a1c3443 commit 075b6bb

File tree

4 files changed

+86
-8
lines changed

4 files changed

+86
-8
lines changed

astroid/astroid-framework/framework/library/astroid/Component/LazyLoad.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ public static function run()
126126

127127
public static function getBase64Thumbnail($sourceImage)
128128
{
129+
error_reporting(E_ERROR | E_PARSE);
129130
try {
130131
$info = getimagesize($sourceImage);
131132
if (!is_array($info) || !in_array($info['mime'], ['image/jpeg', 'image/gif', 'image/png'])) {

astroid/astroid-template-one/html/layouts/joomla/content/icons/edit.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,11 @@
1616
$article = $displayData['article'];
1717
$nowDate = strtotime(Factory::getDate());
1818

19-
$icon = $article->state ? 'edit' : 'eye-slash';
2019
$currentDate = Factory::getDate()->format('Y-m-d H:i:s');
2120
$isUnpublished = ($article->publish_up > $currentDate)
2221
|| !is_null($article->publish_down) && ($article->publish_down < $currentDate);
23-
24-
if ($isUnpublished) {
25-
$icon = 'eye-slash';
26-
}
2722
$aria_described = 'editarticle-' . (int) $article->id;
2823

2924
?>
30-
<span class="fas fa-<?php echo $icon; ?>" aria-hidden="true"></span>
25+
<span class="fas fa-edit" aria-hidden="true"></span>
3126
<?php echo Text::_('JGLOBAL_EDIT'); ?>

astroid/astroid-template-one/scss/one/_frontend-edit.scss

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
#adminForm {
2+
@import "../../../media/jui/css/icomoon.css";
3+
4+
[class^="icon-"],
5+
[class*=" icon-"] {
6+
height: auto;
7+
width: auto;
8+
line-height: 1;
9+
}
10+
211
.controls {
312

413
>textarea,
@@ -26,6 +35,10 @@
2635
@extend .form-control;
2736
}
2837
}
38+
39+
.field-media-input {
40+
@extend .form-control;
41+
}
2942
}
3043

3144
input[type="checkbox"],
@@ -50,7 +63,15 @@
5063
@extend .form-group
5164
}
5265

53-
.btn:not(.btn-primary) {
66+
.btn {
67+
68+
[class^="icon-"],
69+
[class*=" icon-"] {
70+
margin-right: 10px;
71+
}
72+
}
73+
74+
.btn:not(.btn-primary):not(.btn-secondary):not(.btn-success):not(.btn-danger) {
5475
@extend .btn-outline-secondary;
5576
}
5677

@@ -59,4 +80,24 @@
5980
margin-right: 10px;
6081
}
6182
}
83+
}
84+
85+
.layout-edit {
86+
.tip-wrap {
87+
box-shadow: 2px 2px 9px rgb(0 0 0 / 6%);
88+
border: 1px solid #fdfdfd;
89+
padding: 10px;
90+
background-color: #fff;
91+
}
92+
93+
.input-prepend.input-append {
94+
display: flex;
95+
justify-content: center;
96+
align-items: center;
97+
gap: 10px;
98+
99+
.btn {
100+
width: auto;
101+
}
102+
}
62103
}

astroid/astroid-template-one/scss/one/frontend-edit.scss

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
#adminForm {
2+
@import "../../../media/jui/css/icomoon.css";
3+
4+
[class^="icon-"],
5+
[class*=" icon-"] {
6+
height: auto;
7+
width: auto;
8+
line-height: 1;
9+
}
10+
211
.controls {
312

413
>textarea,
@@ -26,6 +35,10 @@
2635
@extend .form-control;
2736
}
2837
}
38+
39+
.field-media-input {
40+
@extend .form-control;
41+
}
2942
}
3043

3144
input[type="checkbox"],
@@ -50,7 +63,15 @@
5063
@extend .form-group
5164
}
5265

53-
.btn:not(.btn-primary) {
66+
.btn {
67+
68+
[class^="icon-"],
69+
[class*=" icon-"] {
70+
margin-right: 10px;
71+
}
72+
}
73+
74+
.btn:not(.btn-primary):not(.btn-secondary):not(.btn-success):not(.btn-danger) {
5475
@extend .btn-outline-secondary;
5576
}
5677

@@ -59,4 +80,24 @@
5980
margin-right: 10px;
6081
}
6182
}
83+
}
84+
85+
.layout-edit {
86+
.tip-wrap {
87+
box-shadow: 2px 2px 9px rgb(0 0 0 / 6%);
88+
border: 1px solid #fdfdfd;
89+
padding: 10px;
90+
background-color: #fff;
91+
}
92+
93+
.input-prepend.input-append {
94+
display: flex;
95+
justify-content: center;
96+
align-items: center;
97+
gap: 10px;
98+
99+
.btn {
100+
width: auto;
101+
}
102+
}
62103
}

0 commit comments

Comments
 (0)