Skip to content

Commit 3b394db

Browse files
mubarismubaris
authored
Merge pull request #188 from OrionStar25/master
Complete navbar
2 parents 7894a9d + 92c62e7 commit 3b394db

6 files changed

Lines changed: 85 additions & 76 deletions

File tree

‎index.html‎

Lines changed: 79 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010
<link rel="manifest" href="site.webmanifest">
1111
<link rel="apple-touch-icon" href="icon.png">
1212
<link rel="shortcut icon" href="static/img/logo-color-small.png">
13-
14-
<!-- Place favicon.ico in the root directory -->
15-
16-
<!-- TO DO : Remove unused fonts imports -->
1713
<link href="https://fonts.googleapis.com/css?family=Lato:400,700|Montserrat:400,700|Open+Sans:400,500,600,700|Oswald:400,700|Roboto:400,700" rel="stylesheet">
1814
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
1915
<link rel="stylesheet" href="static/css/main.css">
@@ -42,21 +38,25 @@
4238
<span class="icon-bar"></span>
4339
</button>
4440

45-
<!--<a id="nav_home" href="#landing" class="nav-link">
46-
<img class="hint-logo" src="static/img/logo-color-small.png">
47-
</a>-->
41+
4842
</div>
4943
<div class="navbar-collapse collapse" id="custom_collapse">
5044
<div class=" navbar-right">
5145
<ul class="nav navbar-nav">
5246
<li>
5347
<a id="nav_about" href="#about" class="nav-link">ABOUT</a>
5448
</li>
49+
<li>
50+
<a id="nav_schedule" href="#schedule" class="nav-link">SCHEDULE</a>
51+
</li>
52+
<li>
53+
<a id="nav_faq" href="#faq" class="nav-link">FAQ</a>
54+
</li>
5555
<li>
5656
<a id="nav_sponsors" href="#sponsors" class="nav-link">SPONSORS</a>
5757
</li>
5858
<li>
59-
<a id="nav_sponsors" href="#footer" class="nav-link">CONTACT</a>
59+
<a id="nav_contact" href="team.html" class="nav-link">CONTACT</a>
6060
</li>
6161
</ul>
6262
</div>
@@ -204,75 +204,11 @@ <h3>FAQ</h3>
204204
</div>
205205
</div>
206206
</section>
207-
<!-- mobile -->
208-
<div class="navbar-static-top visible-xs-block">
209-
<section id="sponsors">
210-
<div class="container-fluid">
211-
<div class="row text-center">
212-
<h1 class="contact-title">SPONSOR</h1>
213-
</div>
214-
<br>
215-
<div class="row">
216-
<div class="col-sm-8 col-sm-offset-2">
217-
<h4 align="center">Interested in sponsorsing Hack In The North?<br><br> Please see our <a href="#">sponsorship brochure</a> for more details.</h4>
218-
</div>
219-
</div>
220-
<br>
221-
<div class="row">
222-
<div class="custom-small">
223-
<a href="https://github.com"><img class="last-year-spsr" style="max-height: 100px; padding-left: 15%;" src="static/sponsors/GitHub_Logo.png"></a>
224-
</div>
225-
<div class="custom-small" >
226-
<a href="https://www.topcoder.com/"><img class="last-year-spsr" style="max-height: 100px; padding-left: 20%;" src="static/sponsors/topcoder.png"></a>
227-
</div>
228-
<div class="custom-small">
229-
<a href="https://www.heroku.com/"><img class="last-year-spsr" style="max-height: 100px; padding-left: 40%;" src="static/sponsors/heroku.svg"></a>
230-
</div>
231-
<div class="custom-small">
232-
<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>
233-
</div>
234-
<div class="custom-small">
235-
<a href="https://www.python.org/psf/"><img class="last-year-spsr" style="max-height: 100px; padding-left: 15%;" src="static/sponsors/PSF.png"></a>
236-
</div>
237-
</div>
238-
<div class="custom-small">
239-
<a href="http://get.tech/"><img class="last-year-spsr" src="static/sponsors/tech.png" style="max-height: 100px; padding-left: 15%;"></a>
240-
</div>
241-
<div class="custom-small" style="margin-left:5%">
242-
<a href="https://zulip.com/"><img class="last-year-spsr" src="static/sponsors/zulip.jpg" style="max-height: 100px; padding-left: 30%;"></a>
243-
</div>
244-
<div class="custom-small">
245-
<a href="https://www.digitalocean.com/"><img class="last-year-spsr" src="static/sponsors/DO.png" style="max-height: 100px; padding-left: 35%;"></a>
246-
</div>
247-
<div class="custom-small">
248-
<a href="http://hacksociety.tech/"><img class="last-year-spsr" src="static/sponsors/hacksociety.png" style="max-height: 100px; padding-left: 35%;"></a>
249-
</div>
250-
<div class="custom-small">
251-
<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>
252-
</div>
253-
<div class="custom-small">
254-
<a href="https://www.jetbrains.com"><img class="last-year-spsr" src="static/sponsors/jetbrains.png" style="max-height: 100px; padding-left: 35%;"></a>
255-
</div>
256-
<div class="custom-small">
257-
<a href="https://www.skillshare.com"><img class="last-year-spsr" src="static/sponsors/skillshare.png" style="max-height: 100px; padding-left: 22%;"></a>
258-
</div>
259-
<div class="custom-small col-md-offset-1">
260-
<a href="https://codepen.io/"><img class="last-year-spsr" src="static/sponsors/codepen.png" style="max-height: 100px; padding-left: 5%;"></a>
261-
</div>
262-
<div class="custom-small">
263-
<a href="https://www.wolframalpha.com"><img class="last-year-spsr" src="static/sponsors/wolfram.png" style="max-height: 100px; padding-left: 5%;"></a>
264-
</div>
265-
<div class="custom-small">
266-
<a href="https://temboo.com"><img class="last-year-spsr" src="static/sponsors/temboo.png" style="max-height: 100px; padding-left: 15%;"></a>
267-
</div>
268-
</div>
269-
</div>
270-
</section><br><br><br><br>
271-
</div>
207+
<section id="sponsors">
272208

273209
<!-- desktop -->
274210
<div class="navbar-default hidden-xs">
275-
<section id="sponsors">
211+
<section>
276212
<div class="container-fluid">
277213
<div class="row text-center">
278214
<h1 class="contact-title">SPONSOR</h1>
@@ -348,8 +284,76 @@ <h4 align="center">Interested in sponsorsing Hack In The North?<br><br> Please s
348284
</section><br><br><br><br>
349285
</div>
350286

287+
<!-- mobile -->
288+
<div class="navbar-static-top visible-xs-block">
289+
<section id="sponsors">
290+
<div class="container-fluid">
291+
<div class="row text-center">
292+
<h1 class="contact-title">SPONSOR</h1>
293+
</div>
294+
<br>
295+
<div class="row">
296+
<div class="col-sm-8 col-sm-offset-2">
297+
<h4 align="center">Interested in sponsorsing Hack In The North?<br><br> Please see our <a href="#">sponsorship brochure</a> for more details.</h4>
298+
</div>
299+
</div>
300+
<br>
301+
<div class="row">
302+
<div class="custom-small">
303+
<a href="https://github.com"><img class="last-year-spsr" style="max-height: 100px; padding-left: 15%;" src="static/sponsors/GitHub_Logo.png"></a>
304+
</div>
305+
<div class="custom-small" >
306+
<a href="https://www.topcoder.com/"><img class="last-year-spsr" style="max-height: 100px; padding-left: 20%;" src="static/sponsors/topcoder.png"></a>
307+
</div>
308+
<div class="custom-small">
309+
<a href="https://www.heroku.com/"><img class="last-year-spsr" style="max-height: 100px; padding-left: 40%;" src="static/sponsors/heroku.svg"></a>
310+
</div>
311+
<div class="custom-small">
312+
<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>
313+
</div>
314+
<div class="custom-small">
315+
<a href="https://www.python.org/psf/"><img class="last-year-spsr" style="max-height: 100px; padding-left: 15%;" src="static/sponsors/PSF.png"></a>
316+
</div>
317+
</div>
318+
<div class="custom-small">
319+
<a href="http://get.tech/"><img class="last-year-spsr" src="static/sponsors/tech.png" style="max-height: 100px; padding-left: 15%;"></a>
320+
</div>
321+
<div class="custom-small" style="margin-left:5%">
322+
<a href="https://zulip.com/"><img class="last-year-spsr" src="static/sponsors/zulip.jpg" style="max-height: 100px; padding-left: 30%;"></a>
323+
</div>
324+
<div class="custom-small">
325+
<a href="https://www.digitalocean.com/"><img class="last-year-spsr" src="static/sponsors/DO.png" style="max-height: 100px; padding-left: 35%;"></a>
326+
</div>
327+
<div class="custom-small">
328+
<a href="http://hacksociety.tech/"><img class="last-year-spsr" src="static/sponsors/hacksociety.png" style="max-height: 100px; padding-left: 35%;"></a>
329+
</div>
330+
<div class="custom-small">
331+
<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>
332+
</div>
333+
<div class="custom-small">
334+
<a href="https://www.jetbrains.com"><img class="last-year-spsr" src="static/sponsors/jetbrains.png" style="max-height: 100px; padding-left: 35%;"></a>
335+
</div>
336+
<div class="custom-small">
337+
<a href="https://www.skillshare.com"><img class="last-year-spsr" src="static/sponsors/skillshare.png" style="max-height: 100px; padding-left: 22%;"></a>
338+
</div>
339+
<div class="custom-small col-md-offset-1">
340+
<a href="https://codepen.io/"><img class="last-year-spsr" src="static/sponsors/codepen.png" style="max-height: 100px; padding-left: 5%;"></a>
341+
</div>
342+
<div class="custom-small">
343+
<a href="https://www.wolframalpha.com"><img class="last-year-spsr" src="static/sponsors/wolfram.png" style="max-height: 100px; padding-left: 5%;"></a>
344+
</div>
345+
<div class="custom-small">
346+
<a href="https://temboo.com"><img class="last-year-spsr" src="static/sponsors/temboo.png" style="max-height: 100px; padding-left: 15%;"></a>
347+
</div>
348+
</div>
349+
</div>
350+
</section><br><br><br><br>
351+
</div>
352+
</section>
353+
354+
351355

352-
<div style="padding-bottom: 15%">
356+
<div style="padding: 0 15% 15% 15%">
353357
<section >
354358
<div class="col-md-10 col-md-offset-1" style="border: 2px solid #A95179;">
355359
<div>

‎static/css/cards.css‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,10 @@
8080
height: 90vh;
8181
}
8282

83-
#about {
83+
#about{
8484
text-align: justify;
85+
/*background: url('../img/1.jpg');
86+
background-size: cover;*/
8587
}
8688

8789
.card-panel {
@@ -251,3 +253,6 @@
251253
margin-right: auto;
252254
margin-left: auto;
253255
}
256+
257+
258+

‎static/img/1.jpg‎

179 KB
Loading

‎static/img/2.png‎

177 KB
Loading

‎static/img/3.jpeg‎

143 KB
Loading

‎static/img/4.jpg‎

81.3 KB
Loading

0 commit comments

Comments
 (0)