Skip to content

Ironed out the little things #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Gopal9816 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Ironed out the little things #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
107618d
Fixed desktop navbar
Gopal9816 Oct 18, 2018
efbb61d
Added intro content
Gopal9816 Oct 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@

}
a:hover{
font-family: 'VT323', monospace;
font-size: 1.8rem;
letter-spacing: .06rem;
}
Expand Down Expand Up @@ -110,6 +109,11 @@
to {margin-top: 0%}
}

@media only screen and (max-width: 768px){
#navbarsExampleDefault{
padding-bottom: 100%;
}
}


</style>
Expand All @@ -127,12 +131,12 @@
<span class="navbar-toggler-icon"></span>
</button>

<div class="collapse navbar-collapse" id="navbarsExampleDefault" style="background-color:#282828;padding-bottom:100%; ">
<div class="collapse navbar-collapse" id="navbarsExampleDefault" style="background-color:#282828;">
<ul class="nav navbar-nav ml-auto ">
<li class="nav-item active">
<li class="nav-item about-nav active">
<a class="nav-link aboutLink" href="#">About <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item">
<li class="nav-item contact-nav">
<a class="nav-link contactLink" href="#">Contact</a>
</li>

Expand All @@ -149,13 +153,12 @@
<div class="col-md-6 fadeIn" style="color: white;text-align: center;padding-top: 18vh;padding-bottom: 28vh; padding-left: 7vw;padding-right: 7vw;font-family: 'Geo', sans-serif;">

<h1>-About-</h1>
<p >Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.
</p>
<p > Free and open-source software (FOSS) cell is a group of students passionate and enthusiastic about free software and technology. Our vision is to bring more student developers into the open-source community and promote open-source mindset in the campus. The cell frequently conducts coding contests and sessions on open-source software. We provide mentorship for student projects. </p>
</div>
</div>
<div class="row container-fluid contact">
<div class="col-md-6"></div>
<div class="col-md-6 fadeIn" style=" color: white;text-align: center;padding-top: 16vh;padding-bottom: 25vh; padding-left: 7vw;padding-right: 7vw">
<div class="col-md-6 fadeIn" style=" color: white;text-align: center;padding-top: 16vh;padding-bottom: 25vh; padding-left: 7vw;padding-right: 7vw;font-family: 'Geo', sans-serif;">

<h1>-Contact-</h1>
<ul class="contact">
Expand Down
20 changes: 18 additions & 2 deletions js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,15 @@ $("*").on('wheel', function(e){
$('.about').fadeOut(250,'linear');
$('.about').hide(0);
$('.contact').show();
$('.about-nav').removeClass('active');
$('.contact-nav').addClass('active');
}
else{
$('.contact').fadeOut(250,'linear');
$('.contact').hide(0);
$('.about').show();
$('.contact-nav').removeClass('active');
$('.about-nav').addClass('active');

}
if(count > 170){
Expand Down Expand Up @@ -96,6 +100,8 @@ $("*").on('wheel', function(e){
$('.about').fadeOut(250,'linear');
$('.about').hide(0);
$('.contact').show();
$('.about-nav').removeClass('active');
$('.contact-nav').addClass('active');
console.log("swipe up",o.distance)
})
.on('swipeDown', function(e, o) {
Expand All @@ -104,6 +110,8 @@ $("*").on('wheel', function(e){
$('.contact').fadeOut(250,'linear');
$('.contact').hide(0);
$('.about').show();
$('.contact-nav').removeClass('active');
$('.about-nav').addClass('active');
console.log("swipe down",o.distance)
})
.on('swipeLeft', function(e, o) {
Expand All @@ -112,6 +120,8 @@ $("*").on('wheel', function(e){
$('.about').fadeOut(500,'linear');
$('.about').hide(0);
$('.contact').show();
$('.about-nav').removeClass('active');
$('.contact-nav').addClass('active');
console.log("swipe left",o.distance)
})
.on('swipeRight', function(e, o) {
Expand All @@ -120,6 +130,8 @@ $("*").on('wheel', function(e){
$('.contact').fadeOut(500,'linear');
$('.contact').hide(0);
$('.about').show();
$('.contact-nav').removeClass('active');
$('.about-nav').addClass('active');
console.log("swipe right",o.distance)
});

Expand All @@ -137,11 +149,15 @@ $("*").on('wheel', function(e){
$('.aboutLink').click(function(){
$('.contact').fadeOut(500,'linear');
$('.contact').hide(0);
$('.about').show();
$('.about').show();
$('.contact-nav').removeClass('active');
$('.about-nav').addClass('active');
});

$('.contactLink').click(function(){
$('.about').fadeOut(500,'linear');
$('.about').hide(0);
$('.contact').show();
$('.contact').show();
$('.about-nav').removeClass('active');
$('.contact-nav').addClass('active');
});