Merge pull request #9 from ireneelizabethsabu/order

Layout fixed
ireneelizabethsabu · Sep 5, 2021 · e684949 · e684949
2 parents 8556085 + a835242
commit e684949
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/src/components/CV/cv.js b/src/components/CV/cv.js
@@ -1,7 +1,7 @@
 import React,{useState,useEffect} from "react";
-import { Container } from "react-bootstrap";
+import { Col, Container,Row } from "react-bootstrap";
 import { useParams } from "react-router-dom";
-import { getUsers ,getRepos } from "../../api";
+import { getUsers } from "../../api";
 import Header from "../Header/header";
 import Language from "../Languages/Language";
 import Organisation from '../Organisation/Organisation'
@@ -22,9 +22,15 @@ const CV=() => {
     return(
         data && <Container fluid className="my-3">
             <Header data={data}/>
-            <Language id={id}/>
-            <Organisation id={id}/>
-            <Projects id={id}/>
+            <Row>
+                <Col>
+                    <Organisation id={id}/>
+                    <Language id={id}/>
+                </Col>
+                <Col>
+                    <Projects id={id}/>
+                </Col>
+            </Row>            
         </Container>
     )
 }

diff --git a/src/components/Languages/Language.js b/src/components/Languages/Language.js
@@ -5,7 +5,7 @@ const Language = () => {
   const [skills, setSkills] = useState(['java','javascript','obj','ruby','c++','html','vue','typescript','coffeescript','php']);
 
   return (
-    <Col xs={6}>
+    <Col>
       <div className="font_m mb-3">SKILLS</div>
       <Row >
       {skills && skills.map((skill, index) => (

diff --git a/src/components/Organisation/Organisation.js b/src/components/Organisation/Organisation.js
@@ -19,11 +19,11 @@ const Organisation = ({id}) => {
       <div className="font_m mb-3">
         ORGANISATIONS{" "}
       </div>
-      <Row className="my-4">
+      <Row className="my-4" sm={8} >
             {org && (org.map((element,index) => 
-                <Col key={index} xs="2">
+                <Col key={index}>
                     <div className="d-flex justify-content-center">
-                      <Image src={element.avatar_url || ''} width="90px" height="90px" roundedCircle />
+                      <Image src={element.avatar_url || ''} width="50" height="50" roundedCircle />
                     </div>
                     <div className="text-center my-2">{element.login.charAt(0).toUpperCase() + element.login.slice(1)}</div>
                 </Col>