Skip to content

Commit 8236e9e

Browse files
authored
Merge pull request #16 from NepTechTribe/shreesha
About Section Added
2 parents 0f2a5b9 + b775857 commit 8236e9e

File tree

10 files changed

+38
-116
lines changed

10 files changed

+38
-116
lines changed

src/Components/landingpage/about.jsx

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,38 @@
11
import Title from "./title";
2+
import Container from 'react-bootstrap/Container';
3+
import Row from 'react-bootstrap/Row';
4+
import Col from 'react-bootstrap/Col';
5+
import img from '../../assets/LandingPage/about.jpg';
26

37
function AboutUs(){
48
return(
59
<>
6-
<Title title={"About NEPTECH Tribe"} head={"About Us"} />
10+
<Container>
11+
<Title title={"About NEPTECH Tribe"} head={"Who Are We "} />
12+
<Row>
13+
<Col md={6}>
14+
<img src={img} alt="About Image" />
15+
</Col>
16+
<Col md={6}>
17+
<p><b> NepTech Tribe </b> is a non-profit organization that unites tech enthusiasts of all ages to share knowledge and foster innovation. We offer events and activities to enhance skills and encourage collaboration, aiming to drive technological progress and create a supportive community.
18+
</p>
19+
<h3> Our Mission </h3>
20+
<p>To unite tech enthusiasts of all ages for knowledge sharing, collaboration, and skill development in a supportive community
21+
</p>
22+
<h3>Our Vision</h3>
23+
<p>To build a global network where all generations drive tech advancement and share diverse perspectives.</p>
24+
</Col>
25+
</Row>
26+
<Row>
27+
<h3>Our Values</h3>
28+
<Col md={4}>
29+
</Col>
30+
<Col md={4}>
31+
</Col>
32+
<Col md={4}>
33+
</Col>
34+
</Row>
35+
</Container>
736
</>
837
)
938
}

src/Styles/App.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@import 'bootstrap/dist/css/bootstrap.min.css';
22
@import url("https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap");
33
@import url("https://fonts.googleapis.com/css2?family=Lobster+Two:ital,wght@0,400;0,700;1,400;1,700&display=swap");
4+
@import url("https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,100;0,300;0,400;0,700;0,900;1,100;1,300;1,400;1,700;1,900&display=swap");
45
.Navbar {
56
position: fixed;
67
width: 100%;
@@ -98,6 +99,6 @@
9899
.Title-head {
99100
font-size: 2.5rem;
100101
color: black;
101-
font-family: "Poppins", sans-serif;
102+
font-family: "Lato", sans-serif;
102103
font-weight: 500;
103104
}/*# sourceMappingURL=App.css.map */

src/Styles/App.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Styles/App.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
@import 'bootstrap/dist/css/bootstrap.min.css';
22
@import url('https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap');
33
@import url('https://fonts.googleapis.com/css2?family=Lobster+Two:ital,wght@0,400;0,700;1,400;1,700&display=swap');
4+
@import url('https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,100;0,300;0,400;0,700;0,900;1,100;1,300;1,400;1,700;1,900&display=swap');
5+
6+
47

58
$font : "Poppins", sans-serif;
69
$lobster : "Lobster Two", sans-serif;
10+
$lato : "Lato", sans-serif;
711

812
@import 'LandingPage/Index';
913
@import 'AboutPage/Index';

src/Styles/LandingPage/_Title.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
&-head{
1010
font-size: 2.5rem;
1111
color: black;
12-
font-family: $font;
12+
font-family: $lato;
1313
font-weight: 500;
1414
}
1515
}

src/assets/Components/About/About.css

Lines changed: 0 additions & 63 deletions
This file was deleted.

src/assets/Components/About/About.jsx

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/assets/Components/Title/Title.css

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/assets/Components/Title/Title.jsx

Lines changed: 0 additions & 9 deletions
This file was deleted.
File renamed without changes.

0 commit comments

Comments
 (0)