Skip to content

Commit 70fd5ff

Browse files
itxchandanitxchandan
authored
Merge pull request #227 from joomdev/dev
Dev
2 parents e941f2a + 43e0215 commit 70fd5ff

File tree

10 files changed

+5427
-3198
lines changed

10 files changed

+5427
-3198
lines changed

‎astroid/astroid-framework/assets/json/webfonts.json

Lines changed: 5181 additions & 3173 deletions
Large diffs are not rendered by default.

‎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>Aug 2021</creationDate>
7-
<version>2.5.3</version>
7+
<version>2.5.4</version>
88
<url>https://www.astroidframework.com</url>
99
<copyright>Copyright (C) 2021 Joomdev, Inc. All rights reserved.</copyright>
1010
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎astroid/astroid-framework/framework/library/astroid/Helper/Font.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,9 @@ public static function loadGoogleFont($value)
219219
}
220220
sort($_value);
221221

222-
$value = str_replace($wght, implode(';', $_value), $value);
222+
if (strpos($value, "@") > 0) {
223+
$value = str_replace($wght, implode(';', $_value), $value);
224+
}
223225

224226
$document->addCustomTag('<link rel="preconnect" href="https://fonts.gstatic.com">');
225227
$document->addStyleSheet('https://fonts.googleapis.com/css2?family=' . $value . '&display=swap');

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
}
99

1010
fieldset {
11-
margin-bottom: 20px
11+
margin-bottom: 20px;
1212
}
1313

1414
.controls {
@@ -65,7 +65,7 @@
6565
}
6666

6767
.controls {
68-
@extend .form-group
68+
@extend .form-group;
6969
}
7070

7171
.btn:not(.btn-primary):not(.btn-secondary):not(.btn-success):not(.btn-danger) {
@@ -136,7 +136,7 @@
136136
overflow: hidden !important;
137137
clip: rect(0, 0, 0, 0) !important;
138138
white-space: nowrap !important;
139-
border: 0 !important
139+
border: 0 !important;
140140
}
141141

142142

@@ -161,7 +161,7 @@ element.style {
161161
}
162162

163163
.float-end {
164-
float: right !important
164+
float: right !important;
165165
}
166166

167167
.hidden {
@@ -189,19 +189,19 @@ element.style {
189189
background: transparent url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath d='M.293.293a1 1 0 011.414 0L8 6.586 14.293.293a1 1 0 111.414 1.414L9.414 8l6.293 6.293a1 1 0 01-1.414 1.414L8 9.414l-6.293 6.293a1 1 0 01-1.414-1.414L6.586 8 .293 1.707a1 1 0 010-1.414z'/%3E%3C/svg%3E") 50%/1em auto no-repeat;
190190
border: 0;
191191
border-radius: .25rem;
192-
opacity: .5
192+
opacity: .5;
193193
}
194194

195195
.btn-close:hover {
196196
color: #000;
197197
text-decoration: none;
198-
opacity: .75
198+
opacity: .75;
199199
}
200200

201201
.btn-close:focus {
202202
outline: 0;
203203
box-shadow: 0 0 0 .25rem rgba(var(--cassiopeia-color-primary), .25);
204-
opacity: 1
204+
opacity: 1;
205205
}
206206

207207
.btn-close.disabled,
@@ -211,10 +211,10 @@ element.style {
211211
-moz-user-select: none;
212212
-ms-user-select: none;
213213
user-select: none;
214-
opacity: .25
214+
opacity: .25;
215215
}
216216

217217
.btn-close-white {
218218
-webkit-filter: invert(1) grayscale(100%) brightness(200%);
219-
filter: invert(1) grayscale(100%) brightness(200%)
219+
filter: invert(1) grayscale(100%) brightness(200%);
220220
}

‎astroid/astroid-template-one/scss/one/components/_blog.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
width: 40px;
2222
height: 40px;
2323
border-radius: 40px;
24-
top: 0px;
24+
top: 0;
2525
margin-top: -40px;
2626
margin-left: auto;
2727
right: 0;

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

Lines changed: 220 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,220 @@
1+
#adminForm {
2+
3+
[class^="icon-"],
4+
[class*=" icon-"] {
5+
height: auto;
6+
width: auto;
7+
line-height: 1;
8+
}
9+
10+
fieldset {
11+
margin-bottom: 20px;
12+
}
13+
14+
.controls {
15+
16+
>textarea,
17+
>select,
18+
>input[type="text"],
19+
>input[type="password"],
20+
>input[type="datetime"],
21+
>input[type="datetime-local"],
22+
>input[type="date"],
23+
>input[type="month"],
24+
>input[type="time"],
25+
>input[type="week"],
26+
>input[type="number"],
27+
>input[type="email"],
28+
>input[type="url"],
29+
>input[type="search"],
30+
>input[type="tel"],
31+
>input[type="color"],
32+
>.uneditable-input {
33+
@extend .form-control;
34+
}
35+
36+
.field-calendar {
37+
input[type="text"] {
38+
@extend .form-control;
39+
}
40+
}
41+
42+
.field-media-input {
43+
@extend .form-control;
44+
}
45+
}
46+
47+
input[type="checkbox"],
48+
input[type="radio"] {
49+
@extend .form-check;
50+
margin-right: 5px;
51+
display: inline-block;
52+
53+
+label {
54+
@extend .form-check-label;
55+
margin-right: 10px;
56+
color: #495057;
57+
}
58+
}
59+
60+
input[type="date"],
61+
input[type="time"],
62+
input[type="datetime-local"],
63+
input[type="month"] {
64+
appearance: none;
65+
}
66+
67+
.controls {
68+
@extend .form-group;
69+
}
70+
71+
.btn:not(.btn-primary):not(.btn-secondary):not(.btn-success):not(.btn-danger) {
72+
@extend .btn-outline-secondary;
73+
}
74+
75+
.btn-toolbar {
76+
.btn-group:not(:last-child) {
77+
margin-right: 10px;
78+
}
79+
}
80+
}
81+
82+
.layout-edit {
83+
.tip-wrap {
84+
box-shadow: 2px 2px 9px rgb(0 0 0 / 6%);
85+
border: 1px solid #fdfdfd;
86+
padding: 10px;
87+
background-color: #fff;
88+
}
89+
90+
.input-prepend.input-append {
91+
display: flex;
92+
justify-content: center;
93+
align-items: center;
94+
gap: 10px;
95+
96+
.btn {
97+
width: auto;
98+
}
99+
}
100+
}
101+
102+
.choices__button_joomla {
103+
position: relative;
104+
padding: 0 10px;
105+
color: inherit;
106+
text-indent: -9999px;
107+
cursor: pointer;
108+
background: none;
109+
border: 0;
110+
opacity: .5;
111+
-webkit-appearance: none;
112+
-moz-appearance: none;
113+
appearance: none;
114+
}
115+
116+
.choices__button_joomla:before {
117+
position: absolute;
118+
top: 0;
119+
right: 0;
120+
bottom: 0;
121+
left: 0;
122+
display: block;
123+
text-align: center;
124+
text-indent: 0;
125+
content: "×";
126+
}
127+
128+
.sr-only,
129+
.visually-hidden,
130+
.visually-hidden-focusable:not(:focus):not(:focus-within) {
131+
position: absolute !important;
132+
width: 1px !important;
133+
height: 1px !important;
134+
padding: 0 !important;
135+
margin: -1px !important;
136+
overflow: hidden !important;
137+
clip: rect(0, 0, 0, 0) !important;
138+
white-space: nowrap !important;
139+
border: 0 !important;
140+
}
141+
142+
143+
element.style {
144+
}
145+
.options-form, .options-form>legend {
146+
color: #495057;
147+
background-color: #fff;
148+
}
149+
.options-form {
150+
width: 100%;
151+
padding: 1vw 2vw;
152+
margin-bottom: 1rem;
153+
border: 1px solid #b2bfcd;
154+
}
155+
156+
.options-form>legend {
157+
float: none;
158+
width: auto;
159+
padding: 0 .5rem;
160+
font-weight: 700;
161+
}
162+
163+
.float-end {
164+
float: right !important;
165+
}
166+
167+
.hidden {
168+
display: none;
169+
visibility: hidden;
170+
}
171+
172+
.field-media-wrapper {
173+
display: block;
174+
width: 100%;
175+
max-width: calc(50vw - 5rem);
176+
}
177+
178+
.field-media-wrapper .field-media-preview {
179+
width: 100%;
180+
max-width: none;
181+
}
182+
183+
.btn-close {
184+
box-sizing: content-box;
185+
width: 1em;
186+
height: 1em;
187+
padding: .25em;
188+
color: #000;
189+
background: transparent url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath d='M.293.293a1 1 0 011.414 0L8 6.586 14.293.293a1 1 0 111.414 1.414L9.414 8l6.293 6.293a1 1 0 01-1.414 1.414L8 9.414l-6.293 6.293a1 1 0 01-1.414-1.414L6.586 8 .293 1.707a1 1 0 010-1.414z'/%3E%3C/svg%3E") 50%/1em auto no-repeat;
190+
border: 0;
191+
border-radius: .25rem;
192+
opacity: .5;
193+
}
194+
195+
.btn-close:hover {
196+
color: #000;
197+
text-decoration: none;
198+
opacity: .75;
199+
}
200+
201+
.btn-close:focus {
202+
outline: 0;
203+
box-shadow: 0 0 0 .25rem rgba(var(--cassiopeia-color-primary), .25);
204+
opacity: 1;
205+
}
206+
207+
.btn-close.disabled,
208+
.btn-close:disabled {
209+
pointer-events: none;
210+
-webkit-user-select: none;
211+
-moz-user-select: none;
212+
-ms-user-select: none;
213+
user-select: none;
214+
opacity: .25;
215+
}
216+
217+
.btn-close-white {
218+
-webkit-filter: invert(1) grayscale(100%) brightness(200%);
219+
filter: invert(1) grayscale(100%) brightness(200%);
220+
}

‎astroid/astroid-template-one/templateDetails.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<authorUrl>https://www.joomdev.com</authorUrl>
88
<copyright>Copyright (C) 2021 Joomdev, Inc. All rights reserved.</copyright>
99
<license>GNU General Public License bn 2 or later; see LICENSE.txt</license>
10-
<version>1.3.3</version>
10+
<version>1.3.4</version>
1111
<description>TPL_ASTROID_XML_DESCRIPTION</description>
1212
<updateservers>
1313
<server type="extension" name="astroid_framework" priority="1">https://cdn.joomdev.com/updates/astroid_template_one.xml</server>

0 commit comments

Comments
 (0)