Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@anacosmina
anacosmina committed Oct 16, 2018
2 parents 98a0b8a + a8ebf6d commit eeb1b0f
Show file tree
Hide file tree
Showing 7 changed files with 109 additions and 34 deletions.
7 changes: 6 additions & 1 deletion contributors.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,12 @@ <h1 class="animated rubberBand delay-4s">Contributors</h1>
<a class="box-item" href="https://github.com/ribrah77">Harbir</a>
<a class="box-item different-color" href="https://github.com/ayoshing">Shing Wong</a>
<a class="box-item" href="https://github.com/jordanchristie">Jordan Christie</a>
<a class="box-item" href="https://github.com/chardon1">chardon1</a>
<a class="box-item" href="https://github.com/chardon1">chardon1</a>
<a class="box-item" href="https://github.com/shivanigangadharan">G Shivani</a>
<a class="box-item" href="https://github.com/chardon1">chardon1</a>
<a class="box-item" href="https://github.com/lfuelling">lfuelling</a>
<a class="box-item" href="https://github.com/chardon1">chardon1</a>
<a class="box-item" href="https://github.com/shehbazjafri">Shehbaz Jafri</a>
<a class="box-item" href="https://github.com/anacosmina">Ana-Cosmina Popescu</a>
<!--
Add here
Expand Down
32 changes: 16 additions & 16 deletions css/drop.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
bottom:200px;
font-family: sans-serif;
font-size:30px;
animation: fall 3.63s linear infinite;
animation: fall 8.63s linear infinite;
}
.drop2{

Expand All @@ -18,7 +18,7 @@
bottom:200px;
font-family: sans-serif;
font-size:30px;
animation: fall 2.63s linear infinite;
animation: fall 7.63s linear infinite;


}
Expand All @@ -31,7 +31,7 @@
bottom:200px;
font-family: sans-serif;
font-size:30px;
animation: fall 3s linear infinite;
animation: fall 8s linear infinite;


}
Expand All @@ -44,7 +44,7 @@
bottom:200px;
font-family: sans-serif;
font-size:30px;
animation: fall 2.13s linear infinite;
animation: fall 7.13s linear infinite;


}
Expand All @@ -57,77 +57,77 @@
bottom:200px;
font-family: sans-serif;
font-size:30px;
animation: fall 1.3s linear infinite;
animation: fall 6.3s linear infinite;


}
.drop6 {


display:none;
width:1px;
height:89px;
position: absolute;
bottom:200px;
font-family: sans-serif;
font-size:30px;
animation: fall 5.63s linear infinite;
animation: fall 10.63s linear infinite;


}
.drop7 {


display:none;
width:1px;
height:89px;
position: absolute;
bottom:200px;
font-family: sans-serif;
font-size:30px;
animation: fall 4.63s linear infinite;
animation: fall 9.63s linear infinite;


}
.drop8 {


display:none;
width:1px;
height:89px;
position: absolute;
bottom:200px;
font-family: sans-serif;
font-size:30px;
animation: fall 5.63s linear infinite;
animation: fall 10.63s linear infinite;


}
.drop9 {


display:none;
width:1px;
height:89px;
position: absolute;
bottom:200px;
font-family: sans-serif;
font-size:30px;
animation: fall 2.63s linear infinite;
animation: fall 7.63s linear infinite;


}
.drop10 {


display:none;
width:1px;
height:89px;
position: absolute;
bottom:200px;
font-family: sans-serif;
font-size:30px;
animation: fall 3.3s linear infinite;
animation: fall 8.3s linear infinite;


}

/* animate the drops*/
@keyframes fall {
to {margin-top:900px;}
}
}
3 changes: 3 additions & 0 deletions css/faq-card.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.white-card{
background-color: #ffeff3;
}
11 changes: 11 additions & 0 deletions css/hover.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 11 additions & 1 deletion css/index.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ body {
color: #000;
line-height: 1.9;
margin: 0;
background: linear-gradient(to right, #25ccf7, #487eb0);
background: rgb(150,100,100);
background: linear-gradient(34deg, rgba(150,100,100,1) 0%, rgba(81,75,190,1) 38%, rgba(0,212,255,1) 100%);
font-family: 'Open Sans', -apple-system, BlinkMacSystemFont, 'Segoe UI',
Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
'Segoe UI Symbol';
Expand Down Expand Up @@ -730,3 +731,12 @@ div#content div#contribution-rules ul li {
font-weight: 500;
color: inherit;
}

div.lowerSection {
padding-top: 12px;
}

#listPages a,
#listIdes a {
color: #121212;
}
6 changes: 3 additions & 3 deletions css/shake.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
.shake {
-webkit-animation-name: shake;
animation-name: shake;
-webkit-animation-duration: 2.5s;
animation-duration: 2.5s;
-webkit-animation-duration: 7.5s;
animation-duration: 7.5s;
-webkit-animation-iteration-count: infinite;
animation-iteration-count: infinite;
-webkit-animation-fill-mode: both;
Expand Down Expand Up @@ -39,4 +39,4 @@
-webkit-transform: translate3d(10px, 0, 0);
transform: translate3d(10px, 0, 0);
}
}
}
72 changes: 59 additions & 13 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
<link rel="stylesheet" href="css/explosion.css">
<link rel="stylesheet" href="./css/terminal.css">
<link rel="stylesheet" href="./css/shake.css">
<link rel="stylesheet" href="./css/faq-card.css">
</head>
<body id="body" class="index">
<!--
Expand Down Expand Up @@ -184,7 +185,7 @@ <h2 class="mb-4" style="font-family:'Antic Didone'">Event will end in</h2>
<li class="shadow bg-light"><span id="seconds"></span> SECONDS</li>
</ul>
<p class="lead text-center mx-auto mt-4">Hurry up and make your pull requests!</p>
<h3>To check your progress visit the <a href="https://hacktoberfestchecker.herokuapp.com/">Hacktoberfest Checker</a>.</h3>
<h3>To check your progress visit the <a href="https://hacktoberfestchecker.herokuapp.com/" id="checker">Hacktoberfest Checker</a>.</h3>
</div>

</div>
Expand Down Expand Up @@ -354,17 +355,17 @@ <h2 class="mb-5">Frequently Asked Questions</h2>
<div class="col-12 col-lg-12 mx-auto">
<div class="row">
<div class="col-12 col-lg-6">
<div class="single-faq shadow mb-4">
<div class="single-faq shadow mb-4 white-card">
<h5>Who can contribute?</h5>
<p>Anyone with a github account and signed up for <a
href="https://hacktoberfest.digitalocean.com/">Hacktoberfest</a> 😄</p>
</div>
<div class="single-faq shadow mb-4">
<div class="single-faq shadow mb-4 white-card">
<h5>Are you getting paid for this?</h5>
<p>Sadly no. But we think we should. This is 100% unofficial and we do it for fun, fame
and glory.</p>
</div>
<div class="single-faq shadow mb-4">
<div class="single-faq shadow mb-4 white-card">
<h5>Who are you and why are you doing this?</h5>
<p>We are two programmers from Sweden <a href="https://github.com/richie-south"
target="_blank">Richard</a>
Expand All @@ -374,30 +375,30 @@ <h5>Who are you and why are you doing this?</h5>
started with
Hacktoberfest and Open source.</p>
</div>
<div class="single-faq shadow mb-4">
<div class="single-faq shadow mb-4 white-card">
<h5>Why are you not using digitalocean?</h5>
<p>Because we only know javascript and suck at servers. We use <a
href="https://zeit.co/now" target="_blank">now</a> instead.</p>
</div>
</div>
<div class="col-12 col-lg-6">
<div class="single-faq shadow mb-4">
<div class="single-faq shadow mb-4 white-card">
<h5>Are you not the guys from that failed <a
href="https://www.kickstarter.com/projects/lingonsaft/codecardcodingcards"
target="_blank">CodeCardCodingCards</a> kickstarter?</h5>
<p>Yes...</p>
</div>
<div class="single-faq shadow mb-4">
<div class="single-faq shadow mb-4 white-card">
<h5>Should I come closer to the text saying 'Don't come closer' on the left side of the
home tab ?</h5>
<p>Nope</p>
</div>
<div class="single-faq shadow mb-4">
<div class="single-faq shadow mb-4 white-card">
<h5>How many pull request (PR) must be made, if I can get a awesome shirt from
Hacktoberfest 2018?</h5>
<p>5</p>
</div>
<div class="single-faq shadow mb-4">
<div class="single-faq shadow mb-4 white-card">
<h5>How do I track my progress to get a awesome shirt from Hacktoberfest 2018?</h5>
<p>Go to : <a href="https://hacktoberfest.digitalocean.com/stats/username"
target="_blank">https://hacktoberfest.digitalocean.com/stats/username</a>
Expand All @@ -409,10 +410,54 @@ <h5>How do I track my progress to get a awesome shirt from Hacktoberfest 2018?</
</div>
</div>
</div>

<div class="lowerSection">
<div class="row" id="listPages">
<div class="col-10 mx-auto text-center">
<h3 class="mb-5">Check available pages</h3>
</div>
<div class="col-lg-12 mx-auto text-center">
<ul style="padding: 0; list-style: none; columns: 3; -webkit-columns: 3; -moz-columns: 3;">
<li><a href="4otakus.html">4otakus</a></li>
<li><a href="bubble.html">bubble</a></li>
<li><a href="canoi.html">canoi</a></li>
<li><a href="cheese.html">cheese</a></li>
<li><a href="colorgame.html">colorgame</a></li>
<li><a href="contributors.html">contributors</a></li>
<li><a href="dry.html">dry</a></li>
<li><a href="ellipses.html">Ellipses</a></li>
<li><a href="Fireworks.html">Fireworks</a></li>
<li><a href="Flappy.html">Flappy</a></li>
<li><a href="foxy.html">foxy</a></li>
<li><a href="gifheaven.html">gifheaven</a></li>
<li><a href="helpful-material.html">helpful material</a></li>
<li><a href="insertion.html">insertion</a></li>
<li><a href="kotlinconfkeynote.html">kotlinconfkeynote</a></li>
<li><a href="plain_page.html">plain page</a></li>
<li><a href="potato.html">potato</a></li>
<li><a href="snek.html">snek</a></li>
<li><a href="spooky.html">spooky</a></li>
<li><a href="tools.html">tools</a></li>
<li><a href="trylearnhowtoprogram.html">trylearnhowtoprogram</a></li>
<li><a href="values.html">values</a></li>
<li><a href="wow.html">wow</a></li>
<li><a href="rpg.html">RPG</a></li>
<li><a href="spooky-bat.html">Bats</a></li>
<li><a href="roll.html">Keep Rollin</a></li>
<li><a href="bp.html">BP</a></li>
<li><a href="flex_and_grid.html">Flex and Grid</a></li>
<li><a href="halloween-frenchies.html">Frenchieween</a></li>
<li><a href="turndown.html">Turndown</a></li>
<li><a href="helloGLSL.html">WebGL HELLO</a></li>
<li><a href="funPlus.html">Fun + Helloween</a></li>
<li><a href="mondrian.html">Mondrian</a></li>
<li><a href="Hacktoberfest_help.html">Hacktoberfest Intro</a></li>
<li><a href="etchfun.html">Etch Fun</a></li>
</ul>
</div>
</div>
<div class="row" id="listPages">
<div class="col-10 mx-auto text-center">
<h3 class="mb-5">Check available pages</h3>
<h3 class="mb-5"><i class="fas fa-check" style="margin-right:5px;"></i>Check available pages</h3>
</div>
<div class="col-lg-12 mx-auto text-center">
<ul style="padding: 0; list-style: none; columns: 3; -webkit-columns: 3; -moz-columns: 3;">
Expand Down Expand Up @@ -458,9 +503,9 @@ <h3 class="mb-5">Check available pages</h3>

<div class="row" id="listIdes">
<div class="col-10 mx-auto text-center">
<h3 class="mb-5">What Code Editor Are You Using?</h3>
<h3 class="mb-5">What Code Editor Are You Using?</h3>
</div>
<div class="col-lg-12 mx-auto text-center">
<div class="col-lg-12 mx-auto text-center">
<ul style="padding: 0; list-style: none; columns: 3; -webkit-columns: 3; -moz-columns: 3;">
<li><a href="https://code.visualstudio.com/">VS Code</a></li>
<li><a href="https://notepad-plus-plus.org/">Notepad++</a></li>
Expand All @@ -474,6 +519,7 @@ <h3 class="mb-5">What Code Editor Are You Using?</h3>
</ul>
</div>
</div>
</div>

<div class="jumbotron jumbotron-transparent">
<div class="container">
Expand Down

0 comments on commit eeb1b0f

Please sign in to comment.