mereged

src/components/Admin.tsx

@@ -16,15 +16,16 @@ const LeftSide = styled.div`
 
 const Wrap = styled.div`
   display: flex;
-  height: calc(100vh - 80px);
+  height: calc(100vh - 120px);
   background-color: #ECEEF4;
+  width:100%;
 `;
 
 
 const Wrapper = styled.div`
-flex:5;
+  flex:12;
   display: flex;
-  height: calc(100vh - 80px);
+  height: calc(100vh - 120px);
   background-color: #ECEEF4;
 `;
 
@@ -42,7 +43,8 @@ const LeftPanelElement = styled.div<LeftPanelElement>`
   padding: 20px;
   cursor: pointer;
   box-shadow: ${({isCurrentTab})=>(isCurrentTab === true ? `inset 0px 0px 26px 0px rgba(0,0,0,0.55)` : "")};
-  border-bottom:1px solid;
+  border-bottom:1px solid #979797;
+  
 `;
 const Icon = styled.img`
   width: 40px;

src/components/App.tsx

@@ -8,9 +8,16 @@ import styled from 'styled-components';
 const Wrapper = styled.div`
   display: flex;
   height: calc(100vh - 80px);
+<<<<<<< HEAD
   background-color: #eceef4;
   padding-top: 20px;
   padding-bottom: 20px;
+=======
+  background-color: #ECEEF4;
+  padding-top:20px;
+  padding-bottom:20px;
+  padding-right:20px;
+>>>>>>> b687b3c014cabbedb9233d5f33e42d461a04a047
 `;
 
 export const App = () => {

src/components/CourseCard.tsx

@@ -55,6 +55,9 @@ const ClassGroupStyled = styled.div`
     cursor: pointer;
     background-color: #9ed3ff;
   }
+  :last-child {
+    border-radius: 0 0 10px 10px;
+}
 `;
 
 interface ExpandIconProps {
@@ -75,28 +78,27 @@ const TypeClass = styled.div`
   position: absolute;
   border-radius: 15px;
   background-color: #00506b;
-  border: 2px solid;
+  border: 2px solid white;
   min-width: 45px;
   top: 5px;
   left: 5px;
   color: white;
-  font-weight: bold;
 `;
-
+  
 const useStyles = makeStyles({
   expanded: {
     maxHeight: '244px',
     overflowY: 'auto',
     '&::-webkit-scrollbar': {
-      width: '0.4em',
+      width: '0.3em',
+      borderStyle:'none',
     },
     '&::-webkit-scrollbar-track': {
-      '-webkit-box-shadow': 'inset 0 0 6px rgba(1,0,0,0.1)',
+      borderRadius: '10px',
     },
     '&::-webkit-scrollbar-thumb': {
       borderRadius: '10px',
-      backgroundColor: '#d4b851',
+      backgroundColor: '#4b4b4b',
-      outline: '1px solid slategrey',
     },
   },
 });

src/components/Dropdown.tsx

@@ -13,17 +13,17 @@ const DropdownContainer = styled.div`
   scroll-snap-type: y mandatory;
   scroll-behavior: smooth;
   ::-webkit-scrollbar-track {
+    background-color: #f2f4f7;
     border-radius: 10px;
-    background-color: #f5f5f5;
   }
   ::-webkit-scrollbar {
-    width: 12px;
+    background-color: #f2f4f7;
-    background-color: #f5f5f5;
+    width: 5px;
+    border-style:none;
   }
   ::-webkit-scrollbar-thumb {
     border-radius: 10px;
-    background-color: black;
+    background-color: #4b4b4b;
-    border: 1px solid;
   }
 `;
 

src/components/Rightbar.tsx

@@ -14,16 +14,14 @@ const RightbarStyled = styled.div`
   overflow-y: scroll;
   ::-webkit-scrollbar-track {
     border-radius: 10px;
-    background-color: #f5f5f5;
   }
   ::-webkit-scrollbar {
-    width: 12px;
+    width: 5px;
-    background-color: #f5f5f5;
+    border-style:none;
   }
   ::-webkit-scrollbar-thumb {
     border-radius: 10px;
-    background-color: black;
+    background-color: #4b4b4b;
-    border: 1px solid;
   }
   background-color: white;
   border-radius: 5px;

src/components/Scheduler.tsx

@@ -80,7 +80,6 @@ export const Scheduler = () => {
   }, []);
 
   return (
-    <>
       <SchedulerWrapper>
         <TableHead>
           {days.map((day, indexCell) =>
@@ -128,6 +127,5 @@ export const Scheduler = () => {
           <SchedulerEvents cellWidth={cellWidth} cellHeight={cellHeight} />
         </TableBody>
       </SchedulerWrapper>
-    </>
   );
 };