Merge pull request #74 from AN0NCER/develop

Develop
AN0NCER · Nov 28, 2023 · e9e177d · e9e177d
2 parents b23fb55 + caaf971
commit e9e177d
Show file tree

Hide file tree

Showing 15 changed files with 67 additions and 10 deletions.
diff --git a/javascript/pages/user.js b/javascript/pages/user.js
@@ -210,5 +210,5 @@ function SorttUserRates(resource) {
 * @returns Возваращет готовый html картки аниме
 */
 function GenerateCardHtml(response, score) {
-  return `<div class="card-content"><img src="https://moe.shikimori.me/${response.image.original}"><div class="title"><span>${response.russian}</span></div>${score > 0 ? `<div class="my-score"><svg width="7" height="6" viewBox="0 0 7 6" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M4.19916 0.210914C4.13607 0.0820221 4.00275 0 3.85634 0C3.70993 0 3.5778 0.0820221 3.51352 0.210914L2.74813 1.76113L1.0388 2.00954C0.89596 2.03063 0.776925 2.12906 0.732883 2.26381C0.68884 2.39856 0.72455 2.54737 0.82692 2.64697L2.06726 3.85504L1.77443 5.56227C1.75063 5.70288 1.81014 5.84583 1.92799 5.92902C2.04583 6.01222 2.20177 6.02276 2.33032 5.95597L3.85753 5.15333L5.38474 5.95597C5.5133 6.02276 5.66923 6.01339 5.78708 5.92902C5.90492 5.84466 5.96444 5.70288 5.94063 5.56227L5.64662 3.85504L6.88696 2.64697C6.98933 2.54737 7.02623 2.39856 6.98099 2.26381C6.93576 2.12906 6.81792 2.03063 6.67507 2.00954L4.96455 1.76113L4.19916 0.210914Z" fill="white"/></svg>${score}</div>` : ""}</div><div class="card-information"><div class="year">${new Date(response.aired_on).getFullYear()}</div><div class="score"><svg width="8" height="8" viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M4.73196 0.745728C4.65834 0.595337 4.50279 0.499634 4.33196 0.499634C4.16112 0.499634 4.00696 0.595337 3.93196 0.745728L3.0389 2.55452L1.04446 2.84436C0.877789 2.86897 0.7389 2.98381 0.687511 3.14104C0.636122 3.29827 0.677789 3.4719 0.797233 3.58811L2.24446 4.99768L1.90279 6.98967C1.87501 7.15374 1.94446 7.32053 2.08196 7.4176C2.21946 7.51467 2.4014 7.52698 2.5514 7.44905L4.33334 6.51252L6.11529 7.44905C6.26529 7.52698 6.44723 7.51604 6.58473 7.4176C6.72223 7.31917 6.79168 7.15374 6.7639 6.98967L6.42084 4.99768L7.86807 3.58811C7.98751 3.4719 8.03057 3.29827 7.97779 3.14104C7.92501 2.98381 7.78751 2.86897 7.62084 2.84436L5.62501 2.55452L4.73196 0.745728Z" fill="#FFE600"/></svg>${response.score}</div></div>`;
+  return `<div class="card-content"><img src="https://moe.shikimori.me/${response.image.original}"><div class="title"><span>${response.russian}</span></div>${score > 0 ? `<div class="my-score">${score}</div>` : ""}</div><div class="card-information"><div class="year">${new Date(response.aired_on).getFullYear()}</div><div class="score"><svg width="8" height="8" viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M4.73196 0.745728C4.65834 0.595337 4.50279 0.499634 4.33196 0.499634C4.16112 0.499634 4.00696 0.595337 3.93196 0.745728L3.0389 2.55452L1.04446 2.84436C0.877789 2.86897 0.7389 2.98381 0.687511 3.14104C0.636122 3.29827 0.677789 3.4719 0.797233 3.58811L2.24446 4.99768L1.90279 6.98967C1.87501 7.15374 1.94446 7.32053 2.08196 7.4176C2.21946 7.51467 2.4014 7.52698 2.5514 7.44905L4.33334 6.51252L6.11529 7.44905C6.26529 7.52698 6.44723 7.51604 6.58473 7.4176C6.72223 7.31917 6.79168 7.15374 6.7639 6.98967L6.42084 4.99768L7.86807 3.58811C7.98751 3.4719 8.03057 3.29827 7.97779 3.14104C7.92501 2.98381 7.78751 2.86897 7.62084 2.84436L5.62501 2.55452L4.73196 0.745728Z" fill="#FFE600"/></svg>${response.score}</div></div>`;
 }
diff --git a/javascript/pages/watch/mod_download.js b/javascript/pages/watch/mod_download.js
@@ -337,7 +337,7 @@ const WindowDownload = {
         });
 
         $('.bar-download > .window-close').on('click', function () {
-            _windowDownload.hide();
+            WindowDownload.hide();
         });
     },
 
@@ -350,10 +350,12 @@ const WindowDownload = {
         _data.name = data.title_orig;
         _data.link = data.link;
         _data.translation = data.translation.title;
+        $("body").addClass("loading");
     },
 
     hide: function () {
-
+        _windowDownload.hide();
+        $("body").removeClass("loading");
     },
 
     verif: function () {

diff --git a/style/_cards.scss b/style/_cards.scss
@@ -62,9 +62,14 @@
             justify-content: center;
             align-items: center;
             gap: 3px;
-            color: #FFFFFF;
+            color: #fff;
             font-family: 'Nova Square';
             font-size: 12px;
+            z-index: 5;
+            svg{
+                fill: #fff;
+                display: none;
+            }
         }
     }
 

diff --git a/style/_windowed.scss b/style/_windowed.scss
@@ -59,6 +59,7 @@
         left: 0;
         bottom: 0;
         flex-direction: column;
+        overscroll-behavior: contain;
         overflow-y: auto;
         transition: .3s ease-in-out;
         transform: translateX(100%);

diff --git a/style/css/index.css b/style/css/index.css
@@ -1027,9 +1027,14 @@ body.menuver[data-orientation="90"] .interactive-menu .user-interactive .triangl
   justify-content: center;
   align-items: center;
   gap: 3px;
-  color: #FFFFFF;
+  color: #fff;
   font-family: "Nova Square";
   font-size: 12px;
+  z-index: 5;
+}
+.card-anime .card-content .my-score svg {
+  fill: #fff;
+  display: none;
 }
 .card-anime .card-information {
   margin-top: 10px;
@@ -1142,6 +1147,7 @@ body.menuver[data-orientation="90"] .interactive-menu .user-interactive .triangl
   left: 0;
   bottom: 0;
   flex-direction: column;
+  overscroll-behavior: contain;
   overflow-y: auto;
   transition: 0.3s ease-in-out;
   transform: translateX(100%);
@@ -1293,6 +1299,7 @@ body.menuver[data-orientation="90"] .interactive-menu .user-interactive .triangl
 
 .content-notify .content-wraper {
   grid-template-rows: auto 1fr;
+  overscroll-behavior: contain;
   gap: 10px;
 }
 .content-notify .content-wraper .title-content {

diff --git a/style/css/list.css b/style/css/list.css
@@ -496,9 +496,14 @@ body.menuver[data-orientation="90"] .interactive-menu .user-interactive .triangl
   justify-content: center;
   align-items: center;
   gap: 3px;
-  color: #FFFFFF;
+  color: #fff;
   font-family: "Nova Square";
   font-size: 12px;
+  z-index: 5;
+}
+.card-anime .card-content .my-score svg {
+  fill: #fff;
+  display: none;
 }
 .card-anime .card-information {
   margin-top: 10px;

diff --git a/style/css/search.css b/style/css/search.css
@@ -1,3 +1,7 @@
+html, body {
+  scrollbar-gutter: stable;
+}
+
 body {
   background: #101318;
   -webkit-text-size-adjust: none;
@@ -782,9 +786,14 @@ body.menuver[data-orientation="90"] .interactive-menu .user-interactive .triangl
   justify-content: center;
   align-items: center;
   gap: 3px;
-  color: #FFFFFF;
+  color: #fff;
   font-family: "Nova Square";
   font-size: 12px;
+  z-index: 5;
+}
+.card-anime .card-content .my-score svg {
+  fill: #fff;
+  display: none;
 }
 .card-anime .card-information {
   margin-top: 10px;
@@ -897,6 +906,7 @@ body.menuver[data-orientation="90"] .interactive-menu .user-interactive .triangl
   left: 0;
   bottom: 0;
   flex-direction: column;
+  overscroll-behavior: contain;
   overflow-y: auto;
   transition: 0.3s ease-in-out;
   transform: translateX(100%);

diff --git a/style/css/settings.css b/style/css/settings.css
@@ -638,6 +638,7 @@ body.menuver[data-orientation="90"] .interactive-menu .user-interactive .triangl
   left: 0;
   bottom: 0;
   flex-direction: column;
+  overscroll-behavior: contain;
   overflow-y: auto;
   transition: 0.3s ease-in-out;
   transform: translateX(100%);

diff --git a/style/css/user.css b/style/css/user.css
@@ -680,9 +680,14 @@ body.menuver[data-orientation="90"] .interactive-menu .user-interactive .triangl
   justify-content: center;
   align-items: center;
   gap: 3px;
-  color: #FFFFFF;
+  color: #fff;
   font-family: "Nova Square";
   font-size: 12px;
+  z-index: 5;
+}
+.card-anime .card-content .my-score svg {
+  fill: #fff;
+  display: none;
 }
 .card-anime .card-information {
   margin-top: 10px;

diff --git a/style/css/watch.css b/style/css/watch.css
@@ -1,4 +1,8 @@
 @charset "UTF-8";
+html, body {
+  scrollbar-gutter: stable;
+}
+
 body {
   background: #101318;
   overflow-x: hidden;
@@ -931,9 +935,14 @@ footer .studio span {
   justify-content: center;
   align-items: center;
   gap: 3px;
-  color: #FFFFFF;
+  color: #fff;
   font-family: "Nova Square";
   font-size: 12px;
+  z-index: 5;
+}
+.card-anime .card-content .my-score svg {
+  fill: #fff;
+  display: none;
 }
 .card-anime .card-information {
   margin-top: 10px;
@@ -1046,6 +1055,7 @@ footer .studio span {
   left: 0;
   bottom: 0;
   flex-direction: column;
+  overscroll-behavior: contain;
   overflow-y: auto;
   transition: 0.3s ease-in-out;
   transform: translateX(100%);
@@ -1102,6 +1112,7 @@ footer .studio span {
 .window-translation .window-content {
   max-height: calc(100vh - env(safe-area-inset-top));
   overflow-y: hidden;
+  overscroll-behavior: contain;
 }
 .window-translation .window-content .content-wraper {
   display: grid;

diff --git a/style/search.scss b/style/search.scss
@@ -1,5 +1,9 @@
 $bg: #101318;
 
+html, body{
+    scrollbar-gutter: stable;
+ }
+
 body {
     background: $bg;
     -webkit-text-size-adjust: none;

diff --git a/style/watch.scss b/style/watch.scss
@@ -1,5 +1,9 @@
 $bg: #101318;
 
+html, body{
+   scrollbar-gutter: stable;
+}
+
 body {
    background: $bg;
    overflow-x: hidden;

diff --git a/style/window/_notify.scss b/style/window/_notify.scss
@@ -1,6 +1,7 @@
 .content-notify {
     .content-wraper {
         grid-template-rows: auto 1fr;
+        overscroll-behavior: contain;
         gap: 10px;
 
         .title-content {

diff --git a/style/window/_translation.scss b/style/window/_translation.scss
@@ -2,6 +2,7 @@
     .window-content {
         max-height: calc(100vh - env(safe-area-inset-top));
         overflow-y: hidden;
+        overscroll-behavior: contain;
 
         .content-wraper {
             display: grid;

diff --git a/sw.js b/sw.js
@@ -1,4 +1,4 @@
-var version = '117';
+var version = '118';
 var cacheName = 'pwa-tunime-v' + version;
 var appShellFilesToCache = [
     // Директория: /images/icons