Merge pull request #32 from xeptagondev/main

Main
undp · Dec 8, 2024 · e765a82 · e765a82
2 parents d6aeeb5 + a1aedfe
commit e765a82
Show file tree

Hide file tree

Showing 10 changed files with 672 additions and 298 deletions.
diff --git a/web/src/Components/Footer/layout.footer.tsx b/web/src/Components/Footer/layout.footer.tsx
@@ -17,7 +17,7 @@ const LayoutFooter = () => {
             </div>
             <div>
               <div style={{ display: 'flex' }}>
-                <div className="title">{'TRANSPARENCY'}</div>
+                <div className="title">{'NDC TRANSPARENCY'}</div>
                 <div className="title-sub">{'SYSTEM'}</div>
               </div>
               <div className="footer-country-name">

diff --git a/web/src/Components/Layout/infoLayout.tsx b/web/src/Components/Layout/infoLayout.tsx
@@ -18,7 +18,7 @@ const InfoLayout = () => {
         </div>
         <div>
           <div style={{ display: 'flex' }}>
-            <div className="title">{'TRANSPARENCY'}</div>
+            <div className="title">{'NDC TRANSPARENCY'}</div>
             <div className="title-sub">{'SYSTEM'}</div>
           </div>
           <div className="country-name">{process.env.REACT_APP_COUNTRY_NAME || 'CountryX'}</div>

diff --git a/web/src/Components/Sider/layout.sider.scss b/web/src/Components/Sider/layout.sider.scss
@@ -12,7 +12,7 @@
   .country-name {
     font-size: 0.65rem;
     color: $logo-text-color;
-    margin-top: -5px;
+    margin-top: -2px;
     font-family: 'MuseoSans';
   }
 
@@ -46,24 +46,30 @@
       padding-left: 20px;
       cursor: pointer;
 
-      .title {
-        font-family: 'MuseoSans';
-        font-size: 14px;
-        color: $logo-text-color;
-        font-weight: 700;
-        margin-right: 5px;
-      }
+      .sider-logo-system-name {
+        // display: flex;
+        // flex-direction: column;
+
+        .title {
+          font-family: 'MuseoSans';
+          font-size: 13px;
+          color: $logo-text-color;
+          font-weight: 700;
+          margin-right: 5px;
+        }
 
-      .title-sub {
-        font-weight: 100 !important;
-        font-family: 'MuseoSans';
-        font-size: 14px;
-        color: $logo-text-color;
+        .title-sub {
+          font-weight: 100 !important;
+          font-family: 'MuseoSans';
+          font-size: 12px;
+          color: $logo-text-color;
+          margin-top: -5px;
+        }
       }
 
       .logo {
-        height: 52px;
-        width: 80px;
+        height: 60px;
+        width: 51px;
 
         img {
           object-fit: cover;
@@ -76,7 +82,6 @@
     }
 
     .sider-menu-container {
-
       overflow-y: auto;
       max-height: 80vh;
       padding-top: 10px;
@@ -92,19 +97,18 @@
       &::-webkit-scrollbar {
         width: 8px;
       }
-      
+
       &::-webkit-scrollbar-track {
         background: #f0e9fd;
       }
-      
+
       &::-webkit-scrollbar-thumb {
         background: #d5d0dd;
       }
-      
+
       &::-webkit-scrollbar-thumb:hover {
         cursor: pointer;
       }
     }
-
   }
 }
diff --git a/web/src/Components/Sider/layout.sider.tsx b/web/src/Components/Sider/layout.sider.tsx
@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import { Menu, Layout, MenuProps } from 'antd';
+import { Menu, Layout, MenuProps, Row } from 'antd';
 import sliderLogo from '../../Assets/Images/mrvlogo.svg';
 import { useNavigate } from 'react-router-dom';
 import './layout.sider.scss';
@@ -83,9 +83,13 @@ const LayoutSider = (props: LayoutSiderProps) => {
           </div>
           {!collapsed && (
             <div>
-              <div style={{ display: 'flex' }}>
-                <div className="title">{collapsed ? '' : 'TRANSPARENCY'}</div>
-                <div className="title-sub">{collapsed ? '' : 'SYSTEM'}</div>
+              <div className="sider-logo-system-name">
+                <Row>
+                  <div className="title">{collapsed ? '' : 'NDC TRANSPARENCY'}</div>
+                </Row>
+                <Row>
+                  <div className="title-sub">{collapsed ? '' : 'SYSTEM'}</div>
+                </Row>
               </div>
               <div className="country-name">{process.env.REACT_APP_COUNTRY_NAME || 'CountryX'}</div>
             </div>

diff --git a/web/src/Components/logo/transparencyLogo.tsx b/web/src/Components/logo/transparencyLogo.tsx
@@ -21,10 +21,10 @@ const TransparencyLogo: React.FC = () => {
         </Col>
         <Col span={18} style={{ marginLeft: '20px' }}>
           <Row className="logo-text">
-            <Col span={14}>
-              <div className="bold-logo-title">{'TRANSPARENCY'}</div>
+            <Col span={18}>
+              <div className="bold-logo-title">{'NDC TRANSPARENCY'}</div>
             </Col>
-            <Col span={10}>
+            <Col span={6}>
               <div className="logo-title">{'SYSTEM'}</div>
             </Col>
             <Col span={24}>