Merge pull request #21 from ms-club-sliit/development

Merge Development branch into Main Branch
ms-club-sliit · Nov 27, 2021 · e8c9120 · e8c9120
2 parents e6e8d5f + 7351c4e
commit e8c9120
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 19 deletions.
diff --git a/public/assets/boards/2020/dinuwan.jpg b/public/assets/boards/2020/dinuwan.jpg
diff --git a/src/components/nav_bar/index.tsx b/src/components/nav_bar/index.tsx
@@ -13,7 +13,7 @@ const NavBar: React.FC = () => {
 
   const resizeLogoOnScroll = () => {
     const distanceY = window.pageYOffset || document.documentElement.scrollTop,
-                        shrinkOn: number = 200,
+                        shrinkOn: number = 5,
                         headerEl: any = document.getElementById('header');
 
     if (distanceY > shrinkOn) {

diff --git a/src/pages/board/board-by-year.tsx b/src/pages/board/board-by-year.tsx
@@ -39,7 +39,7 @@ const BoardByYear: React.FC = () => {
         </span>
         <div className="d-flex">
           {boardList.map((board) => (
-            <div className="mb-4">
+            <div className="mb-4" key={board.id}>
               <button
                 type="button"
                 className="button btn text-center"
@@ -54,7 +54,7 @@ const BoardByYear: React.FC = () => {
         <div className="col-md-12">
           <div className="row">
             {boardMemberList.map((member) => (
-              <div className="col d-flex justify-content-center">
+              <div className="col d-flex justify-content-center" key={member.id}>
                 <BoardMemberCard
                   id={member.id}
                   image={member.image}

diff --git a/src/styles/board.scss b/src/styles/board.scss
@@ -206,7 +206,7 @@
   }
 
   @include media('>=smalldesktop', '<desktop') {
-    width: 18rem;
+    width: 15rem;
 
     .link {
       width: 20px;
@@ -217,8 +217,8 @@
     }
 
     .profile-picture {
-      width: 18rem;
-      height: 18rem;
+      width: 15rem;
+      height: 15rem;
     }
 
     .position {
@@ -227,7 +227,7 @@
   }
 
   @include media(">=desktop", '<largedesktop') {
-    width: 20rem;
+    width: 15rem;
 
     .link {
       width: 20px;
@@ -238,8 +238,8 @@
     }
 
     .profile-picture {
-      width: 20rem;
-      height: 20rem;
+      width: 15rem;
+      height: 15rem;
     }
 
     .position {
@@ -248,23 +248,23 @@
   }
 
   @include media('>=largedesktop') {
-    width: 20rem;
+    width: 15rem;
 
     .link {
-      width: 20px;
+      width: 18px;
     }
 
     .name {
-      font-size: 24px;
+      font-size: 20px;
     }
 
     .profile-picture {
-      width: 20rem;
-      height: 20rem;
+      width: 15rem;
+      height: 15rem;
     }
 
     .position {
-      font-size: 20px;
+      font-size: 18px;
     }
   }
 }
diff --git a/src/styles/contactus.scss b/src/styles/contactus.scss
@@ -175,10 +175,6 @@
   }
 }
 
-.contact-us-form {
-  width: 65%;
-}
-
 .contact-us-label-text {
   font-size: 20px;
 }