Skip to content

Commit 59c9d36

Browse files
Anupam-dagarAnupam-dagar
committed
Merge remote-tracking branch 'upstream/master'
2 parents 22c507e + 138b31a commit 59c9d36

5 files changed

Lines changed: 116 additions & 16 deletions

File tree

‎index.html‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ <h4>Applications are open now</h4>
8282
<div class="row col-md-12 text-center wow fadeIn" data-wow-delay="1s">
8383
<br>
8484
<a class="btn btn-lg landing-btn" href="http://hacksociety.tech/attend/hackathon/30" target="_blank">Apply</a>
85-
<a class="btn btn-lg landing-btn" href="https://hint18.zulipchat.com" target="_blank">Chat With Us</a>
85+
<a class="btn btn-lg landing-btn" href="https://hackinthenorth.zulipchat.com" target="_blank">Chat With Us</a>
8686
</div>
8787
</div>
8888
</section>
@@ -146,7 +146,8 @@ <h3 class="timeline__title">18th Mar 5:00 PM :- Prize Distribution & Feedback Se
146146
</section>
147147

148148
<section id="faq" class="fullpage" style="height: auto;">
149-
<div class="contents fullpage">
149+
<div class="fullpage" style="background: rgba(0,0,0,0.5);">
150+
<div class="contents fullpage" style="height: auto;">
150151
<h3>FAQ</h3>
151152
<div class="faqcolumn">
152153
<div class="faqelem wow fadeInUp">
@@ -205,6 +206,7 @@ <h3>FAQ</h3>
205206
</div>
206207
</div>
207208
</div>
209+
</div>
208210
</section>
209211
<section id="sponsors">
210212

@@ -218,7 +220,7 @@ <h1 class="contact-title">SPONSOR</h1>
218220
<br>
219221
<div class="row">
220222
<div class="col-sm-8 col-sm-offset-2">
221-
<h4 align="center">Interested in sponsorsing Hack In The North?<br><br> Please see our <a href="#">sponsorship brochure</a> for more details.</h4>
223+
<h4 align="center">Interested in sponsorsing Hack In The North?<br><br> Please see our <a href="https://drive.google.com/file/d/0B7IJhC8PF-c9UzU4bjFza3Y0YTQ/view">sponsorship brochure</a> for more details.</h4>
222224
</div>
223225
</div>
224226
<br>
@@ -265,7 +267,7 @@ <h4 align="center">Interested in sponsorsing Hack In The North?<br><br> Please s
265267
<a href="http://hacksociety.tech/"><img class="last-year-spsr" src="static/sponsors/hacksociety.png"></a>
266268
</div>
267269
<div class="custom-col-2">
268-
<a href="https://www.stickermule.com/"><img class="last-year-spsr" src="static/sponsors/sticker-mule.svg" style="margin-top: 20%;"></a>
270+
<a href="https://www.stickermule.com/supports/hackathons"><img class="last-year-spsr" src="static/sponsors/sticker-mule.svg" style="margin-top: 20%;"></a>
269271
</div>
270272
<div class="custom-col-2">
271273
<a href="https://www.jetbrains.com"><img class="last-year-spsr" src="static/sponsors/jetbrains.png"></a>
@@ -314,7 +316,7 @@ <h4 align="center">Interested in sponsorsing Hack In The North?<br><br> Please s
314316
<a href="https://www.topcoder.com/"><img class="last-year-spsr" style="max-height: 100px; padding-left: 20%;" src="static/sponsors/topcoder.png"></a>
315317
</div>
316318
<div class="custom-small">
317-
<a href="https://www.heroku.com/"><img class="last-year-spsr" style="max-height: 100px; padding-left: 40%;" src="static/sponsors/heroku.png"></a>
319+
<a href="https://www.heroku.com/"><img class="last-year-spsr" style="max-height: 100px; padding-left: 20%;" src="static/sponsors/heroku.png"></a>
318320
</div>
319321
<div class="custom-small">
320322
<a href="https://balsamiq.com/"><img class="last-year-spsr" style="max-height: 100px; padding-left: 8%;" src="static/sponsors/balsamiq.png" style="margin-top: 4%;margin-left: 2%;"></a>
@@ -336,7 +338,7 @@ <h4 align="center">Interested in sponsorsing Hack In The North?<br><br> Please s
336338
<a href="http://hacksociety.tech/"><img class="last-year-spsr" src="static/sponsors/hacksociety.png" style="max-height: 100px; padding-left: 35%;"></a>
337339
</div>
338340
<div class="custom-small">
339-
<a href="https://www.stickermule.com/"><img class="last-year-spsr" src="static/sponsors/sticker-mule.svg" style="max-height: 100px; padding-left: 25%;"></a>
341+
<a href="https://www.stickermule.com/supports/hackathons"><img class="last-year-spsr" src="static/sponsors/sticker-mule.svg" style="max-height: 100px; padding-left: 25%;"></a>
340342
</div>
341343
<div class="custom-small">
342344
<a href="https://www.jetbrains.com"><img class="last-year-spsr" src="static/sponsors/jetbrains.png" style="max-height: 100px; padding-left: 35%;"></a>

‎static/css/layout.css‎

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ body{
4646

4747
.container {
4848
position: relative;
49-
width: 1100px;
49+
width: 1150px;
5050
margin: 0 auto;
5151
-webkit-transition: all 1s ease;
5252
-moz-transition: all 1s ease;
@@ -72,7 +72,7 @@ body{
7272

7373
#filters li span {
7474
display: block;
75-
width: 124px;
75+
width: 132px;
7676
height: 20px;
7777
padding :20px;
7878
margin: 8px;
@@ -213,8 +213,34 @@ body{
213213
.navbar {
214214
display: none;
215215
}
216+
p.text{
217+
218+
margin-top: -50px;
219+
}
216220
/* Hover effect end */
217-
221+
/*******************************Scrollbar ***********************************/
222+
/* width */
223+
::-webkit-scrollbar {
224+
width: 7px;
225+
}
226+
227+
/* Track */
228+
::-webkit-scrollbar-track {
229+
box-shadow: inset 0 0 5px grey;
230+
border-radius: 10px;
231+
}
232+
233+
/* Handle */
234+
::-webkit-scrollbar-thumb {
235+
background: linear-gradient(330deg, #5D009C ,#D40062, #FCB600); ;
236+
border-radius: 10px;
237+
}
238+
239+
/* Handle on hover */
240+
::-webkit-scrollbar-thumb:hover {
241+
background:linear-gradient(330deg, #5D009C ,#D40062, #FCB600); ;
242+
}
243+
/***********************************Scrollbar end*****************************/
218244
/* #Tablet (Portrait) */
219245
@media only screen and (min-width: 768px) and (max-width: 1024px) {
220246
.container {
@@ -252,11 +278,9 @@ body{
252278
}
253279

254280
.image:after {
255-
display: none;
256281
cursor: pointer;
257282
}
258283
.image:hover:after {
259-
display: none;
260284
cursor: pointer;
261285
}
262286

@@ -295,6 +319,7 @@ body{
295319
.back{
296320
display: none;
297321
}
322+
298323
}
299324

300325

‎static/css/main.css‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,25 @@ html {
1616
line-height: 1.4;
1717
}
1818

19+
20+
/* Scrollbar Styling */
21+
::-webkit-scrollbar {
22+
width: 7px;
23+
}
24+
25+
::-webkit-scrollbar-track {
26+
background-color: #ffffff;
27+
-webkit-border-radius: 10px;
28+
border-radius: 10px;
29+
}
30+
31+
::-webkit-scrollbar-thumb {
32+
-webkit-border-radius: 10px;
33+
border-radius: 10px;
34+
min-height: 250px;
35+
background: linear-gradient(330deg, #5D009C ,#D40062, #FCB600);
36+
}
37+
1938
/*
2039
* Remove text-shadow in selection highlight:
2140
* https://twitter.com/miketaylr/status/12228805301
@@ -277,7 +296,7 @@ li{
277296

278297

279298
#faq {
280-
background: linear-gradient(330deg, #4C4491 0%, #FD5C63 100%);
299+
background-image: url(../img/faqtry.jpg);
281300
background-size: cover;
282301
background-repeat: no-repeat;
283302
color:#fff;
@@ -308,7 +327,7 @@ li{
308327
#faq .question:after {
309328
color: #536bb1;
310329
-webkit-font-smoothing: antialiased;
311-
content: "<";
330+
content: ">";
312331
position: relative;
313332
float: right;
314333
font-size: 1em;
@@ -317,9 +336,9 @@ li{
317336
-ms-transform: rotate(0deg);
318337
transform: rotate(0deg); }
319338
#faq .question.open:after {
320-
-webkit-transform: rotate(-90deg);
321-
-ms-transform: rotate(-90deg);
322-
transform: rotate(-90deg); }
339+
-webkit-transform: rotate(90deg);
340+
-ms-transform: rotate(90deg);
341+
transform: rotate(90deg); }
323342
#faq .answer {
324343
border: 3px solid #fff;
325344
padding: 0px 20px;

‎static/img/faqtry.jpg‎

1.14 MB
Loading

0 commit comments

Comments
 (0)