Skip to content

Commit

Permalink
update team
Browse files Browse the repository at this point in the history
  • Loading branch information
@prateekkumarweb
prateekkumarweb committed Dec 14, 2016
1 parent 8743542 commit 9f1e623
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 26 deletions.
6 changes: 3 additions & 3 deletions frontend/css/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,15 @@ body {
}

.dropdown-menu {
background-color: transparent;
text-align: center;
border-color: rgba(200, 200, 200, 0.8);
background-color: rgba(50, 50, 50, 0.3) !important;
}
.btnfosd {
font-size: 1.2em;
color: white !important;
}
.btnfosd:hover {
background-color: transparent !important;
/*background-color: transparent !important;*/
color: white !important;
}
.btnfosd {
Expand Down
5 changes: 4 additions & 1 deletion frontend/css/team.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,14 @@ body {
}

@media screen and (max-width: 600px) {
body {
overflow-x: hidden;
}
.timeline .teamline li {
margin-left: 20px;
}
.timeline .teamline li .profile-group {
width: calc(100vw - 91px);
width: calc(90vw - 91px);
}
.timeline .teamline li:nth-of-type(odd) .profile-group {
left: 45px;
Expand Down
24 changes: 13 additions & 11 deletions frontend/exhibitions.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>nvision 2017</title>
<title>&eta;vision 2017</title>
<link rel="stylesheet" href="/css/animate.css">
<!-- <link rel="stylesheet" href="/css/updates.css"> -->
<link rel="stylesheet" href="/css/bootstrap.min.css">
Expand Down Expand Up @@ -273,7 +273,7 @@ <h3><b>Updates</b></h3>
<div class="container-fluid">
<div class="row center">
<div class="col-xs-12">
<h1 style="font-size:4em;margin:0.2em">EXHIBITIONS</h1>
<h1 style="font-size:3em;margin:0.2em">EXHIBITIONS</h1>
<ul class="nav nav-tabs">
</ul>
</div>
Expand All @@ -284,16 +284,18 @@ <h1 style="font-size:4em;margin:0.2em">EXHIBITIONS</h1>
</div>
<div class="col-md-8">
<p class="" style="font-size:1.5em;padding:1% 5%;">
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis
aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint
occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
Exhibitions showcases a plethora of innovations and recent developments in science and technology from all around the world. It’s a platform for tech enthusiasts and students from all over the country to learn, experience and interact with experts who have brought these into existence.
</p>
<p class="" style="font-size:1.5em;padding:1% 5%;">
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis
aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint
occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
<p style="font-size:1.5em;padding: 1% 5%;">
The theme of &eta;vision this year is “The Future Tech” - which focuses on the cool upcoming tech. But cool innovations not falling under these verticals are most definitely welcome.
</p>
<p style="font-size:1.5em;padding: 1% 5%;">
Do you think your company has products like these which will enthrall the audience and capture their imaginations ? Do you want to reach out to students, scientists, potential customers and various other MNC’s coming down to &eta;vision every year ? Do you want to associate with brand IIT Hyderabad, the best engineering college in the country ?
</p>
<p style="font-size:1.5em;padding: 1% 5%;">
Then all you’ve got to do is fill up this google <a href="https://goo.gl/T4uuAJ" target="_blank">form</a>, and &eta;vision representative will get in touch with you soon.
<br>
Stay tuned for updates
</p>
</div>
</div>
Expand Down
Binary file added frontend/img/exhibition.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.
7 changes: 5 additions & 2 deletions frontend/team.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<link rel="stylesheet" href="css/materialize.min.css">
<link rel="stylesheet" href="css/hexagons.min.css">
<link rel="stylesheet" href="css/style.css">
<link rel="stylesheet" href="css/stars.css">
<link rel="stylesheet" href="css/stars.css" media="only screen and (min-width: 600px)">
<link rel="stylesheet" href="css/team.css">
<link rel="stylesheet" href="css/main.css">
<!-- <link rel="stylesheet" href="css/updates.css"> -->
Expand Down Expand Up @@ -88,7 +88,7 @@ <h3><b>Updates</b></h3>
<nav id="navbar-top" class="navbar navbar-inverse navbar-fixed-top">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" data-activates="slide-out" class="navbar-toggle collapsed button-collapse" aria-expanded="false" style="background-color:#000;position:fixed;right:0">
<button type="button" data-activates="slide-out" class="navbar-toggle collapsed button-collapse" aria-expanded="false" style="background-color:#000;position:fixed;right:0;top:0">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
Expand Down Expand Up @@ -587,6 +587,9 @@ <h1 style="font-size:2.5em;">TEAM</h1>
$(".pphone").each(function(){
$(this).attr("href", "tel:"+$(this).text());
});
if($(window).width() < 600) {
$(".timeline li").addClass("in-view");
}
});
</script>
<!-- <script src="/js/updates.js"></script> -->
Expand Down
2 changes: 1 addition & 1 deletion frontend/workshops.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ <h1 style="font-size:2.5em;">WORKSHOPS</h1>
<div class="col-md-6 text-center thumbnail" style="background-color:transparent;border:0;padding:2em;">
<img class="img-responsive center-block" src="img/workshops/wac.jpg">
<p style="font-size:1em;margin-top:1em;">
ηvision, IIT Hyderabad now brings to you the first workshop of the year 2016. As the name suggests it's a workshop on fitness band. ηvision, IIT Hyderabad in association with Robokart presents you with an opportunity to learn how to make a fitness band on your own.
ηvision, IIT Hyderabad now brings to you a series of workshops. ηvision, IIT Hyderabad in association with What After College presents you with workshops on differnet fields.
</p>
<a href="https://nvision.org.in/what-after-college" target="_blank" id="register-btn">More</a>
</div>
Expand Down
7 changes: 7 additions & 0 deletions lib/detectmobilebrowser.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 10 additions & 7 deletions routes/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,16 @@ keystone.set('500', function(err, req, res, next) {

// Bind Routes
exports = module.exports = function(app) {
// views
app.get('/', routes.views.index);
app.get('/sponsors', routes.views.sponsors);
app.get('/events', routes.views.events);
app.get('/team', routes.views.team);
app.get('/workshops', routes.views.workshops);
app.get('/exhibitions', routes.views.exhibitions);
// views
app.get('/mobile', (req, res) => {
res.send(require('../lib/detectmobilebrowser')(req));
})
app.get('/', routes.views.index);
app.get('/sponsors', routes.views.sponsors);
app.get('/events', routes.views.events);
app.get('/team', routes.views.team);
app.get('/workshops', routes.views.workshops);
app.get('/exhibitions', routes.views.exhibitions);
app.get('/events/:event', (req, res) => {
Event.model.findOne({link: `/events/${req.params.event}`})
.then(e => {
Expand Down
2 changes: 1 addition & 1 deletion templates/views/workshops.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ <h1 style="font-size:2.5em;">WORKSHOPS</h1>
<div class="col-md-6 text-center thumbnail" style="background-color:transparent;border:0;padding:2em;">
<img class="img-responsive center-block" src="img/workshops/wac.jpg">
<p style="font-size:1em;margin-top:1em;">
ηvision, IIT Hyderabad now brings to you the first workshop of the year 2016. As the name suggests it's a workshop on fitness band. ηvision, IIT Hyderabad in association with Robokart presents you with an opportunity to learn how to make a fitness band on your own.
ηvision, IIT Hyderabad now brings to you a series of workshops. ηvision, IIT Hyderabad in association with What After College presents you with workshops on differnet fields.
</p>
<a href="https://nvision.org.in/what-after-college" target="_blank" id="register-btn">More</a>
</div>
Expand Down

0 comments on commit 9f1e623

Please sign in to comment.