Skip to content

Commit

Permalink
Merge branch 'main' into fix-61
Browse files Browse the repository at this point in the history
  • Loading branch information
@vivianemartini
vivianemartini authored Oct 15, 2022
2 parents fbf3d82 + 5e68f7f commit 57acebf
Show file tree
Hide file tree
Showing 6 changed files with 147 additions and 74 deletions.
5 changes: 3 additions & 2 deletions contact.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,9 @@
<!-- </div> -->
</li>
<li class="nav-item"><a href="events.html" class="nav-link">Events</a></li>
<li class="nav-item active"><a href="team.html" class="nav-link">Our Team</a></li>
<li class="nav-item cta"><a href="contact.html" class="nav-link"><span>Get in touch</span></a></li>
<li class="nav-item"><a href="team.html" class="nav-link">Our Team</a></li>
<li class="nav-item"><a href="resource.html" class="nav-link">Resource Section</a></li>
<li class="nav-item dta"><a href="contact.html" class="nav-link"><span>Get in touch</span></a></li>
</ul>
</div>
</div>
Expand Down
54 changes: 44 additions & 10 deletions css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Copyright 2011-2018 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
:root {
:root {
--blue: #007bff;
--indigo: #6610f2;
--purple: #6f42c1;
Expand Down Expand Up @@ -38,6 +38,11 @@
}


*{
margin: 0;
padding: 0;
box-sizing: border-box;
}

#contributionBtn,
#exploreBtn {
Expand Down Expand Up @@ -83,6 +88,7 @@
border-radius: 0.25rem;
transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out,
border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
margin-right: 2px;
}

.copy-btn:hover {
Expand Down Expand Up @@ -1406,6 +1412,7 @@ pre code {
padding-left: 15px;
margin-right: auto;
margin-left: auto;
margin-top: 10px;
}

.row {
Expand Down Expand Up @@ -10921,6 +10928,8 @@ button.bg-dark:focus {
}

.text-center {
position: relative;
bottom: 20px;
text-align: center !important;
}

Expand Down Expand Up @@ -11323,7 +11332,6 @@ h5,
.ftco-navbar-light .navbar-nav>.nav-item.cta>a {
color: var(--gray-dark);
border: 1px solid var(--gray);
/* background: #ee76ad; */
padding-top: .5rem;
padding-bottom: .5rem;
padding-left: 20px;
Expand All @@ -11335,6 +11343,26 @@ h5,
border-radius: 30px;
}

.ftco-navbar-light .navbar-nav>.nav-item.dta>a {
color: var(--gray-dark);
border: 1px solid var(--gray);
padding-top: .5rem;
padding-bottom: .5rem;
padding-left: 20px;
padding-right: 20px;
margin-top: 4px;
-webkit-border-radius: 30px;
-moz-border-radius: 30px;
-ms-border-radius: 30px;
border-radius: 30px;
background: linear-gradient(45deg, rgba(238, 118, 173, 1) 0%, rgba(239, 172, 120, 1) 100%);
border: 1px solid transparent;
color: #fff;


}


.ftco-navbar-light .navbar-nav>.nav-item.cta :hover {
background: linear-gradient(45deg, rgba(238, 118, 173, 1) 0%, rgba(239, 172, 120, 1) 100%);
border: 1px solid transparent;
Expand Down Expand Up @@ -11473,7 +11501,7 @@ h5,
.hero-wrap {
width: 100%;
height: 100%;
clip-path: polygon(13% 0, 100% 0, 100% 99%, 87% 88%, 0 100%, 0 0);
clip-path: polygon(13% 0, 100% 0, 100% 99%, 85% 80%, 0 98%, 0 0);
position: inherit;
z-index: 0;
}
Expand All @@ -11496,6 +11524,11 @@ h5,
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#448ef6', endColorstr='#af05a9', GradientType=10);
}

.hero-content {
margin-bottom: 54px;
z-index: 99999;
}

#particles-js {
position: absolute;
top: 0;
Expand Down Expand Up @@ -11549,8 +11582,8 @@ h5,

.slider-text .breadcrumbs {
text-transform: uppercase;
font-size: 13px;
letter-spacing: 1px;
font-size: 18px;
letter-spacing: 2px;
margin-bottom: 20px;
z-index: 99;
}
Expand All @@ -11565,7 +11598,8 @@ h5,
}

.slider-text .bread {
font-weight: 700 !important;
font-weight: 800 !important;
letter-spacing: 2px;
}

.slider-text .btn-primary {
Expand Down Expand Up @@ -11743,7 +11777,7 @@ h5,
}

.ftco-section-featured {
margin-top: -250px;
margin-top: -230px;
padding-bottom: 7em;
}

Expand Down Expand Up @@ -12433,7 +12467,7 @@ textarea.form-control {
.ftco-footer {
font-size: 16px;
background: #ee76ad;
padding: 5em 0 2em 0;
padding: 2.5em 0 0 0;
}

.ftco-footer .ftco-footer-logo {
Expand All @@ -12444,7 +12478,7 @@ textarea.form-control {
.ftco-footer .ftco-footer-widget h2 {
font-weight: normal;
color: #fff;
margin-bottom: 40px;
margin-bottom: 15px;
font-size: 18px;
font-weight: 400;
}
Expand Down Expand Up @@ -13751,4 +13785,4 @@ textarea.form-control {
stroke-dasharray: 89, 200;
stroke-dashoffset: -136px;
}
}
}
6 changes: 4 additions & 2 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,10 @@
<div class="container">
<div class="row no-gutters slider-text align-items-center justify-content-center" data-scrollax-parent="true">
<div class="col-md-6 ftco-animate text-center" data-scrollax=" properties: { translateY: '70%' }">
<h1 class="mb-4" data-scrollax="properties: { translateY: '30%', opacity: 1.6 }">Empowering <strong>Youth</strong> for the future</h1>
<p data-scrollax="properties: { translateY: '30%', opacity: 1.6 }"><a href="contact.html" class="btn btn-primary btn-outline-white px-5 py-3">Get in touch</a></p>
<div class="hero-content">
<h1 class="mb-4" data-scrollax="properties: { translateY: '30%', opacity: 1.6 }">Empowering <strong>Youth</strong> for the future</h1>
<p data-scrollax="properties: { translateY: '30%', opacity: 1.6 }"><a href="contact.html" class="btn btn-primary btn-outline-white px-5 py-3">Get in touch</a></p>
</div>
</div>
</div>
</div>
Expand Down
132 changes: 83 additions & 49 deletions js/getResource.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ const contributionGuidline = document.getElementById('contributionGuideline');
// const intermediateResourceBox = document.getElementById('intermediateResourceBox',);

contributionBtn.addEventListener('click', (e) => {
resourceBox.style.display = 'none';
resourceBox1.style.display = 'none';
contributionGuidline.style.display = 'block';
contributionBtn.style.backgroundColor = '#6940d3';
contributionBtn.style.color = '#fff';
for (let j = 0; j < category.length; j++) {
selectBtn[j].style.backgroundColor = '#fff';
selectBtn[j].style.color = '#000';
}
for (let i = 0; i < category.length; i++) {
let x = category[i].querySelector('.select-option');
x.style.display = 'none';
}
resourceBox.style.display = 'none';
resourceBox1.style.display = 'none';
contributionGuidline.style.display = 'block';
contributionBtn.style.backgroundColor = '#6940d3';
contributionBtn.style.color = '#fff';
for (let j = 0; j < category.length; j++) {
selectBtn[j].style.backgroundColor = '#fff';
selectBtn[j].style.color = '#000';
}
for (let i = 0; i < category.length; i++) {
let x = category[i].querySelector('.select-option');
x.style.display = 'none';
}
});


Expand All @@ -29,15 +29,29 @@ const CSE = document.getElementById('CSE');
const ECE = document.getElementById('ECE');
const ESE = document.getElementById('ESE');
const UPSC = document.getElementById('UPSC');
const resourceBox1= document.getElementById('resourceBox1');
const resourceBox2= document.getElementById('resourceBox2');
CSE.addEventListener('click', (e)=> {
const SSC = document.getElementById('SSC');
const AFCAT = document.getElementById('AFCAT');
const GATE = document.getElementById('GATE');
const EE = document.getElementById('EE');
const ME = document.getElementById('ME');
const CE = document.getElementById('CE');
const ARCH = document.getElementById('ARCH');
const CAT = document.getElementById('CAT');
const ESEME = document.getElementById('ESEME');
const ESEEE = document.getElementById('ESEEE');
const ESEECE = document.getElementById('ESEECE');
const ESECE = document.getElementById('ESECE');
const resourceBox1 = document.getElementById('resourceBox1');
const resourceBox2 = document.getElementById('resourceBox2');


CSE.addEventListener('click', (e) => {
contributionGuidline.style.display = 'none';
// resourceBox.style.display = 'none';
// resourceBox.style.display = 'block';

//Method 1
resourceBox1.innerHTML=`
resourceBox1.innerHTML = `
<div class="container mt-3" id="resourceBox1" style=" background: red;">
<!--Beginner Resource Box-->
<h4 class="resource-heading">CSE</h4>
Expand All @@ -51,20 +65,20 @@ CSE.addEventListener('click', (e)=> {
<h4 class="resource-heading"></h4>
<div class="row mt-2" id="projectsResourceBox"></div>
</div>`;
resourceBox1.style.display = 'block';

// Method 2
//else use this >>
// resourceBox2.style.display = 'block';
// resourceBox1.style.display = 'none';

resourceBox1.style.display = 'block';

// Method 2
//else use this >>
// resourceBox2.style.display = 'block';
// resourceBox1.style.display = 'none';

})

ECE.addEventListener('click',(e)=>{
ECE.addEventListener('click', (e) => {
contributionGuidline.style.display = 'none';

resourceBox1.innerHTML=`
resourceBox1.innerHTML = `
<div class="container mt-3" id="resourceBox1" style=" background: green;">
<!--Beginner Resource Box-->
<h4 class="resource-heading">ECE</h4>
Expand All @@ -78,17 +92,37 @@ ECE.addEventListener('click',(e)=>{
<h4 class="resource-heading">fhghgghgggghghghggh</h4>
<div class="row mt-2" id="projectsResourceBox"></div>
</div>`;

resourceBox1.style.display = 'block';

resourceBox1.style.display = 'block';
})
SSC.addEventListener('click', (e) => {
contributionGuidline.style.display = 'none';

resourceBox1.innerHTML = `
<div class="container mt-3" id="resourceBox1" style=" background: green;">
<!--Beginner Resource Box-->
<h4 class="resource-heading">SSC</h4>
<div class="row" id="beginnerResourceBox"></div>
<!--Intermediate Resource Box -->
<h4 class="resource-heading">Intermediate</h4>
<div class="row mt-2" id="intermediateResourceBox"></div>
<!--Advanced Resource Box -->
<h4 class="resource-heading">Advanced</h4>
<div class="row mt-2" id="advancedResourceBox"></div>
<h4 class="resource-heading">fhghgghgggghghghggh</h4>
<div class="row mt-2" id="projectsResourceBox"></div>
</div>`;

resourceBox1.style.display = 'block';
})

ESE.addEventListener('click', (e)=> {
ESE.addEventListener('click', (e) => {
contributionGuidline.style.display = 'none';
// resourceBox.style.display = 'none';
// resourceBox.style.display = 'block';

//Method 1
resourceBox1.innerHTML=`
resourceBox1.innerHTML = `
<!--div class="container mt-3" id="resourceBox1" style=" background: white;"-->
<div class="container mt-3" id="resourceBox1">
<!--Beginner Resource Box-->
Expand Down Expand Up @@ -118,23 +152,23 @@ ESE.addEventListener('click', (e)=> {
<h4 class="resource-heading"></h4>
<div class="row mt-2" id="projectsResourceBox"></div>
</div>`;
resourceBox1.style.display = 'block';

// Method 2
//else use this >>
// resourceBox2.style.display = 'block';
// resourceBox1.style.display = 'none';

resourceBox1.style.display = 'block';

// Method 2
//else use this >>
// resourceBox2.style.display = 'block';
// resourceBox1.style.display = 'none';

})

UPSC.addEventListener('click', (e)=> {
UPSC.addEventListener('click', (e) => {
contributionGuidline.style.display = 'none';
// resourceBox.style.display = 'none';
// resourceBox.style.display = 'block';

//Method 1
resourceBox1.innerHTML=`
resourceBox1.innerHTML = `
<!--div class="container mt-3" id="resourceBox1" style=" background: white;"-->
<div class="container mt-3" id="resourceBox1">
<!--Beginner Resource Box-->
Expand Down Expand Up @@ -192,12 +226,12 @@ UPSC.addEventListener('click', (e)=> {
<h4 class="resource-heading"></h4>
<div class="row mt-2" id="projectsResourceBox"></div>
</div>`;
resourceBox1.style.display = 'block';

// Method 2
//else use this >>
// resourceBox2.style.display = 'block';
// resourceBox1.style.display = 'none';

resourceBox1.style.display = 'block';

// Method 2
//else use this >>
// resourceBox2.style.display = 'block';
// resourceBox1.style.display = 'none';

})
Loading

0 comments on commit 57acebf

Please sign in to comment.