Skip to content

Commit 1e5706f

Browse files
NumanAneesNumanAnees
committed
Merge branch 'development' of https://github.com/codeisscience/journal-policy-tracker-frontend into feature/Alert
2 parents 6a31316 + 91e88d7 commit 1e5706f

File tree

9 files changed

+203
-24300
lines changed

9 files changed

+203
-24300
lines changed

‎package-lock.json‎

Lines changed: 84 additions & 24256 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/components/AddJournal.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,8 @@ function AddJournal() {
6969

7070
return (
7171
<Row>
72-
<Col md={4} />
73-
<Col md={4}>
74-
<Form className='login-form' onSubmit={handleSubmit}>
72+
<Col className='m-auto'>
73+
<Form className='login-form responsive' onSubmit={handleSubmit}>
7574
<Form.Group className='mb-3' controlId='formBasicTitle'>
7675
{success && showSuccessMessage(success)}
7776
{error && showErrorMessage(error)}
@@ -156,7 +155,6 @@ function AddJournal() {
156155
</Button>
157156
</Form>
158157
</Col>
159-
<Col md={4} />
160158
</Row>
161159
);
162160
}

‎src/components/Footer.js‎

Lines changed: 48 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,44 +10,64 @@ function Footer() {
1010
return (
1111
<Container fluid>
1212
<Row className='footer-above'>
13-
<Col xs={12} md={2}>
14-
<img src={RocketImg} alt='' height={130} width={69} />
13+
<Col xs={12} md={3}>
14+
<img src={RocketImg} alt='' height={130} width={69} />
1515
</Col>
1616
<Col xs={12} sm={12} md={3}>
17-
<h4>Useful links</h4>
18-
<a href='https://github.com/codeisscience' target='_blank' rel='noreferrer'>
19-
Contribute
20-
</a>
21-
<a
22-
href='https://codeisscience.github.io/manifesto/manifesto.html'
23-
target='_blank'
24-
rel='noreferrer'
25-
>
26-
Manifesto
27-
</a>
28-
<a href='#'>Code of conduct</a>
17+
<h4>Useful Links</h4>
18+
<li className='footer-link'>
19+
<a href='https://github.com/codeisscience' target='_blank' rel='noreferrer'>
20+
Contribute
21+
</a>
22+
</li>
23+
<li className='footer-link'>
24+
<a
25+
href='https://codeisscience.github.io/manifesto/manifesto.html'
26+
target='_blank'
27+
rel='noreferrer'
28+
>
29+
Manifesto
30+
</a>
31+
</li>
32+
<li className='footer-link'>
33+
<a href='#'>Code of conduct</a>
34+
</li>
2935
</Col>
3036
<Col xs={12} sm={12} md={3}>
3137
<h4>Resources</h4>
32-
<a href='#'>Authors</a>
33-
<a href='#'>Open science</a>
34-
<a href='#'>Contributors</a>
38+
<li className='footer-link'>
39+
<a href='#'>Authors</a>
40+
</li>
41+
<li className='footer-link'>
42+
<a href='#'>Open science</a>
43+
</li>
44+
<li className='footer-link'>
45+
<a href='#'>Contributors</a>
46+
</li>
3547
</Col>
3648
<Col xs={12} sm={12} md={3}>
3749
<h4>Contact Us</h4>
38-
<a href='mailto:[email protected]' target='_blank' rel='noreferrer'>
39-
<ImMail /> Email
40-
</a>
41-
<a href='https://twitter.com/codeisscience' target='_blank' rel='noreferrer'>
42-
<ImTwitter />
43-
&nbsp;Twitter
44-
</a>
50+
51+
<li className='footer-link'>
52+
<a href='mailto:[email protected]' target='_blank' rel='noreferrer'>
53+
<ImMail className='email-icon icons'/> Email
54+
</a>
55+
</li>
56+
<li className='footer-link'>
57+
<a href='https://twitter.com/codeisscience' target='_blank' rel='noreferrer'>
58+
<ImTwitter className='twitter-icon icons'/>
59+
&nbsp;Twitter
60+
</a>
61+
</li>
4562
<a href='https://github.com/codeisscience' target='_blank' rel='noreferrer'>
46-
<ImGithub /> GitHub
47-
</a>
48-
<a href='#'>
49-
<IoLogoSlack /> Slack
63+
<ImGithub className='github-icon icons'/> GitHub
5064
</a>
65+
66+
<li className='footer-link'>
67+
<a href='#'>
68+
<IoLogoSlack className='slack-icon icons'/> Slack
69+
</a>
70+
</li>
5171
</Col>
5272
</Row>
5373
<Row className='footer-below'>

‎src/pages/Contact.js‎

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

88
const Contact = () => (
9-
<Container className='contact-padding'>
10-
<h1>Contact Us</h1>
9+
<Container>
10+
<h1 className="mt-4">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'>
1313
<Col md={6}>
@@ -69,7 +69,7 @@ const Contact = () => (
6969
Subject
7070
</Form.Label>
7171
<Col sm={10}>
72-
<Form.Control type='password' placeholder='Code is Science' />
72+
<Form.Control type='text' placeholder='Code is Science' />
7373
</Col>
7474
</Form.Group>
7575
<br />
@@ -78,16 +78,16 @@ const Contact = () => (
7878
Message
7979
</Form.Label>
8080
<Col sm={10}>
81-
<Form.Control type='text' placeholder='What is code is science' />
81+
<Form.Control as="textarea" rows={3} placeholder="Enter your message here..." />
8282
</Col>
8383
</Form.Group>
84-
<Form.Group as={Row} controlId='formHorizontalCheck'>
84+
<Form.Group as={Row} controlId='formHorizontalCheck' className='mt-3'>
8585
<Col sm={{ span: 10, offset: 2 }}>
8686
<Form.Check label='Remember me' />
8787
</Col>
8888
</Form.Group>
8989

90-
<Form.Group as={Row}>
90+
<Form.Group as={Row} className='mt-3'>
9191
<Col sm={{ span: 10, offset: 2 }}>
9292
<Button type='submit'>Send</Button>
9393
</Col>

‎src/pages/Journal.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import AddJournal from '../components/AddJournal';
88

99
const Journal = () => (
1010
<Container className='journal-padding'>
11-
<h1>Journals</h1>
11+
<h1 className='text-center'>Journals</h1>
1212
<AddJournal />
1313
</Container>
1414
);

‎src/pages/Manifesto.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ import { ImTwitter, ImMail, ImGithub } from 'react-icons/im';
1515
const Manifesto = () => (
1616
<Container>
1717
<Row className='manifesto-header manifesto-padding'>
18-
<Col xs={12} sm={12} md={3}>
18+
<Col xs={12} sm={12} md={3} className='imgContainer'>
1919
<Image src={StandingImg} height={220} />
2020
</Col>
2121
<Col xs={12} sm={12} md={6} className='manifesto'>
2222
<h1>Manifesto</h1>
2323
</Col>
24-
<Col md={3}>
24+
<Col md={3} className='imgContainer'>
2525
<Image src={SittingImg} height={220} />
2626
</Col>
2727
</Row>

‎src/styles/Footer.css‎

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,59 @@
88
.footer-below p {
99
padding: 1em;
1010
}
11-
11+
.footer-above img {
12+
display: block;
13+
margin: 0 auto;
14+
max-width: 100%;
15+
}
1216
.footer-above {
1317
background-color: #4c4c4d;
1418
color: #babfc5;
1519
padding: 1.5em;
1620
}
21+
.footer-above h4 {
22+
padding: 1rem 0 0.4rem 0;
23+
color: #aad8f5;
24+
}
1725

1826
.footer-above a {
1927
display: block;
2028
color: #fff;
2129
text-decoration: none;
30+
padding: 0.2rem 0;
31+
transition:0.2s all;
32+
}
33+
.icons{
34+
font-size:1.2rem;
35+
margin-right: 0.5rem;
36+
}
37+
.email-icon{
38+
color: #fff;
39+
}
40+
.github-icon{
41+
color:#171515;
42+
}
43+
.twitter-icon{
44+
color:#00ACEE;
45+
margin-right: 0.8rem;
46+
}
47+
.slack-icon{
48+
color: #E01E5A;
2249
}
23-
2450
.footer-above a:hover {
2551
color: #e74d3c;
2652
}
53+
54+
55+
@media screen and (max-width: 900px) {
56+
.footer-above img {
57+
margin-left:0;
58+
margin-right:auto;
59+
}
60+
}
61+
62+
.footer-link{
63+
list-style-type: none;
64+
display: flex;
65+
}
66+

‎src/styles/Login.css‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
margin-top: 50px;
1010
margin-bottom: 50px;
1111
}
12+
@media screen and (max-width:500px) {
13+
.responsive{
14+
width: auto;
15+
}
16+
}
1217
.login-padding{
1318
padding-top: 7em;
14-
}
19+
}

‎src/styles/Manifesto.css‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,15 @@ img {
7272
.manifesto-contribute li {
7373
line-height: 25px;
7474
}
75+
76+
@media only screen and (max-width: 768px){
77+
.manifesto{
78+
padding:0px;
79+
}
80+
.manifesto-header {
81+
margin-bottom: 0;
82+
}
83+
.manifesto-header .imgContainer{
84+
display: none;
85+
}
86+
}

0 commit comments

Comments
 (0)