Skip to content

Commit 3a0dfa3

Browse files
authored
Merge pull request #90 from NumanAnees/fix/sticky-navbar
sticky navbar
2 parents a80dae3 + 5e0132f commit 3a0dfa3

File tree

14 files changed

+31
-11
lines changed

14 files changed

+31
-11
lines changed

src/components/Navigation.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ function Navigation() {
1313
bg='light'
1414
variant='light'
1515
style={{ paddingLeft: '30px', paddingRight: '30px' }}
16+
fixed="top"
1617
>
1718
<Navbar.Brand href='#home'>
1819
<img src={Logo} alt='' srcSet='' height={81} width={150} />

src/pages/Contact.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { ImTwitter, ImMail, ImGithub } from 'react-icons/im';
66
import { FaGitter } from 'react-icons/fa';
77

88
const Contact = () => (
9-
<Container>
9+
<Container className='contact-padding'>
1010
<h1>Contact Us</h1>
1111
<p>Ideas? Comments? Critiques? Want to help out? Here’s how to get in contact:</p>
1212
<Row className='contact-card-one'>

src/pages/Home.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import React from 'react';
22
import Header from '../components/Header';
33
import LandingSection from '../components/LandingSection';
4+
import "../styles/Header.css"
45

56
function Home() {
67
return (
7-
<>
8-
<Header />
8+
<div className='header-padding'>
9+
<Header />
910
<LandingSection />
10-
</>
11+
</div>
1112
);
1213
}
1314

src/pages/Journal.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
/* eslint-disable no-unused-vars */
33
import React from 'react';
44
import { Col, Row, Container, Table } from 'react-bootstrap';
5+
import "../styles/Journal.css"
56

67
import AddJournal from '../components/AddJournal';
78

89
const Journal = () => (
9-
<Container>
10+
<Container className='journal-padding'>
1011
<h1>Journals</h1>
1112
<AddJournal />
1213
</Container>

src/pages/Login.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class Login extends React.Component {
6060

6161
render() {
6262
return (
63-
<Row>
63+
<Row className='login-padding'>
6464
<Col md={4} />
6565
<Col md={4}>
6666
<Form className='login-form'>

src/pages/Manifesto.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { ImTwitter, ImMail, ImGithub } from 'react-icons/im';
1414

1515
const Manifesto = () => (
1616
<Container>
17-
<Row className='manifesto-header'>
17+
<Row className='manifesto-header manifesto-padding'>
1818
<Col xs={12} sm={12} md={3}>
1919
<Image src={StandingImg} height={220} />
2020
</Col>

src/pages/SignUp.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* eslint-disable react/function-component-definition */
22
import { React, useState } from 'react';
33
import { Row, Col, Form, Button } from 'react-bootstrap';
4+
import "../styles/Signup.css"
45

56
const SignUp = () => {
67
const [details, setDetails] = useState({
@@ -22,7 +23,7 @@ const SignUp = () => {
2223
};
2324

2425
return (
25-
<Row>
26+
<Row className='signup-padding'>
2627
<Col md={4} />
2728
<Col md={4}>
2829
<Form className='login-form' onSubmit={handleSubmit}>

src/styles/Contact.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@
1111
.contact-form {
1212
margin-bottom: 4em;
1313
}
14+
.contact-padding{
15+
padding-top: 8.7em;
16+
}

src/styles/Header.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,6 @@
2424
margin-top: 20em;
2525
margin-left: calc(((100% - 270px) / 3) * 2);
2626
}
27+
.header-padding{
28+
padding-top: 6.7em;
29+
}

src/styles/Journal.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.journal-padding{
2+
padding-top: 7em;
3+
}

0 commit comments

Comments
 (0)