Skip to content

Commit 9cf6f68

Browse files
queadquead
committed
1.9 - Small UI fixes
1 parent cb79c84 commit 9cf6f68

File tree

10 files changed

+57
-15
lines changed

10 files changed

+57
-15
lines changed

‎dist/assets/css/main.css

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,17 @@ a:active {
223223
}
224224
}
225225

226+
@keyframes loading-modal {
227+
0% {
228+
opacity: 0;
229+
top: 60%;
230+
}
231+
100% {
232+
opacity: 1;
233+
top: 50%;
234+
}
235+
}
236+
226237
.loading-bar {
227238
position: fixed;
228239
margin: 0;
@@ -400,6 +411,7 @@ a:active {
400411
.modal-container {
401412
position: absolute;
402413
background-color: var(--c-white);
414+
box-shadow: 0 11px 15px -7px rgba(0, 0, 0, 0.2), 0 24px 38px 3px rgba(0, 0, 0, 0.14), 0 9px 46px 8px rgba(0, 0, 0, 0.12);
403415
color: var(--c-black);
404416
top: 50%;
405417
right: 50%;
@@ -409,7 +421,7 @@ a:active {
409421
text-align: center;
410422
padding-top: 30px;
411423
padding-bottom: 90px;
412-
animation: loading-animation 0.2s 1;
424+
animation: loading-modal 0.2s 1;
413425
}
414426

415427
.modal-container h2 {

‎dist/assets/settings.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
{
99
"name": "Set list for trending",
1010
"value": false,
11-
"visible": false
11+
"visible": true
1212
},
1313
{
1414
"name": "Toggle video",
1515
"value": true,
16-
"visible": false
16+
"visible": true
1717
},
1818
{
1919
"name": "Toggle repeat mode",
2020
"value": true,
21-
"visible": false
21+
"visible": true
2222
}
2323
],
2424
"api_settings": [

‎dist/inline.bundle.js.map

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

‎dist/main.bundle.js

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

‎dist/main.bundle.js.map

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

‎scss/_common.scss

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
100% { opacity: 1; }
1313
}
1414

15+
@keyframes loading-modal {
16+
0% { opacity: 0; top: 60% }
17+
100% { opacity: 1; top: 50%; }
18+
}
19+
1520
.loading-bar {
1621
position: fixed;
1722
margin: 0;
@@ -175,6 +180,7 @@
175180
.modal-container {
176181
position: absolute;
177182
background-color: var(--c-white);
183+
box-shadow: 0 11px 15px -7px rgba(0,0,0,.2), 0 24px 38px 3px rgba(0,0,0,.14), 0 9px 46px 8px rgba(0,0,0,.12);
178184
color: var(--c-black);
179185
top: 50%;
180186
right: 50%;
@@ -184,7 +190,7 @@
184190
text-align: center;
185191
padding-top: 30px;
186192
padding-bottom: 90px;
187-
animation: loading-animation 0.2s 1;
193+
animation: loading-modal 0.2s 1;
188194
h2 {
189195
margin-top: 10px;
190196
font-size: $f-18;

‎src/app/app.component.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export class AppComponent implements OnInit {
1818
currentVideoObject: Array<any> = [];
1919

2020
thumbnails = true;
21-
21+
2222
modal = false;
2323
modalPlaylistItem: number;
2424

@@ -275,15 +275,19 @@ export class AppComponent implements OnInit {
275275
if (int === 0) {
276276
if (this.displayVideoPlayer) {
277277
this.displayVideoPlayer = false;
278+
this._shared.settings.form_settings[2].value = false;
278279
} else {
279280
this.displayVideoPlayer = true;
281+
this._shared.settings.form_settings[2].value = true;
280282
}
281283
}
282284
if (int === 1) {
283285
if (this.repeatMode) {
284286
this.repeatMode = false;
287+
this._shared.settings.form_settings[3].value = false;
285288
} else {
286289
this.repeatMode = true;
290+
this._shared.settings.form_settings[3].value = true;
287291
}
288292
}
289293
if (int === 2) {
@@ -404,17 +408,17 @@ export class AppComponent implements OnInit {
404408
closeModal() {
405409
this.modal = false;
406410
}
407-
411+
408412
showModal(i: number) {
409413
this.modal = true;
410414
this.modalPlaylistItem = i;
411415
}
412-
416+
413417
confirmModal() {
414418
this.removePlaylistItem(this.modalPlaylistItem);
415419
this.modal = false;
416420
}
417-
421+
418422
// ---------------- Related functions ----------------
419423

420424
scrollToBottom() {

‎src/app/components/youtube-search.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,10 @@ export class SearchComponent implements OnInit {
149149
toggleList(int: number) {
150150
if (int === 1) {
151151
this.listGrid = false;
152+
this._shared.settings.form_settings[1].value = false;
152153
} else {
153154
this.listGrid = true;
155+
this._shared.settings.form_settings[1].value = true;
154156
}
155157
}
156158

‎src/assets/css/main.css

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,17 @@ a:active {
223223
}
224224
}
225225

226+
@keyframes loading-modal {
227+
0% {
228+
opacity: 0;
229+
top: 60%;
230+
}
231+
100% {
232+
opacity: 1;
233+
top: 50%;
234+
}
235+
}
236+
226237
.loading-bar {
227238
position: fixed;
228239
margin: 0;
@@ -400,6 +411,7 @@ a:active {
400411
.modal-container {
401412
position: absolute;
402413
background-color: var(--c-white);
414+
box-shadow: 0 11px 15px -7px rgba(0, 0, 0, 0.2), 0 24px 38px 3px rgba(0, 0, 0, 0.14), 0 9px 46px 8px rgba(0, 0, 0, 0.12);
403415
color: var(--c-black);
404416
top: 50%;
405417
right: 50%;
@@ -409,7 +421,7 @@ a:active {
409421
text-align: center;
410422
padding-top: 30px;
411423
padding-bottom: 90px;
412-
animation: loading-animation 0.2s 1;
424+
animation: loading-modal 0.2s 1;
413425
}
414426

415427
.modal-container h2 {

‎src/assets/settings.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
{
99
"name": "Set list for trending",
1010
"value": false,
11-
"visible": false
11+
"visible": true
1212
},
1313
{
1414
"name": "Toggle video",
1515
"value": true,
16-
"visible": false
16+
"visible": true
1717
},
1818
{
1919
"name": "Toggle repeat mode",
2020
"value": true,
21-
"visible": false
21+
"visible": true
2222
}
2323
],
2424
"api_settings": [

0 commit comments

Comments
 (0)