Merge branch 'DevelopMadara' of https://github.com/danilt2000/LuckyDiamond into DevelopMadara

luckydiamond/src/assets/css/ComponentsStyles/developer.css

@@ -677,6 +677,7 @@
         height: 732px;
         margin-top: 10px;
         margin-left: 1px;
+        /* overflow-y: auto; */
     }
     .bottom_card {
         display: flex;

luckydiamond/src/assets/css/global.css

@@ -210,6 +210,10 @@ button {
     margin: 0.625rem 2.438rem 1.125rem 1.125rem;
 }
 
+.about {
+    grid-area: about;
+}
+
 /* /Profile */
 
 /* Saper */
@@ -235,6 +239,24 @@ button {
     grid-area: crashplayers;
 }
 
+
+.content-grid--about {
+    display: grid;
+    grid-auto-columns: 1fr;
+    grid-template-columns: 0.35fr repeat(5, 1fr) 1fr;
+    grid-template-rows: auto 0fr repeat(4, 1fr);
+    grid-template-areas:
+        "menu header header header header header header"
+        "menu about about about about about chat"
+        "menu about about about about about chat"
+        "menu about about about about about chat"
+        "menu about about about about about chat"
+        "menu about about about about about chat"
+        "menu about about about about about chat";
+    grid-gap: 0.625rem;
+}
+
+
 /* /Crash */
 
 /* Media */

luckydiamond/src/pages/AboutPage.vue

@@ -1,12 +1,14 @@
 <template>
-    <div class="content__grid-profile" >
+  <div class="content-grid--about">
     <aside-bar-component></aside-bar-component>
 
-        
+    <section class="about">
-    
-        <header-component></header-component>
 
     <develop-component></develop-component>
+
+    </section>
+    <header-component></header-component>
+
   </div>
 </template>
 <script>
@@ -18,18 +20,17 @@ export default {
   data() {
     return {
       Object: {
-            bg:'value',
+        bg: "value",
-            nickname: 'value',
+        nickname: "value",
         icons: {},
-            textTacholgy: {'text1': 'text2'}
+        textTacholgy: { text1: "text2" },
-           }
+      },
-        }
+    };
   },
   components: {
     HeaderComponent,
     AsideBarComponent,
-    DevelopComponent    
+    DevelopComponent,
-    }
+  },
-}
+};
-
 </script>