Skip to content

Tarun ks17 patch 1 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joltsama wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Tarun ks17 patch 1 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f5d8ae
Update index.html
joltsama Sep 17, 2017
f22b928
Update team.json
joltsama Sep 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 35 additions & 14 deletions data/team.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,49 @@

[
{
"name": "Miroojin Bakshi",
"name": "Divyansh Sagar",
"designation": "B. Tech (CSE), II year",
"email": "cse1200105@iiti.ac.in",
"fb": "https://www.facebook.com/mbakshi"
"email": "me160003009@iiti.ac.in",
"fb": "https://www.facebook.com/"
},{
"name":"B Krishna Chaitanya",
"name":"Manish Chandra",
"designation": "B. Tech (CSE), II year",
"email": "ee1200206@iiti.ac.in",
"fb": "https://www.facebook.com/The.BKC"
"email": "mems160005039@iiti.ac.in",
"fb": "https://www.facebook.com/"
},{
"name":"Aagam Shah",
"designation": "B. Tech (CSE), II year",
"email": "mems160005039@iiti.ac.in",
"fb": "https://www.facebook.com/"
},{
"name":"Umesh",
"designation": "B. Tech (CSE), II year",
"email": "mems160005039@iiti.ac.in",
"fb": "https://www.facebook.com/"
},{
"name":"Atul Choudhary",
"designation": "B. Tech (ME), II year",
"email": "me1200308@iiti.ac.in",
"fb": "https://www.facebook.com/atul.choudhary.904"
"name":"Tarun Kumar Singh",
"designation": "B. Tech (CSE), I year",
"email": "cse170001052@iiti.ac.in",
"fb": "https://www.facebook.com"
},{
"name":"Vibhor Pandhare",
"name":"Mrigrank Krishan",
"designation": "B. Tech (ME), III year",
"email": "vibhor.pandhare@gmail.com",
"fb": "https://www.facebook.com/vb6"
"fb": "https://www.facebook.com/"
},{
"name":"Aashish Aryan",
"name":"Megha Sharma",
"designation": "B. Tech (CSE), III year",
"email": "cs1100105@iiti.ac.in",
"fb": "https://www.facebook.com/aashish.aaryan.3"
"fb": "https://www.facebook.com/"
},{
"name": "Nemath Ahmed",
"designation": "B. Tech (CSE), II year",
"email": "cse1200105@iiti.ac.in",
"fb": "https://www.facebook.com/mbakshi"
},{
"name":"Vishnunarayan KI",
"designation": "B. Tech (CSE), II year",
"email": "ee1200206@iiti.ac.in",
"fb": "https://www.facebook.com/The.BKC"
Copy link
Copy Markdown
Member

@chaitan94 chaitan94 Sep 30, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you maybe want to either remove or change the email ids and fb URLs?

}
]
10 changes: 5 additions & 5 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<meta name="author" content="">
<link rel="shortcut icon" href="../../assets/ico/favicon.png">

<title>DoCM IITI</title>
<title>Designer's Guild IITI</title>

<!-- Bootstrap core CSS -->
<link href="css/bootstrap.css" rel="stylesheet">
Expand All @@ -25,7 +25,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a style="float:left;" class="navbar-brand" href="#">DoCM IITI</a>
<a style="float:left;" class="navbar-brand" href="#">Designer's Guild IITI</a>
<iframe src="//www.facebook.com/plugins/like.php?href=https%3A%2F%2Fwww.facebook.com%2Fdocm.iiti&amp;height=21&amp;colorscheme=dark&amp;layout=button_count&amp;show_faces=true" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:102px;height:50px;float:right; padding:15px;" allowTransparency="true"></iframe>
</div>
</div>
Expand All @@ -35,7 +35,7 @@
<div class="bg"><div class="bgfilter"></div></div>
<div class="container" ng-controller="teamCtrl">
<center>
<h1 class="centeredText headfont" style="margin: 40px;">Department of Creative Media, IIT Indore</h1>
<h1 class="centeredText headfont" style="margin: 40px;">Designer's Guild, IIT Indore</h1>
<div class="card" ng-repeat="mem in teamMembers">
<h3 class="centeredText headfont">{{mem.name}}</h3>
<div class="details">
Expand All @@ -55,7 +55,7 @@ <h3 class="centeredText headfont">{{mem.name}}</h3>
<center>
<iframe src="//www.facebook.com/plugins/likebox.php?href=https%3A%2F%2Fwww.facebook.com%2Fdocm.iiti&amp;width=900&amp;height=258&amp;colorscheme=dark&amp;show_faces=true&amp;header=false&amp;stream=false&amp;show_border=false" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:900px; height:258px; margin: 0 auto;" allowtransparency="true"></iframe>
<hr>
Deparment of Creative Media (C) . 2013 . IIT Indore
Designer's Guild(C) . 2017 . IIT Indore
</center>
</div>
</div>
Expand All @@ -65,4 +65,4 @@ <h3 class="centeredText headfont">{{mem.name}}</h3>
<script src="js/jquery.js"></script>
<script src="js/bootstrap.min.js"></script>
</body>
</html>
</html>