Поправил стили тут и там

Timur233 · Nov 24, 2024 · 2d83f4a · 2d83f4a
1 parent 8a83a16
commit 2d83f4a
Show file tree

Hide file tree

Showing 8 changed files with 94 additions and 80 deletions.
diff --git a/packages/client/src/components/common/Reaction/Reaction.scss b/packages/client/src/components/common/Reaction/Reaction.scss
@@ -1,4 +1,4 @@
-@import "../../../scss/vars.scss";
+@import '../../../scss/vars.scss';
 
 @keyframes fadeIn {
   from {

diff --git a/packages/client/src/components/ui/OauthLinks/OauthLinks.scss b/packages/client/src/components/ui/OauthLinks/OauthLinks.scss
@@ -1,13 +1,13 @@
 .oauth-buttons {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 12px;
+
+  &__item {
     display: flex;
     align-items: center;
-    justify-content: center;
-    margin-top: 12px;
-
-    &__item {
-        display: flex;
-        align-items: center;
-        border-radius: 8px;
-        cursor: pointer;
-    }
-}
+    border-radius: 8px;
+    cursor: pointer;
+  }
+}
diff --git a/packages/client/src/layouts/PublicLayout/PublicLayout.scss b/packages/client/src/layouts/PublicLayout/PublicLayout.scss
@@ -10,5 +10,6 @@
   &__body {
     flex: 1 1 100%;
     padding-top: $layout_body-m-top;
+    padding-bottom: calc($layout_body-m-top + $layout_body-m-top);
   }
 }
diff --git a/packages/client/src/pages/Game/Game.scss b/packages/client/src/pages/Game/Game.scss
@@ -10,6 +10,8 @@
 $border-color: #70842f;
 
 .game-page {
+  padding-bottom: 80px;
+
   &__container {
     margin: 0 auto;
     max-width: 1400px !important;

diff --git a/packages/client/src/pages/Leaderboard/components/User/User.scss b/packages/client/src/pages/Leaderboard/components/User/User.scss
@@ -2,9 +2,11 @@
 
 // Константы для медалей
 $medal-colors: (
-  1: #ffd700, // Gold
-  2: #c0c0c0, // Silver
-  3: #cd7f32  // Bronze
+  1: #ffd700,
+  // Gold
+  2: #c0c0c0,
+  // Silver
+  3: #cd7f32 // Bronze,
 );
 
 $c_item-border-main-color: #9d9b9b;
@@ -15,14 +17,22 @@ $c_item-border-secondary-color: #474747;
     &__item-wrapper {
       position: relative;
       border-radius: 16px;
-      background: linear-gradient(90deg, $c_item-border-main-color 52.5%, $c_item-border-secondary-color 100%);
+      background: linear-gradient(
+        90deg,
+        $c_item-border-main-color 52.5%,
+        $c_item-border-secondary-color 100%
+      );
       margin: 5px 0;
       padding: 2px;
 
       // Медальные рамки
       @each $rank, $color in $medal-colors {
         &__rank-#{$rank} {
-          background: linear-gradient(90deg, $color 52.5%, darken($color, 20%) 100%);
+          background: linear-gradient(
+            90deg,
+            $color 52.5%,
+            darken($color, 20%) 100%
+          );
         }
       }
     }
@@ -124,4 +134,4 @@ $c_item-border-secondary-color: #474747;
   &__load-more {
     margin: 48px auto 0 auto;
   }
-}
+}
diff --git a/packages/client/src/pages/Profile/Profile.scss b/packages/client/src/pages/Profile/Profile.scss
@@ -36,6 +36,7 @@
     align-items: center;
     min-height: 100vh;
     box-sizing: border-box;
+    padding-bottom: 40px;
 
     &__title {
       margin-bottom: 48px;

diff --git a/packages/client/src/scss/styles.scss b/packages/client/src/scss/styles.scss
@@ -3,4 +3,4 @@
 @import './base.scss';
 @import './grid-system.scss';
 
-@import './themes/christmas.scss';
+@import './themes/christmas.scss';
diff --git a/packages/client/src/scss/themes/christmas.scss b/packages/client/src/scss/themes/christmas.scss
@@ -1,75 +1,75 @@
 .custom-theme__christmas {
-    .main-nav {
-        position: relative;
+  .main-nav {
+    position: relative;
 
-        &:after {
-            content: '';
-            position: absolute;
-            left: 0;
-            right: 0;
-            bottom: -8px;
-            height: 40px;
-            background: url('@/assets/images/themes/christmas/garland.png') repeat-x;
-            background-size: contain;
-        }
+    &:after {
+      content: '';
+      position: absolute;
+      left: 0;
+      right: 0;
+      bottom: -8px;
+      height: 40px;
+      background: url('@/assets/images/themes/christmas/garland.png') repeat-x;
+      background-size: contain;
     }
-
-    .logo-block {
-        position: relative;
+  }
 
-        &__image {
-            filter: grayscale(1);
-        }
+  .logo-block {
+    position: relative;
 
-        &::before {
-            content: '';
-            position: absolute;
-            z-index: 1;
-            left: 16px;
-            top: 4px;
-            width: 44px;
-            height: 32px;
-            background: url('@/assets/images/themes/christmas/head.png');
-            background-size: contain;
-            background-repeat: no-repeat;
-        }
+    &__image {
+      filter: grayscale(1);
     }
-
-    .custom-page-title__content {
-        position: relative;
-        overflow: hidden;
-        z-index: 1;
-        background-image: url("@/assets/images/themes/christmas/titlebar__bg.jpg");
-        background-size: cover;
 
-        &::before {
-            content: '';
-            position: absolute;
-            inset: 0;
-            background: rgba(0, 0, 0, 0.5);
-            z-index: -1;
-        }
+    &::before {
+      content: '';
+      position: absolute;
+      z-index: 1;
+      left: 16px;
+      top: 4px;
+      width: 44px;
+      height: 32px;
+      background: url('@/assets/images/themes/christmas/head.png');
+      background-size: contain;
+      background-repeat: no-repeat;
     }
+  }
 
-    .preloader__road {
-        background-image: url("@/assets/images/themes/christmas/christmas-ground.png");
+  .custom-page-title__content {
+    position: relative;
+    overflow: hidden;
+    z-index: 1;
+    background-image: url('@/assets/images/themes/christmas/titlebar__bg.jpg');
+    background-size: cover;
+
+    &::before {
+      content: '';
+      position: absolute;
+      inset: 0;
+      background: rgba(0, 0, 0, 0.5);
+      z-index: -1;
     }
+  }
+
+  .preloader__road {
+    background-image: url('@/assets/images/themes/christmas/christmas-ground.png');
+  }
 
-    .custom-button{
-        position: relative;
-        z-index: 1;
+  .custom-button {
+    position: relative;
+    z-index: 1;
 
-        &::before {
-            content: '';
-            position: absolute;
-            inset: 0;
-            background-image: url("@/assets/images/themes/christmas/snow.png");
-            background-position: -60% 24%;
-            background-size: 60%;
-            background-repeat: no-repeat;
-            z-index: -1;
-            border-radius: 6px;
-            opacity: 0.3;
-        }
+    &::before {
+      content: '';
+      position: absolute;
+      inset: 0;
+      background-image: url('@/assets/images/themes/christmas/snow.png');
+      background-position: -60% 24%;
+      background-size: 60%;
+      background-repeat: no-repeat;
+      z-index: -1;
+      border-radius: 6px;
+      opacity: 0.3;
     }
-}
+  }
+}