Skip to content

Commit

Permalink
Merge pull request #6 from GeekHaven/myChanges
Browse files Browse the repository at this point in the history 
added effervescence to events
  • Loading branch information
@Vihaan-19
Vihaan-19 authored Sep 14, 2023
2 parents aa97843 + 26d0dce commit 2c25d74
Show file tree
Hide file tree
Showing 8 changed files with 236 additions and 190 deletions.
Binary file added .DS_Store
View file
Binary file not shown.
Binary file added Images/.DS_Store
View file
Binary file not shown.
Binary file added Images/effe_logo.jpeg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/test_effe_logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions css/about.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,11 @@ License URL: https://creativecommons.org/licenses/by/4.0/
======================================================*/

.about-p3{
padding:50px 0 100px 0;
padding:0px 0 100px 0;
}

.about-p3 .container{
padding-top:100px;
padding-top:50px;
}

.about-p3 .container .story-himg-middle-u{
Expand Down
5 changes: 5 additions & 0 deletions css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1168,6 +1168,11 @@ input[type="password"] {
font-size: 14px;
}

.row {
padding: 5px;
margin: 25px;
}

@media (max-width: 767px) {
.story-descb {
padding: 10px 10px 30px 10px;
Expand Down
95 changes: 63 additions & 32 deletions events.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@


<!-- Mirrored from gymkhana.iiita.ac.in/portals.html by HTTrack Website Copier/3.x [XR&CO'2014], Mon, 14 Dec 2020 10:44:46 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=UTF-8" /><!-- /Added by HTTrack -->
<!-- Added by HTTrack -->
<meta http-equiv="content-type" content="text/html;charset=UTF-8" /><!-- /Added by HTTrack -->

<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="Gymkhana IIITA">
<meta name="author" content="Gymkhana">

<title>Gymkhana IIITA | Events</title>
<link rel="shortcut icon" href="img/favicon.ico">
<!-- Global Stylesheets -->
Expand All @@ -34,10 +36,12 @@
<nav class="navbar navbar-expand-lg navbar-light" id="mainNav" data-toggle="affix">
<div class="container">
<a class="navbar-brand smooth-scroll" href="index.html">
<img src="img/glogo-1.png" alt="logo" style="max-width: 100px; max-height: 100px; top: 5px; position: relative;">
<img src="img/glogo-1.png" alt="logo"
style="max-width: 100px; max-height: 100px; top: 5px; position: relative;">
</a>
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarResponsive"
aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse"
data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false"
aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarResponsive">
Expand Down Expand Up @@ -75,7 +79,8 @@
LOGIN OR REGISTER
======================================================-->
<section id="login">
<div class="modal fade" id="login-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal fade" id="login-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
aria-hidden="true" style="display: none;">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header" align="center">
Expand All @@ -88,9 +93,11 @@
<h3 class="text-center">Login</h3>
<div class="modal-body">
<label for="username">Username</label>
<input id="login_username" class="form-control" type="text" placeholder="Enter username " required>
<input id="login_username" class="form-control" type="text"
placeholder="Enter username " required>
<label for="username">Password</label>
<input id="login_password" class="form-control" type="password" placeholder="Enter password" required>
<input id="login_password" class="form-control" type="password"
placeholder="Enter password" required>
<div class="checkbox">
<label>
<input type="checkbox"> Remember me
Expand All @@ -110,11 +117,14 @@ <h3 class="text-center">Login</h3>
<h3 class="text-center">Register</h3>
<div class="modal-body">
<label for="username">Username</label>
<input id="register_username" class="form-control" type="text" placeholder="Enter username" required>
<input id="register_username" class="form-control" type="text"
placeholder="Enter username" required>
<label for="register_email">E-mailId</label>
<input id="register_email" class="form-control" type="text" placeholder="Enter eMail" required>
<input id="register_email" class="form-control" type="text" placeholder="Enter eMail"
required>
<label for="register_password">Password</label>
<input id="register_password" class="form-control" type="password" placeholder="Password" required>
<input id="register_password" class="form-control" type="password"
placeholder="Password" required>
</div>
<div class="modal-footer">
<div>
Expand Down Expand Up @@ -202,6 +212,23 @@ <h5>BRANDING &amp; STRATEGY</h5>
======================================================-->
<section id="story" class="about-p3">
<div class="container">
<div class="row">
<div class="col-md-6">
<div class="story-desc">
<h3>Effervescence</h3>
<div class="heading-border-light"></div>
<!-- <p>Number one in our priority list is the success of our students, alumni and their employers. We work hard in the name of the success of our alumni – being among the best and holding the high employment rate. Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. </p> -->
<p>Cultural Fest of IIITA</p>
<div style="color:#f99e00; font-size:1.5rem">Date: 26th - 28th October, 2023</div>
</div>
</div>
<div class="col-md-6">
<div class="story-himg">
<!-- Add effe image here -->
<img src="Images/test_effe_logo.png" class="img-fluid wow fadeInUp" data-wow-delay="0.1s" alt="">
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="story-desc">
Expand Down Expand Up @@ -357,28 +384,31 @@ <h3>Exciting New Technologies</h3>
<!--====================================================
FOOTER
======================================================-->
<footer>
<div id="footer-s1" class="footer-s1">
<div class="footer">
<div class="container">
<div class="row">
<div class="col-md-3" style="text-align:center;">
<img src="img/glogo-1.png" style="max-width: 100px; max-height: 100px; position: relative; top: -15px;">
</div>
<div class="col-md-6" style="text-align:center;">
<p style="position: relative; top: 15px;">Website designed and developed by
<a href="https://geekhaven.iiita.ac.in" target="_blank">Web Development Wing </a>, <a target="_blank" href="https://geekhaven.iiita.ac.in">GeekHaven.</a></a>
</p>
</div>
<div class="col-md-3" style="text-align:center;">
<img src="img/iiitLogo.gif" class="footer-img" style="max-width: 100px; max-height: 100px; position: relative;">
</div>
<footer>
<div id="footer-s1" class="footer-s1">
<div class="footer">
<div class="container">
<div class="row">
<div class="col-md-3" style="text-align:center;">
<img src="img/glogo-1.png"
style="max-width: 100px; max-height: 100px; position: relative; top: -15px;">
</div>
<div class="col-md-6" style="text-align:center;">
<p style="position: relative; top: 15px;">Website designed and developed by
<a href="https://geekhaven.iiita.ac.in" target="_blank">Web Development Wing </a>, <a
target="_blank" href="https://geekhaven.iiita.ac.in">GeekHaven.</a></a>
</p>
</div>
<div class="col-md-3" style="text-align:center;">
<img src="img/iiitLogo.gif" class="footer-img"
style="max-width: 100px; max-height: 100px; position: relative;">
</div>

</div>
</div>
</div>
</div>
</div>
</div>
</div>
</footer>
</footer>
<!--Global JavaScript -->
<script src="js/jquery/jquery.min.js"></script>
<script src="js/popper/popper.min.js"></script>
Expand All @@ -392,4 +422,5 @@ <h3>Exciting New Technologies</h3>


<!-- Mirrored from gymkhana.iiita.ac.in/portals.html by HTTrack Website Copier/3.x [XR&CO'2014], Mon, 14 Dec 2020 10:44:48 GMT -->
</html>

</html>
Loading

0 comments on commit 2c25d74

Please sign in to comment.