diff --git a/public/components/Loader/Loader.scss b/public/components/Loader/Loader.scss index 23b8159..7642b17 100644 --- a/public/components/Loader/Loader.scss +++ b/public/components/Loader/Loader.scss @@ -1,9 +1,9 @@ @import 'styles/variables.scss'; .loader { - width: 75px; - height: 75px; - border: 10px solid rgba(148, 12, 207, 0.6); + width: 40px; + height: 40px; + border: 5px solid rgba(148, 12, 207, 0.6); border-radius: $border-radius-max; border-left-color: $brand; animation: loader 1.3s linear infinite; @@ -29,3 +29,13 @@ transform: rotate(360deg); } } + +// @include mobileLandscape { +// .loader { +// width: 50px; +// height: 50px; +// border: 7px solid rgba(148, 12, 207, 0.6); +// // Убедитесь, что анимация не переопределяется +// animation: loader 1.3s linear infinite; +// } +// } diff --git a/public/components/UsersList/UsersList.scss b/public/components/UsersList/UsersList.scss index 71c1169..0063539 100644 --- a/public/components/UsersList/UsersList.scss +++ b/public/components/UsersList/UsersList.scss @@ -34,6 +34,7 @@ &_avatar { width: 50px; height: 50px; + border-radius: $border-radius-max; } &_username { diff --git a/public/components/VideoPlayer/VideoPlayer.ts b/public/components/VideoPlayer/VideoPlayer.ts index f96dcb6..0bb4419 100644 --- a/public/components/VideoPlayer/VideoPlayer.ts +++ b/public/components/VideoPlayer/VideoPlayer.ts @@ -294,9 +294,9 @@ export class VideoPlayer { video.addEventListener('ended', this.onVideoEnd.bind(this)); // TODO: проверить на мобилке - if (this.#isModal) { - video.addEventListener('loadeddata', this.hidePlaceholder.bind(this)); - } + // if (this.#isModal) { + video.addEventListener('loadeddata', this.hidePlaceholder.bind(this)); + // } fullOrSmallScreen.addEventListener( 'click', @@ -374,7 +374,7 @@ export class VideoPlayer { // TODO: проверить на мобилке if (!this.#isModal) { - this.hidePlaceholder(); + // this.hidePlaceholder(); if (isTouchDevice() && isTabletOrMobileLandscape()) { const controls = document.querySelector( @@ -796,8 +796,8 @@ export class VideoPlayer { this.#controls.videoWrapper.classList.remove('hidden'); if (this.#isModal) { this.#controls.videoBackButton.classList.remove('video__controls_hidden'); - this.#controls.videoTitle.classList.remove('video__controls_hidden'); } + this.#controls.videoTitle.classList.remove('video__controls_hidden'); this.#controls.videoMobileControls?.classList.remove( 'video__controls_hidden', diff --git a/public/store/MainPageStore.ts b/public/store/MainPageStore.ts index aee86ae..f044366 100644 --- a/public/store/MainPageStore.ts +++ b/public/store/MainPageStore.ts @@ -57,7 +57,9 @@ class MainPageStore { // TODO: Расскомментировать после мержа // await moviePageStore.getLastMoviesRequest(); } - mainPage.render(); + setTimeout(() => { + mainPage.render(); + }, 50); break; default: break;