Skip to content

Commit

Permalink
Merge pull request #3 from ihsavru/master
Browse files Browse the repository at this point in the history
Added changes to home page
  • Loading branch information
krishnarai30 authored Aug 27, 2017
2 parents 9224eaf + 29b1305 commit 483f6df
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 27 deletions.
5 changes: 4 additions & 1 deletion css/responsive.css
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,10 @@ px 68 160 252 344 436 528 620 712 */
display: none;
}
.map_area > div#googleMap {
height: 360px;
height: 360px;
}
#googleMap{
width: 70% !important;
}
.contact_info_top {
min-height: 259px;
Expand Down
Binary file added img/DSC_0074.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/about-one.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/about-two.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 19 additions & 16 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,9 @@ <h1>events</h1>
<div class="single_price">
<div class="price_head">
<h3>Internship Fair</h3>
<div class="price">
<i class="fa fa-users" aria-hidden="true"></i>
</div>
</div>
<div class="price_content">
<ul>
Expand All @@ -198,6 +201,9 @@ <h3>Internship Fair</h3>
<div class="single_price">
<div class="price_head">
<h3>HackDTU 2.0</h3>
<div class="price">
<i class="fa fa-clock-o" aria-hidden="true"></i>
</div>
</div>
<div class="price_content">
<ul>
Expand All @@ -218,6 +224,9 @@ <h3>HackDTU 2.0</h3>
<div class="single_price">
<div class="price_head">
<h3>Code In Less</h3>
<div class="price">
<i class="fa fa-code" aria-hidden="true"></i>
</div>
</div>
<div class="price_content">
<ul>
Expand Down Expand Up @@ -344,13 +353,6 @@ <h5>Contact Information</h5>
<p>+91 - 9717430033</p>
</div>
</div>
<div class="contact_link">
<ul>
<li><a href="https://www.facebook.com/iosddtu" class="icon-facebook"></a></li>
<li><a href="https://twitter.com/iosoftwared" class="icon-twitter"></a></li>
<li><a href="https://www.linkedin.com/company/iosd?trk=ppro_cprof" class="icon-linkedin"></a></li>
</ul>
</div>
</div>
</div>
</section>
Expand All @@ -366,15 +368,16 @@ <h5>Contact Information</h5>
<div class="row">
<div class="col-md-6 col-md-offset-3">
<a href="#" class="footer_logo">Synergy 2.0</a>
<div class="footer_link">
<ul>
<li><a href="https://www.facebook.com/iosddtu" class="icon-facebook"></a></li>
<li><a href="#" class="icon-twitter"></a></li>
<li><a href="" class="icon-googleplus"></a></li>
<li><a href="https://www.linkedin.com/company/iosd?trk=ppro_cprof" class="icon-linkedin"></a></li>
</ul>
</div>
</div>
<div class="contact_link">
<ul>
<li><a href="mailto:[email protected]" class="fa fa-envelope"></a></li>
<li><a href="https://www.facebook.com/iosddtu" class=" fa fa-facebook"></a></li>
<li><a href="https://www.twitter.com/iosoftwared" class="fa fa-twitter"></a></li>
<li><a href="https://github.com/IOSD" class="fa fa-github"></a></li>
<li><a href="https://www.instagram.com/iosdofficial/" class="fa fa-instagram"></a></li>
<li><a href="https://www.linkedin.com/company/iosd?trk=ppro_cprof" class="fa fa-linkedin"></a></li>
</ul>
</div>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion js/active.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jQuery(document).ready(function ($) {
//countdown timer

$('.count_down').countdown('2017/10/13', function (event) {
$(this).html(event.strftime('<div class="single_count"><h1>%D</h1><p>Days</p></div><div class="single_count"><h1>%H</h1><p>Hour</p></div><div class="single_count"><h1>%M</h1><p>Minute</p></div><div class="single_count"><h1>%S</h1><p>Secound</p></div>'));
$(this).html(event.strftime('<div class="single_count"><h1>%D</h1><p>Days</p></div><div class="single_count"><h1>%H</h1><p>Hour</p></div><div class="single_count"><h1>%M</h1><p>Minute</p></div><div class="single_count"><h1>%S</h1><p>Second</p></div>'));
});


Expand Down
19 changes: 10 additions & 9 deletions style.css
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ body {

header {
height: 400px;
background: url(img/header-bg.jpg);
background: url(img/DSC_0074.jpg);
background-size: cover;
background-position: center;
position: relative;
Expand Down Expand Up @@ -541,7 +541,7 @@ nav#navbar {
}

.home .header_bottom_area {
bottom: 0;
bottom: 25px;
position: absolute;
width: 100%;
display: block
Expand Down Expand Up @@ -1339,7 +1339,7 @@ figure:hover .fighvr {
.price_head {
position: relative;
margin-bottom: 60px;
padding-bottom: 30px;
padding-bottom: 60px;
}

.price_head:after {
Expand Down Expand Up @@ -1677,6 +1677,8 @@ dd {

.map_area {
position: relative;
width: 70%;
left: 15%;
}

.map_content_area {
Expand All @@ -1689,19 +1691,19 @@ dd {
.map_content {
background: #d32f2f none repeat scroll 0 0;
color: #fff;
height: 100%;
height: 460px;
top: 0;
width: 310px;
}

.contact_info_top {
padding: 55px 35px 0;
padding: 65px 35px 0;
min-height: 329px;
}

.contact_info_top > h5 {
font-size: 18px;
margin-bottom: 55px;
margin-bottom: 75px;
text-align: center;
text-transform: uppercase;
}
Expand Down Expand Up @@ -1734,7 +1736,6 @@ dd {

.contact_link {
text-align: center;
border-top: 1px solid #bf2828;
}

.contact_link > ul {
Expand All @@ -1745,6 +1746,7 @@ dd {
.contact_link > ul > li {
display: inline;
margin-right: 9px;
line-height: 50px;
}

.contact_link > ul > li > a {
Expand All @@ -1769,13 +1771,12 @@ dd {
.contact_link > ul > li > a:hover {
color: #d32f2f
}


/* ****************************************
>>> 1.13 Footer styles
** ************************************* */

footer {
margin-top: 50px;
background: #08213d;
}

Expand Down

0 comments on commit 483f6df

Please sign in to comment.