Skip to content
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

added Gal and Shai + images #1

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

added Gal and Shai + images #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
186e05d
Added a pic of Eliezer
elie222 Dec 5, 2013
72987de
Tom html and image
Nagasaki45 Dec 5, 2013
2b6603c
Omri Dor added
omridor Dec 5, 2013
6fb6c5d
omridor.jpg uploaded
omridor Dec 5, 2013
59b6568
added Gal and Shai + images
shaief Dec 5, 2013
6527e90
Added jumbotron css
elie222 Dec 5, 2013
c2305c8
added nir description
nirshub Dec 5, 2013
920570d
Added fb link
elie222 Dec 5, 2013
13683f1
Omri Dor buttons now lead to FB and GitHub
omridor Dec 5, 2013
cf48472
Merge remote-tracking branch 'tom/master'
nirshub Dec 5, 2013
6a3a4aa
Merge branch 'master' of https://github.com/elie222/hackita-thursdays
omridor Dec 5, 2013
5290d5f
added picture
nirshub Dec 5, 2013
09ef3a1
added pics
elie222 Dec 5, 2013
d6384d5
Merge branch 'master' of https://github.com/elie222/hackita-thursdays
omridor Dec 5, 2013
6f4afdc
fixed fb link
elie222 Dec 5, 2013
1fb807d
Merge branch 'master' of https://github.com/elie222/hackita-thursdays
omridor Dec 5, 2013
5c5d76c
Merge remote-tracking branch 'ordavid/master'
shaief Dec 5, 2013
4dcf841
Picture now square
omridor Dec 5, 2013
530f3e6
Merge remote-tracking branch 'omridor/master'
shaief Dec 5, 2013
8d9a8ae
changed picture size
nirshub Dec 5, 2013
6ab5959
changed picture style
nirshub Dec 5, 2013
e7e4508
Merge github.com:nirshub/hackita-thursdays
shaief Dec 5, 2013
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
47 changes: 25 additions & 22 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@

<link href="static/css/bootstrap.css" rel="stylesheet">

<!-- Custom styles for this template -->
<link href="static/css/jumbotron.css" rel="stylesheet">

</head>

<body>
Expand Down Expand Up @@ -99,33 +102,33 @@ <h3>Your Name Here </h3>
</div>
<div class="col-sm-6 col-md-3">
<div class="thumbnail">
<img src="http://placekitten.com/g/600/600" alt="...">
<img src="static/TomPic.jpg" alt="profile picture">
<div class="caption">
<h3>Your Name Here </h3>
<p>Some description</p>
<p><a href="#" class="btn btn-primary" role="button">Button</a> <a href="#" class="btn btn-default" role="button">Button</a></p>
<h3>Tom Gurion</h3>
<p>Musician and mathematician</p>
<p><a href="https://plus.google.com/+TomGurion/" class="btn btn-primary" role="button">Google Plus profile</a></p>
</div>
</div>
</div>
<div class="col-sm-6 col-md-3">
<div class="thumbnail">
<img src="http://placekitten.com/g/600/600" alt="...">
<img src="static/IMG_7768.JPG" alt="...">
<div class="caption">
<h3>Your Name Here </h3>
<p>Some description</p>
<p><a href="#" class="btn btn-primary" role="button">Button</a> <a href="#" class="btn btn-default" role="button">Button</a></p>
<h3>Nir Shub</h3>
<p>Hackita Rules</p>
<p><a href="www.linkedin.com/pub/nir-shub/" class="btn btn-primary" role="button">LinkedIn</a> <a href="http://www.facebook.com/nir.shub" class="btn btn-default" role="button">Facebook</a></p>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6 col-md-3">
<div class="thumbnail">
<img src="http://placekitten.com/g/600/600" alt="...">
<img src="static/EliezerSteinbock.jpg" alt="Eliezer">
<div class="caption">
<h3>Your Name Here </h3>
<p>Some description</p>
<p><a href="#" class="btn btn-primary" role="button">Button</a> <a href="#" class="btn btn-default" role="button">Button</a></p>
<h3>Eliezer Steinbock</h3>
<p>Sitting on a steinbock</p>
<p><a href="https://www.facebook.com/eliesteinbock" class="btn btn-primary" role="button">Facebook</a></p>
</div>
</div>
</div>
Expand Down Expand Up @@ -163,11 +166,11 @@ <h3>Your Name Here </h3>
<div class="row">
<div class="col-sm-6 col-md-3">
<div class="thumbnail">
<img src="http://placekitten.com/g/600/600" alt="...">
<img src="static/omridor.jpg">
<div class="caption">
<h3>Your Name Here </h3>
<p>Some description</p>
<p><a href="#" class="btn btn-primary" role="button">Button</a> <a href="#" class="btn btn-default" role="button">Button</a></p>
<h3>Omri Dor</h3>
<p>EE + CS + Physics @ Technion, knows some Android, never did any web development!</p>
<p><a href="https://www.facebook.com/omri.dor" class="btn btn-primary" role="button">Facebook</a> <a href="https://github.com/omridor" class="btn btn-default" role="button">GitHub</a></p>
</div>
</div>
</div>
Expand All @@ -183,20 +186,20 @@ <h3>Or David </h3>
</div>
<div class="col-sm-6 col-md-3">
<div class="thumbnail">
<img src="http://placekitten.com/g/600/600" alt="...">
<img src="static/Shai.jpg" alt="...">
<div class="caption">
<h3>Your Name Here </h3>
<p>Some description</p>
<h3>Shai</h3>
<p>Micro-plankton</p>
<p><a href="#" class="btn btn-primary" role="button">Button</a> <a href="#" class="btn btn-default" role="button">Button</a></p>
</div>
</div>
</div>
<div class="col-sm-6 col-md-3">
<div class="thumbnail">
<img src="http://placekitten.com/g/600/600" alt="...">
<img src="static/Gal.jpg" alt="...">
<div class="caption">
<h3>Your Name Here </h3>
<p>Some description</p>
<h3>Gal</h3>
<p>Phrynocepalus</p>
<p><a href="#" class="btn btn-primary" role="button">Button</a> <a href="#" class="btn btn-default" role="button">Button</a></p>
</div>
</div>
Expand Down
2 changes: 2 additions & 0 deletions static/.picasa.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[IMG_7768.JPG]
backuphash=40862
7 changes: 7 additions & 0 deletions static/.picasaoriginals/.picasa.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[IMG_7768.JPG]
filters=crop64=1,1d1c0000c78dffff;
crop=rect64(1d1c0000c78dffff)
moddate=001d9b5f4c59cd01
width=3456
height=2304
textactive=0
Binary file added static/.picasaoriginals/IMG_7768.JPG
View file
Open in desktop
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 static/EliezerSteinbock.jpg
View file
Open in desktop
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 static/Gal.jpg
View file
Open in desktop
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 static/IMG_7768.JPG
View file
Open in desktop
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 static/Shai.jpg
View file
Open in desktop
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 static/TomPic.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions static/css/jumbotron.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/* Move down content because we have a fixed navbar that is 50px tall */
body {
padding-top: 50px;
padding-bottom: 20px;
}
Binary file added static/omridor.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.