Skip to content

Commit efd6f68

Browse files
committed
Merge branch '6-robots-struct' into develop, #6
2 parents 0466ca4 + d8d1019 commit efd6f68

4 files changed

Lines changed: 146 additions & 0 deletions

File tree

_includes/header.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
<li>
2525
<a class="page-scroll" href="#portfolio">Members</a>
2626
</li>
27+
<li>
28+
<a class="page-scroll" href="#robots">Robots</a>
29+
</li>
2730
<li>
2831
<a class="page-scroll" href="#contact">Contact</a>
2932
</li>

_includes/robots.html

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
<!-- Robots Section -->
2+
<section id="robots">
3+
<div class="container">
4+
<div class="row">
5+
<div class="col-lg-12 text-center">
6+
<h2 class="section-heading">Robots</h2>
7+
<h3 class="section-subheading text-muted">Robots we have at our lab</h3>
8+
</div>
9+
</div>
10+
<div class="row">
11+
<div class="col-lg-12">
12+
<ul class="timeline">
13+
14+
<li>
15+
<div class="timeline-image">
16+
<img class="img-circle img-responsive" src="img/robots/default.png" alt="">
17+
</div>
18+
<div class="timeline-panel">
19+
<div class="timeline-heading">
20+
<h4>iCub</h4>
21+
<h4 class="subheading">iCub Description</h4>
22+
</div>
23+
<div class="timeline-body">
24+
<ul>
25+
<li>
26+
<p class="text-muted">
27+
Bullet point 1
28+
</p>
29+
</li>
30+
<li>
31+
<p class="text-muted">
32+
Bullet point 2
33+
</p>
34+
</li>
35+
<li>
36+
<p class="text-muted">
37+
Bullet point 3
38+
</p>
39+
</li>
40+
</ul>
41+
</div>
42+
</div>
43+
</li>
44+
45+
<li class="timeline-inverted">
46+
<div class="timeline-image">
47+
<img class="img-circle img-responsive" src="img/robots/default.png" alt="">
48+
</div>
49+
<div class="timeline-panel">
50+
<div class="timeline-heading">
51+
<h4>Robot 2</h4>
52+
<h4 class="subheading">Robot 2 Description</h4>
53+
</div>
54+
<div class="timeline-body">
55+
<ul>
56+
<li>
57+
<p class="text-muted">
58+
Bullet point 1
59+
</p>
60+
</li>
61+
<li>
62+
<p class="text-muted">
63+
Bullet point 2
64+
</p>
65+
</li>
66+
<li>
67+
<p class="text-muted">
68+
Bullet point 3
69+
</p>
70+
</li>
71+
</ul>
72+
</div>
73+
</div>
74+
</li>
75+
76+
<li>
77+
<div class="timeline-image">
78+
<img class="img-circle img-responsive" src="img/robots/default.png" alt="">
79+
</div>
80+
<div class="timeline-panel">
81+
<div class="timeline-heading">
82+
<h4>Robot 3</h4>
83+
<h4 class="subheading">Robot 3 Description</h4>
84+
</div>
85+
<div class="timeline-body">
86+
<ul>
87+
<li>
88+
<p class="text-muted">
89+
Bullet point 1
90+
</p>
91+
</li>
92+
<li>
93+
<p class="text-muted">
94+
Bullet point 2
95+
</p>
96+
</li>
97+
<li>
98+
<p class="text-muted">
99+
Bullet point 3
100+
</p>
101+
</li>
102+
</ul>
103+
</div>
104+
</div>
105+
</li>
106+
107+
<li class="timeline-inverted">
108+
<div class="timeline-image">
109+
<img class="img-circle img-responsive" src="img/robots/default.png" alt="">
110+
</div>
111+
<div class="timeline-panel">
112+
<div class="timeline-heading">
113+
<h4>Robot 4</h4>
114+
<h4 class="subheading">Robot 4 Description</h4>
115+
</div>
116+
<div class="timeline-body">
117+
<ul>
118+
<li>
119+
<p class="text-muted">
120+
Bullet point 1
121+
</p>
122+
</li>
123+
<li>
124+
<p class="text-muted">
125+
Bullet point 2
126+
</p>
127+
</li>
128+
<li>
129+
<p class="text-muted">
130+
Bullet point 3
131+
</p>
132+
</li>
133+
</ul>
134+
</div>
135+
</div>
136+
</li>
137+
138+
</ul><!-- class="timeline" -->
139+
</div><!-- col -->
140+
</div><!-- row -->
141+
</div><!-- container -->
142+
</section>

_layouts/default.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
{% include header.html %}
1010
{% include about.html %}
1111
{% include members.html title='Members' collection=site.members%}
12+
{% include robots.html %}
1213
{% include contact.html %}
1314
{% include footer.html %}
1415
{% include modals.html %}

img/robots/default.png

21.6 KB
Loading

0 commit comments

Comments
 (0)