change logo

src/_components/Header/HeaderTS/HeaderTS.js

@@ -9,10 +9,10 @@ function HeaderTS() {
     <div className="logo header-ts">
       <Link to={`/`}>
         <img 
-          src={"/assets/images/logo_TS.png"} 
+          src={"/assets/images/logo_GV.png"} 
           alt={"Logo"} 
         />
-        <span className="flex-1 d-flex align-items-center">Trường THCS Tây Sơn</span>
+        <span className="flex-1 d-flex align-items-center branch-text" >Cô Đặng Thu Hiền</span>
       </Link>
     </div>
   );

src/_components/Header/HeaderTS/headerTS.style.scss

@@ -11,7 +11,13 @@
     display: flex;
     flex-direction: column;
     align-items: center;
-    margin-left: 32px;
+    margin-left: 56px;
+    margin-top: 8px;
+
+    @media screen and (max-height: 800px) {
+      margin-left: 46px;
+      margin-top: -2px;
+    }
 
     @media screen and (max-width: 768px) {
       margin-left: 16px;
@@ -29,12 +35,16 @@
   }
 
   span {
-    font-size: 20px;
+    font-size: 16px;
     font-weight: 700;
     margin-top: 4px;
-    color: #00722e;
+    color: #14375F;
     font-family: 'Barlow-Bold';
 
+    @media screen and (max-height: 800px) {
+      font-size: 14px;
+    }
+
     @media screen and (max-width: 768px) {
       font-size: 12px;
     }

src/_containers/RegisterPage/RegisterPage.js

@@ -183,7 +183,7 @@ function RegisterPage() {
 
   return (
     <div className="bg-register rel">
-      <HeaderCloud />
+      <HeaderTS />
       {statusRegister.type !== "success" ? (
         <>
           <div

src/_containers/RegisterPage/components/AccountAuthentication/AccountAuthentication.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 import { accountAuthenticationMethods } from "./AccountAuthentication.logic";
-import { HeaderCloud } from "../../../../_components/Header";
+import { HeaderCloud, HeaderTS } from "../../../../_components/Header";
 import ModalConfirmOTP from "../../../../_components/Modal/ModalConfirmOTP/ModalConfirmOTP";
 import "./AccountAuthentication.scss";
 import { Link } from "react-router-dom";
@@ -60,7 +60,7 @@ const AccountAuthentication = () => {
 
   return (
     <div className="bg-register rel">
-      <HeaderCloud />
+      <HeaderTS />
       {popupRegisterSuccess &&  <PopUpYesNo message={"Xác thực tài khoản thành công!"} hideButtonNo={true} onClickYes={() => setPopupRegisterSuccess(false)} labelYes={"Đồng ý"}/>}
       <div className="content_1 flex-center-column">
         <div className="flex-center-column container_modal_confirmOTP">

src/_containers/RegisterPage/register.scss

@@ -6,12 +6,15 @@ $bg-apple: #000000;
 $loading-color: #f8f8f8;
 
 .bg-register .logo img {
-  width: 174px;
+  width: 144px;
-  margin: 32px 0 0 32px;
+  margin-top: 32px;
 
   @media screen and (max-height: 800px) {
-    width: 163px;
+    width: 120px;
-    margin: 16px 0 0 16px;
+  }
+
+  @media screen and (max-width: 768px) {
+    width: 96px;
   }
 }