Skip to content

Commit 95c0f4a

Browse files
sachinsom93sachinsom93
authored
Merge branch 'development' into sachinsom93/GOSW9
2 parents 450ed30 + b995587 commit 95c0f4a

31 files changed

+1098
-966
lines changed

‎client/debug.log‎

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

‎client/package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,3 @@
4141
]
4242
}
4343
}
44-

‎client/public/index.html‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,28 @@
2525
Learn how to configure a non-root public URL by running `npm run build`.
2626
-->
2727
<title>React App</title>
28+
<style>
29+
.row{
30+
margin:0;
31+
}
32+
.col-12{
33+
padding: 0;
34+
}
35+
.row-1, .row-2{
36+
margin-left: 0 !important;
37+
}
38+
@media screen and (max-width: 768px){
39+
.row1, .row2 {
40+
margin-left: 0 !important;
41+
}
42+
}
43+
@media screen and (max-width: 575px){
44+
.row1, .row2 {
45+
margin-left: 0 !important;
46+
}
47+
}
48+
</style>
49+
2850
</head>
2951

3052
<body>

‎client/src/AboutUs.js‎

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

‎client/src/Aboutus.css‎

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

‎client/src/App.js‎

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,17 @@
1-
somashrirastogi/GOSW-5
2-
import React from 'react';
3-
import logo from './logo.svg';
4-
import './App.css';
5-
6-
function App() {
7-
return (
8-
<div className="App">
9-
<header className="App-header">
10-
<img src={logo} className="App-logo" alt="logo" />
11-
<h1>GameOfSource</h1>
12-
</header>
13-
</div>
14-
);
15-
16-
import React from 'react';
17-
import './App.css';
18-
19-
20-
1+
import React from "react";
2+
import logo from "./logo.svg";
3+
import "./App.css";
4+
import AboutUs from "./components/AboutUs/AboutUs";
5+
import Commiittee from "./components/CommitteeMembers/committee";
6+
import Homepage from "./components/Homepage/Homepage";
7+
import Timeline from "./components/Timeline/timeline";
8+
import ContactUs from "./components/Contact-Us/ContactUs";
219

2210
function App() {
2311
return (
24-
<div className="app">
25-
</div>
12+
<>
13+
<Homepage />
14+
</>
2615
);
27-
development
2816
}
29-
3017
export default App;

‎client/src/component/CommitteeMembers/MemberBlock.js‎

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

‎client/src/component/CommitteeMembers/committee.js‎

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

0 commit comments

Comments
 (0)