Skip to content

Commit

Permalink
Changes done
Browse files Browse the repository at this point in the history
  • Loading branch information
aarushiarora-2610 committed Feb 11, 2021
1 parent ac8b1f1 commit 8b77c74
Show file tree
Hide file tree
Showing 13 changed files with 16,803 additions and 217 deletions.
16,673 changes: 16,654 additions & 19 deletions client/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"react-redux": "^7.2.2",
"react-router-dom": "^5.2.0",
"react-scripts": "^3.4.4",
"reactstrap": "^8.8.1",
"reactstrap": "^8.9.0",
"read-scripts": "^1.1.0",
"redux": "^4.0.5",
"redux-devtools-extension": "^2.13.8",
Expand Down
5 changes: 2 additions & 3 deletions client/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,10 @@ export default function App() {
return (
<Router>
<div className="App">
{/*<br />
<br />
{/* <Carousel />
<br />
<br />*/}
{/* <Carousel /> */}
<br />
<Navbar />
<br/>
<center>
Expand Down
23 changes: 13 additions & 10 deletions client/src/components/Faq-page/Accordion.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
}

.accordion{
background-color:#090088;
background-color:#071F3F;
color: #fff;
cursor: pointer;
padding: 2px;
Expand All @@ -16,7 +16,7 @@
outline-style:none;
outline-width:0;
transition: background-color 0.4s ease;
height:60px;
height:auto;
margin-bottom:5px;
width:90%;
position:relative;
Expand All @@ -30,17 +30,18 @@
}


.accordion:hover,
.active{
background-color: #21209c;
.accordion:hover{
background-color: #0d335d;
}

.accordion__title{
font-family: "Open Sans" , sans-serif;
font-weight:600;
font-size: 18px;
margin-left:25px;
margin-top:36px;
margin-top:15px;
text-align:left;
margin-bottom:15px;
}

.accordion__icon{
Expand All @@ -55,25 +56,27 @@
}

.accordion__content{
background-color: #614ad3 ;
background-color: #AEBAC9 ;
overflow:hidden;
height:60px;
height:auto;
transition: max-height 0.4s ease;
margin-bottom:15px;
width:90%;
position:relative;
left:5%;
left:5%;
border:none;
border-radius:20px;
}

.accordion__text
{
font-family: "Open Sans", sans-serif;
color: #fff;
color: #000;
font-weight:400;
font-size: 18px;
padding: 15px;
margin-left:11px;
text-align:left;

}

Expand Down
18 changes: 11 additions & 7 deletions client/src/components/Faq-page/Faq.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,23 @@ import Bottom from "./Bottom.jsx";
const Faq = () => {
return (
<>
<br />
<Heading />

<br />
<Accordion
title="abcdddd"
content="iijifjifjiowejfioewjfiojewiofjewiofjiowejfiojweiofjew"
<Accordion
title="How can I donate items through the website?"
content="There is an option of DONATE on the navbar. Click on the button and you will reach the donate page where you need
to fill the required details."
/>
<Accordion
title="jjdfksfkjeklfjwkeljfklewf"
content="lhdjshfjdklwjdlwldlwkldkecjkejckejwkskfjkfjkwefkewf"
title="How can I contact any ngo?"
content="Our website will help you to contact an ngo. If u r in need of a help, you can click the NEED button on the navbar and
fill the required details on the page."
/>
<Accordion
title="hfejfkemkfmew"
content="dhfewhfjewkfjwekfref"
title="How will the donation items be collected from me?"
content="The ngo will be in touch with you and will collect the donated items."
/>
<br />
<br />
Expand Down
11 changes: 8 additions & 3 deletions client/src/components/Feed Page/Feedback.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
.feed-btn-1 {
width: 40%;
margin-right: 50px;
background-color: #F56552;
background-color: #AEBAC9;
}
.feed-btn-2 {
width: 40%;
background-color: #F56552;
background-color: #AEBAC9;
}

.feed-para {
Expand Down Expand Up @@ -63,7 +63,12 @@
background-color: inherit;
}
.tabContainer .buttonContainer button:hover {
background-color: #30d818;
background-color: #071F3F;
color:#fff;
}
.tabContainer .buttonContainer button
{
background-color:#AEBAC9;
}

@media only screen and (max-width: 800px) {
Expand Down
3 changes: 2 additions & 1 deletion client/src/components/Navbar/Navbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,8 @@
}

.logo img {
max-height: 50px;
max-height: 55px;
background-color:#fff;
}

@media (min-width: 992px) {
Expand Down
112 changes: 0 additions & 112 deletions client/src/components/carousel/carousel.css

This file was deleted.

5 changes: 2 additions & 3 deletions client/src/components/carousel/carousel.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import React from "react";
import Carousel1 from "./carousel.jsx";
import "./carousel.css";
import Example from "./carousel.jsx";

const Carousel = () => {
return (
<>
<Carousel1 />
<Example />
</>
);
};
Expand Down
Loading

0 comments on commit 8b77c74

Please sign in to comment.