Skip to content

Commit eb403f1

Browse files
vaibhavdarenvaibhavdaren
authored
Merge pull request #168 from Rupeshiya/improvement
improved navbar padding, view, title of page
2 parents 58dc967 + 41db742 commit eb403f1

File tree

5 files changed

+25
-49
lines changed

5 files changed

+25
-49
lines changed

‎public/index.html‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,14 @@
77
<meta name="theme-color" content="#000000" />
88
<meta
99
name="description"
10-
content="Web site created using create-react-app"
10+
content="Codeuino | Open Source Organisation"
1111
/>
1212
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
1313

1414
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
15-
<!--
16-
manifest.json provides metadata used when your web app is installed on a
17-
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
18-
-->
1915
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
2016
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
21-
<!--
22-
Notice the use of %PUBLIC_URL% in the tags above.
23-
It will be replaced with the URL of the `public` folder during the build.
24-
Only files inside the `public` folder can be referenced from the HTML.
25-
26-
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
27-
work correctly both with client-side routing and a non-root public URL.
28-
Learn how to configure a non-root public URL by running `npm run build`.
29-
-->
30-
<title>React App</title>
17+
<title>Codeuino</title>
3118
</head>
3219
<body>
3320
<noscript>You need to enable JavaScript to run this app.</noscript>
@@ -37,15 +24,5 @@
3724
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
3825
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
3926
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
40-
<!--
41-
This HTML file is a template.
42-
If you open it directly in the browser, you will see an empty page.
43-
44-
You can add webfonts, meta tags, or analytics to this file.
45-
The build step will place the bundled scripts into the <body> tag.
46-
47-
To begin the development, run `npm start` or `yarn start`.
48-
To create a production bundle, use `npm run build` or `yarn build`.
49-
-->
5027
</body>
5128
</html>

‎public/manifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"short_name": "React App",
3-
"name": "Create React App Sample",
2+
"short_name": "Codeuino",
3+
"name": "Codeuino",
44
"icons": [
55
{
66
"src": "favicon.ico",

‎src/App.css‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
.navbar{
1111
height:10vh;
1212
}
13+
.navbar-collapse.show{
14+
overflow-y: hidden;
15+
}
1316
/* #logo{
1417
width:10vw;
1518
} */

‎src/App.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@ function App() {
2626

2727
<HashRouter>
2828
<Navbar class="shadow" collapseOnSelect expand="lg" bg="white" variant="light" fixed="top" class="navbar">
29-
<Container className="col-md-8 col-12">
29+
<div className="container">
3030
<Navbar.Brand href="/"><Link to="/"><Image id="logo" src={logo} alt="codeuino logo" style={{heigth:"20vh",width:"10vw"}}/></Link></Navbar.Brand>
31-
<Navbar.Toggle aria-controls="responsive-navbar-nav" />
31+
<Navbar.Toggle aria-controls="responsive-navbar-nav" data-toggle="collapse" data-target="#myDropdown"/>
3232
<Navbar.Collapse id="responsive-navbar-nav" style={{backgroundColor:"white"}}>
3333
<Nav className="mr-auto">
3434

3535
</Nav>
3636
<Nav>
3737
<Link to="/"><Nav.Link href="/">Home</Nav.Link></Link>
38-
<NavDropdown title="Activities" id="basic-nav-dropdown">
39-
<NavDropdown.Item href="/#/gsoc19">GSOC 2019</NavDropdown.Item>
40-
<NavDropdown.Item href="/#/gci19">GCI 2019-20</NavDropdown.Item>
41-
<NavDropdown.Item href="/#/kwoc18">KWOC 2018</NavDropdown.Item>
42-
<NavDropdown.Item href="/#/gssoc19">GSSOC 2019</NavDropdown.Item>
38+
<NavDropdown title="Activities" id="responsive-navbar-nav">
39+
<NavDropdown.Item data-target=".navbar-collapse.show" href="/#/gsoc19" style={{"textAlign": "center"}}>GSOC 2019</NavDropdown.Item>
40+
<NavDropdown.Item data-target=".navbar-collapse.show" href="/#/gci19" style={{"textAlign": "center"}}>GCI 2019-20</NavDropdown.Item>
41+
<NavDropdown.Item data-target=".navbar-collapse.show" href="/#/kwoc18" style={{"textAlign": "center"}} >KWOC 2018</NavDropdown.Item>
42+
<NavDropdown.Item data-target=".navbar-collapse.show" href="/#/gssoc19" style={{"textAlign": "center"}} >GSSOC 2019</NavDropdown.Item>
4343
</NavDropdown>
4444
{/* <Navbar.Dropdown>
4545
@@ -51,7 +51,7 @@ function App() {
5151
<Link to="/joinus"><Nav.Link href="/joinus">Join Us</Nav.Link></Link>
5252
</Nav>
5353
</Navbar.Collapse>
54-
</Container>
54+
</div>
5555
</Navbar>
5656

5757

‎src/pages/Team/Team.js‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ class Team extends Component {
8484
</Card.Description>
8585
</Card.Content>
8686
<Card.Content extra>
87-
<div class="container" style={{display:"flex",justifyContent:"space-evenly"}}>
88-
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-github" aria-hidden="true"></i></a>
89-
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-facebook" aria-hidden="true"></i></a>
87+
<div class="container" style={{display:"flex",justifyContent:"space-evenly"}}>
88+
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-github" aria-hidden="true"></i></a>
89+
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-facebook" aria-hidden="true"></i></a>
9090
</div>
9191
</Card.Content>
9292
</Card>
@@ -104,9 +104,9 @@ class Team extends Component {
104104
</Card.Description>
105105
</Card.Content>
106106
<Card.Content extra>
107-
<div class="container" style={{display:"flex",justifyContent:"space-evenly"}}>
108-
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-github" aria-hidden="true"></i></a>
109-
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-facebook" aria-hidden="true"></i></a>
107+
<div class="container" style={{display:"flex",justifyContent:"space-evenly"}}>
108+
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-github" aria-hidden="true"></i></a>
109+
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-facebook" aria-hidden="true"></i></a>
110110
</div>
111111
</Card.Content>
112112
</Card>
@@ -124,9 +124,9 @@ class Team extends Component {
124124
</Card.Description>
125125
</Card.Content>
126126
<Card.Content extra>
127-
<div class="container" style={{display:"flex",justifyContent:"space-evenly"}}>
128-
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-github" aria-hidden="true"></i></a>
129-
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-facebook" aria-hidden="true"></i></a>
127+
<div class="container" style={{display:"flex",justifyContent:"space-evenly"}}>
128+
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-github" aria-hidden="true"></i></a>
129+
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-facebook" aria-hidden="true"></i></a>
130130
</div>
131131
</Card.Content>
132132
</Card>
@@ -181,7 +181,7 @@ class Team extends Component {
181181
<Card style={{marginBottom:"2vh",border:"0px"}}>
182182
<Image src="https://avatars0.githubusercontent.com/u/31209617?s=460&v=4" wrapped ui={false}/>
183183
<Card.Content>
184-
<Card.Header>Rupeshia</Card.Header>
184+
<Card.Header>Rupeshiya</Card.Header>
185185
<Card.Meta>
186186
<span className='date'>Core Colaborator</span>
187187
</Card.Meta>
@@ -255,9 +255,5 @@ class Team extends Component {
255255
}
256256

257257

258-
Team.propTypes = {
259-
260-
};
261-
262258

263259
export default Team;

0 commit comments

Comments
 (0)