Merge pull request #76 from AN0NCER/develop

Fix bugs + parameter Hide Block 'Hero
AN0NCER · Jan 1, 2024 · 1fb2a03 · 1fb2a03
2 parents 9e88a75 + 1fb06a6
commit 1fb2a03
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 14 deletions.
diff --git a/javascript/pages/settings.js b/javascript/pages/settings.js
@@ -80,7 +80,7 @@ const Parameters = [
             },
             {
                 type: 'boolean',
-                param: '',
+                param: 'hidehero',
                 name: 'Скрыть героев',
                 description: 'Позволяет пользователю убирать изображения персонажей для более нейтрального просмотра сайта.'
             },

diff --git a/javascript/pages/watch/mod_resources.js b/javascript/pages/watch/mod_resources.js
@@ -52,7 +52,9 @@ export async function LoadAnime(event = () => { }, logged = false) {
     _setPageMetaTags(_shikimoriData);
 
     await _loadGallery($ID);
-    await _loadHeroes($ID);
+    //Отключить загрузку если в параметрах отключено
+    if (!$PARAMETERS.anime.hidehero)
+        await _loadHeroes($ID);
     await _loadFranchise($ID);
     await _loadSimiliar($ID);
 
@@ -61,7 +63,7 @@ export async function LoadAnime(event = () => { }, logged = false) {
     event();
     ScrollingElements();
     CallEvent("load");
-    
+
     ApiTunime.anime($ID);
 
     function _loadShikimoriData(id) {

diff --git a/javascript/parametrs.js b/javascript/parametrs.js
@@ -8,6 +8,7 @@ const $PARAMETERS = {
     },
     anime: {
         syncdata: true,
+        hidehero: false,
     },
     watch: {
         dubanime: false,

diff --git a/style/css/index.css b/style/css/index.css
@@ -279,6 +279,9 @@ header > .notification > .dot {
 }
 .swiper-treilers .swiper-wrapper .swiper-slide > .controls .wrapper-block-info .block-info .wrapper-details .kind,
 .swiper-treilers .swiper-wrapper .swiper-slide > .controls .wrapper-block-info .block-info .wrapper-details .studio {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
   font-size: 11px;
   color: rgba(255, 255, 255, 0.5);
 }

diff --git a/style/css/watch.css b/style/css/watch.css
@@ -462,18 +462,16 @@ Title block
   color: #fff;
   font-weight: bold;
   font-size: 18px;
+  position: relative;
 }
 .block-title.with-count {
   display: flex;
   justify-content: space-between;
   align-items: center;
 }
 .block-title.with-count .count {
-  background: #98d4fd;
-  padding: 5px 10px;
-  border-radius: 3px;
   font-size: 12px;
-  color: #020202;
+  color: #596271;
 }
 
 .block-title.title-player {
@@ -1126,7 +1124,7 @@ footer .studio span {
   }
 }
 .window-translation .window-content {
-  max-height: calc(100vh - env(safe-area-inset-top));
+  max-height: calc(100dvh - env(safe-area-inset-top));
   overflow-y: hidden;
   overscroll-behavior: contain;
 }

diff --git a/style/index/_trailers.scss b/style/index/_trailers.scss
@@ -113,6 +113,9 @@
 
                             .kind,
                             .studio {
+                                white-space: nowrap;
+                                overflow: hidden;
+                                text-overflow: ellipsis;
                                 font-size: 11px;
                                 color: rgba(255, 255, 255, 0.5);
                             }

diff --git a/style/watch.scss b/style/watch.scss
@@ -551,18 +551,16 @@ Title block
    color: #fff;
    font-weight: bold;
    font-size: 18px;
+   position: relative;
 
    &.with-count {
       display: flex;
       justify-content: space-between;
       align-items: center;
 
       .count {
-         background: #98d4fd;
-         padding: 5px 10px;
-         border-radius: 3px;
          font-size: 12px;
-         color: #020202;
+         color: #596271;
       }
    }
 }

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

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

diff --git a/watch.html b/watch.html
@@ -7,6 +7,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, viewport-fit=cover">
    <meta name="description"
       content="Смотреть аниме онлайн на сайте Tunime. Открой для себя новые миры с Tunime - лучшим сайтом для просмотра аниме!">
+   <meta name="page" content="watch" />
    <title>TUN Аниме</title>
    <link rel="icon" type="image/png" href="/images/icon-web.png" />
    <link rel="stylesheet" href="/style/css/main.css" />