Skip to content

Commit

Permalink
Merge pull request #7 from YashAgr5980/master
Browse files Browse the repository at this point in the history 
Updates to links and images and new carousel
  • Loading branch information
@YashAgr5980
YashAgr5980 authored Nov 6, 2018
2 parents 8aff8da + f56f2a6 commit 023b369
Show file tree
Hide file tree
Showing 5 changed files with 231 additions and 36 deletions.
73 changes: 52 additions & 21 deletions about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,30 @@
<body>
<nav class="navbar fixed-top navbar-custom navbar-expand-lg">
<div class="container-fluid">
<a class="navbar-brand" href="#"><img src="src/img/logo.jpg"></a>
<a class="navbar-brand" href="index.html"><img src="src/img/logo.jpg"></a>
<button class="navbar-toggler" id="navbar-toggler-icon" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon" ></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<li class="nav-item active">
<a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a>
<a class="nav-link" href="index.html">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">About</a>
<a class="nav-link" href="about.html">About</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Achievements</a>
<a class="nav-link" href="events.html">Events</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Projects</a>
<a class="nav-link" href="projects.html">Projects</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#contact">Contact</a>
</li>
</ul>
<div class="nav nav-navbar navbar-right">
<a class="nav-link" href="#"><img src="src/img/lnmiitlogo.jpg" id="lnmiitlogo"></a>
<a class="nav-link" href="https://www.lnmiit.ac.in/" target="_blank"><img src="src/img/lnmiitlogo.jpg" id="lnmiitlogo"></a>
</div>
</div>
</div>
Expand All @@ -50,7 +53,7 @@
<div class="container home-intro">
<div class="row row-header align-items-center">
<div class="col-12">
<h1 class="header-text rubberBand animated">Our Family</h1>
<h1 class="header-text rubberBand animated">Our Team</h1>
<p class="header-para">Meet the different divisions of Phoenix and all the dedicated members.</p>
</div>
</div>
Expand All @@ -63,7 +66,7 @@ <h1 class="header-text rubberBand animated">Our Family</h1>
<br>
<div class="row row-header align-items-center">
<div class="col-12">
<h3 class="header-para">Check out what our members are working on <a href=""><span class="fa fa-chevron-right"></span></a></h3>
<h3 class="header-para">Check out what our members are working on <a href="projects.html"><span class="fa fa-chevron-right"></span></a></h3>
</div>
</div>
</div>
Expand Down Expand Up @@ -97,7 +100,7 @@ <h4 class="designation">Club Coordinator</h4>
</div>
</div>
</div>

<hr>



Expand Down Expand Up @@ -200,8 +203,7 @@ <h4 class="name">Madhu Vinay</h4>
</div>
</div>
</div>


<hr>



Expand Down Expand Up @@ -282,11 +284,7 @@ <h4 class="name">Raj Vaibhav Dubey</h4>
</div>
</div>
</div>





<hr>


<div class="row divisions-row align-items-center">
Expand Down Expand Up @@ -402,17 +400,13 @@ <h4 class="name">Sumedha Rana</h4>
</div>
</div>
</div>




<hr>


<div class="row divisions-row align-items-center">
<div class="col-sm-6">
<div class="row align-items-center">
<h2 class="division-heading">Quarks</h2>
<hr>
</div>
</div>
<div class="col-sm-6">
Expand Down Expand Up @@ -510,10 +504,47 @@ <h4 class="name">Yash Agrawal</h4>
</div>
</div>
</div>
<hr>


</div>
</div>
<footer class="footer-text" id="contact">
<div class="footer-container">
<div class="row footer-row">
<div class="col-sm-4 align-items-center">
<h4>Links</h4>
<ul class="list-unstyled">
<li><a href="index.html" style="color: #FFA500;">Home</a></li>
<li><a href="about.html" style="color: #FFA500;">About</a></li>
<li><a href="events.html" style="color: #FFA500;">Achievements</a></li>
<li><a href="projects.html" style="color: #FFA500;">Projects</a></li>
</ul>
</div>
<div class="col-sm-4 align-items-center">
<div class="row">
<div class="col-sm-6">
<a href="index.html"><img src="src/img/logo.jpg" class="footer-image"></a>
</div>
<div class="col-sm-6">
<a href="https://www.lnmiit.ac.in/" target="_blank"><img src="src/img/lnmiitlogo.jpg" class="footer-image"></a>
</div>
<div class="col-sm-12">
<a href="https://www.google.co.in/maps/place/LNMIIT/@26.9363461,75.9213346,17z/data=!3m1!4b1!4m5!3m4!1s0x396dba21e8a1d1c9:0x5ab565cce4d44c2b!8m2!3d26.9363461!4d75.9235233"><span class="fa fa-map-marker"></span></a> <br>
The LNM Institute of Information Technology, <br>
Rupa Ki Nanagal, Post-Sumel, <br>
Jaipur, 302031
</div>
</div>
</div>
<div class="col-sm-4 align-items-center">
<a href="https://www.facebook.com/phoenix.lnmiit/"><span class="fa fa-facebook footer-social"></span></a> &emsp;
<a href="https://www.youtube.com/channel/UCkgCJ_wF-E35nU_6HZGF0Sg"><span class="fa fa-youtube footer-social"></span></a> &emsp;
<a href="mailto:[email protected]"><span class="fa fa-envelope-o footer-social"></span></a> &emsp;
</div>
</div>
</div>
</footer>


<script src="node_modules/jquery/jquery.min.js"></script>
Expand Down
10 changes: 5 additions & 5 deletions css/about.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
font-size: 100px;
}
.coordinator-image {
width: 200px;
height: 200px;
width: 150px;
height: 150px;
border-radius: 50%;
}
.member-image {
width: 100px;
height: 100px;
width: 75px;
height: 75px;
border-radius: 50%;
}
.card {
Expand Down Expand Up @@ -57,4 +57,4 @@
color: #FFA500;
font-size: 18px;
font-family: 'Average', serif;
}
}
70 changes: 67 additions & 3 deletions css/index.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ body {
font-family: Lato, sans-serif;
}


#navbar-toggler-icon {
color: #FFA500;
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 5 32 23' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#FFA500' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 8h24M4 16h24M4 24h24'/%3E%3C/svg%3E");
Expand All @@ -10,7 +11,7 @@ body {
margin-right: 0;
}
.navbar-custom {
padding: 10px;
padding: 0px 10px;
background-color: rgba(0,0,0,0.2);
}
.nav-item, .navbar-brand {
Expand All @@ -25,7 +26,7 @@ body {

#lnmiitlogo {
width: 80px;
height: 40px;
height: 30px;
float: right;
margin-left: 10px;
}
Expand Down Expand Up @@ -73,8 +74,11 @@ h1 {
border-color: #FFA500;
width: 200px;
}
.header-botton:hover {
.header-button:hover {
color: #fff;
background-color: #FFA500;
border-color: #FFA500;
font-style: normal;
}


Expand All @@ -93,4 +97,64 @@ h1 {
.club-row-inline {
font-weight: 600;
color: #FFA500;
}

.highlight-container {
margin: 0px !important;
padding-top: 30px;
padding-bottom: 0px;
padding-left: 0px;
padding-right: 0px;
}
.highlight-text {
font-family: 'Krub', sans-serif;
text-align: center;
font-size: 50px;
}
.carousel-image {
height: 600px;
width: 100%;
}




.footer-container {
background-color: #000;
margin: 0px !important;
padding-top: 25px;
min-height: 250px !important;
}
.footer-row {

font-family: 'Krub', sans-serif;
padding: 20px 0px;
text-align: center;
color: #FFA500;
}
.footer-row-extra {
background-color: #FFA500;
max-height: 50px;
}
.footer-image {
width: 150px;
height:50px;
margin-top: 10px;
}
.footer-social {
font-size: 30px;
margin-top: 20px;
}
.fa-facebook {
color: #4267B2;
}
.fa-youtube {
color: #FF0000;
}
.fa-envelope-o {
color: #cccccc;
}
.fa-map-marker {
font-size: 30px;
color: #FFA500;
}
Loading

0 comments on commit 023b369

Please sign in to comment.