diff --git a/public/assets/css/bootstrap.css b/public/assets/css/bootstrap.css
index c7d4192bb7387999087d5046b5aa4e60180a4ebb..9a9964b5ebcf29ef1d55b55309fca7747342bb66 100644
--- a/public/assets/css/bootstrap.css
+++ b/public/assets/css/bootstrap.css
@@ -4234,6 +4234,11 @@ header {
text-align: center;
margin-bottom: -75px; }
+@media (max-width: 767px) {
+ .navbar-brand > img {
+ height: 60px;
+ margin-top: -14px; } }
+
main.main {
/* Item box: Layout item */
/* Project list: projects.html */ }
@@ -4496,9 +4501,13 @@ main.main {
top: -20px;
position: absolute; }
main.main .videos h2 {
- background-image: url(../images/heading-upcoming_events.jpg); }
+ background-image: url(../images/heading-featured.png); }
+ main.main .videos h2 span {
+ background-image: url(../images/heading-videos-icon.png); }
main.main .presentations h2 {
- background-image: url(../images/heading-upcoming_events.jpg); }
+ background-image: url(../images/heading-featured.png); }
+ main.main .presentations h2 span {
+ background-image: url(../images/heading-presentations-icon.png); }
main.main .tutorials .featured-tutorial-item {
background-image: url(../images/open-iot-bg.jpg);
background-size: cover;
diff --git a/public/assets/images/heading-presentations-icon.png b/public/assets/images/heading-presentations-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..07ef94442f1b64b5291dd4292de1bcc38727e114
Binary files /dev/null and b/public/assets/images/heading-presentations-icon.png differ
diff --git a/public/assets/images/heading-video-icon.png b/public/assets/images/heading-video-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..861c86bcb24875bbc5a0bdf6b7b62ee64a537aab
Binary files /dev/null and b/public/assets/images/heading-video-icon.png differ
diff --git a/public/assets/images/heading-videos-icon.png b/public/assets/images/heading-videos-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..861c86bcb24875bbc5a0bdf6b7b62ee64a537aab
Binary files /dev/null and b/public/assets/images/heading-videos-icon.png differ
diff --git a/public/assets/stylesheets/theme/_main.scss b/public/assets/stylesheets/theme/_main.scss
index 9d194f3182dc1bf281dbb355e859c0cb4c638726..ea503f69fd545ac52b3a8ed02ebbf7131ab24240 100644
--- a/public/assets/stylesheets/theme/_main.scss
+++ b/public/assets/stylesheets/theme/_main.scss
@@ -1,3 +1,10 @@
+.navbar-brand > img {
+ @media (max-width: $screen-xs-max) {
+ height: 60px;
+ margin-top: -14px;
+ }
+}
+
main.main {
p, li {
color: $gray;
@@ -363,12 +370,18 @@ main.main {
// getting started page
.videos {
h2 {
- background-image: url(../images/heading-upcoming_events.jpg);
+ background-image: url(../images/heading-featured.png);
+ span {
+ background-image: url(../images/heading-videos-icon.png);
+ }
}
}
.presentations {
h2 {
- background-image: url(../images/heading-upcoming_events.jpg);
+ background-image: url(../images/heading-featured.png);
+ span {
+ background-image: url(../images/heading-presentations-icon.png);
+ }
}
}
.tutorials {
diff --git a/public/getting-started.html b/public/getting-started.html
index a10d96a0ddb988342f65c40e82cf62778a321c66..070d9f1ff37d27161242db135f6241f52f1b2b9b 100644
--- a/public/getting-started.html
+++ b/public/getting-started.html
@@ -106,7 +106,7 @@
<div class="container">
<div class="row tutorials">
<div class="col-md-12">
- <h1 class="purple">Tutorial</h1>
+ <h1 class="purple">Connected Greenhouse Tutorial</h1>
<p>If you are a Java developer we have a great <a href="/java/tutorial">tutorial</a> for you to get started with Eclipse IoT technology and help you implement an end-to-end solution that will help you connect a greenhouse and associated sensors to the Internet of Things.</p>
</div>
<!-- <div class="col-md-4">
@@ -124,7 +124,7 @@
<div class="row">
<div class="col-md-6">
<section class="subsection-header videos">
- <h2 id="videos">Videos</h2>
+ <h2 id="videos">Videos <span></span></h2>
<div class="grey-box">
<iframe width="100%" height="315" src="http://www.youtube.com/embed/videoseries?list=PL0D6A9FF9237853DF&hl=fr_FR" frameborder="0" allowfullscreen></iframe>
</div>
@@ -132,7 +132,7 @@
</div>
<div class="col-md-6">
<section class="subsection-header presentations">
- <h2 id="presentations">Presentations</h2>
+ <h2 id="presentations">Presentations<span></span></h2>
<a href="http://slideshare.net/kartben/endtoend-iot-solutions-with-java-and-the-eclipse-iot-stack-39711940" class="embed"></a>
</section>
</div>
diff --git a/public/index.html b/public/index.html
index 142aee27927479074fbdd18a50470f694cd9feef..859985000d68af60546aaf20a15cc38e18e9df71 100644
--- a/public/index.html
+++ b/public/index.html
@@ -476,8 +476,8 @@
<div class="col-md-4 col-xs-6" style="padding:20px 60px; display:none;">
<div style="height: 120px; display:table-cell; vertical-align:middle;">
- <a href="http://eclipse.org/membership/showMember.php?member_id=1152" target="_blank">
- <img src="/assets/images/members/logo-gadgetkeeper.png" class="img-responsive" style="max-height:110px">
+ <a href="http://eclipse.org/membership/showMember.php?member_id=656" target="_blank">
+ <img src="/assets/images/members/logo-ibm.png" class="img-responsive" style="max-height:110px">
</a>
</div>
</div>
@@ -486,8 +486,8 @@
<div class="col-md-4 col-xs-6" style="padding:20px 60px; display:none;">
<div style="height: 120px; display:table-cell; vertical-align:middle;">
- <a href="http://eclipse.org/membership/showMember.php?member_id=1084" target="_blank">
- <img src="/assets/images/members/logo-ibh.png" class="img-responsive" style="max-height:110px">
+ <a href="http://eclipse.org/membership/showMember.php?member_id=1152" target="_blank">
+ <img src="/assets/images/members/logo-gadgetkeeper.png" class="img-responsive" style="max-height:110px">
</a>
</div>
</div>
@@ -496,8 +496,8 @@
<div class="col-md-4 col-xs-6" style="padding:20px 60px; display:none;">
<div style="height: 120px; display:table-cell; vertical-align:middle;">
- <a href="http://eclipse.org/membership/showMember.php?member_id=656" target="_blank">
- <img src="/assets/images/members/logo-ibm.png" class="img-responsive" style="max-height:110px">
+ <a href="http://eclipse.org/membership/showMember.php?member_id=1084" target="_blank">
+ <img src="/assets/images/members/logo-ibh.png" class="img-responsive" style="max-height:110px">
</a>
</div>
</div>
@@ -526,8 +526,8 @@
<div class="col-md-4 col-xs-6" style="padding:20px 60px; display:none;">
<div style="height: 120px; display:table-cell; vertical-align:middle;">
- <a href="http://eclipse.org/membership/showMember.php?member_id=817" target="_blank">
- <img src="/assets/images/members/logo-itemis.png" class="img-responsive" style="max-height:110px">
+ <a href="http://eclipse.org/membership/showMember.php?member_id=1108" target="_blank">
+ <img src="/assets/images/members/logo-laas.png" class="img-responsive" style="max-height:110px">
</a>
</div>
</div>
@@ -536,8 +536,8 @@
<div class="col-md-4 col-xs-6" style="padding:20px 60px; display:none;">
<div style="height: 120px; display:table-cell; vertical-align:middle;">
- <a href="http://eclipse.org/membership/showMember.php?member_id=1108" target="_blank">
- <img src="/assets/images/members/logo-laas.png" class="img-responsive" style="max-height:110px">
+ <a href="http://eclipse.org/membership/showMember.php?member_id=817" target="_blank">
+ <img src="/assets/images/members/logo-itemis.png" class="img-responsive" style="max-height:110px">
</a>
</div>
</div>
diff --git a/public/index.xml b/public/index.xml
index 90d77c0d47e0d08cb200442d20c03b29af1e3bcb..1f4036e7273ebc794471d7948f994d786ee55b70 100644
--- a/public/index.xml
+++ b/public/index.xml
@@ -165,17 +165,12 @@ Solair enables companies to collect data from their Things and feed it into busi
</item>
<item>
- <title>GadgetKeeper</title>
- <link>http://iot.eclipse.org/member/gadgetkeeper/</link>
+ <title>IBM</title>
+ <link>http://iot.eclipse.org/member/ibm/</link>
<pubDate>Sun, 08 Mar 2015 15:31:18 -0700</pubDate>
- <guid>http://iot.eclipse.org/member/gadgetkeeper/</guid>
- <description><p>GadgetKeeper is an Internet Of Things platform allowing the rapid creation if IoT solutions to connect your sensors, devices, equipment (&ldquo;Things&rdquo;) with people and systems.</p>
-
-<p>GadgetKeeper&rsquo;s technology eliminates complexity by simplifying and standardizing the way information is managed and exchanged so that physical and virtual assets and services can work together as one integrated system.</p>
-
-<p>GadgetKeeper provides you with foundational IoT building blocks (compete object model for things/services, templates and versioning, reach data types, programmable business logic) and services (data storage, time series, multiple communication protocols, integration with external services, life-cycle management and elastic scalability) allowing you to focus on product innovation rather than on enabling infrastructure.</p>
-</description>
+ <guid>http://iot.eclipse.org/member/ibm/</guid>
+ <description></description>
</item>
</channel>
diff --git a/public/sitemap.xml b/public/sitemap.xml
index aee629fb0f5eef7ece44478db50f31665441dc41..5c92b486964083bd9a31dc63e7c0a7b44c27d6da 100644
--- a/public/sitemap.xml
+++ b/public/sitemap.xml
@@ -77,17 +77,17 @@
</url>
<url>
- <loc>http://iot.eclipse.org/member/gadgetkeeper/</loc>
+ <loc>http://iot.eclipse.org/member/ibm/</loc>
<lastmod>2015-03-08T15:31:18-07:00</lastmod>
</url>
<url>
- <loc>http://iot.eclipse.org/member/ibh/</loc>
+ <loc>http://iot.eclipse.org/member/gadgetkeeper/</loc>
<lastmod>2015-03-08T15:31:18-07:00</lastmod>
</url>
<url>
- <loc>http://iot.eclipse.org/member/ibm/</loc>
+ <loc>http://iot.eclipse.org/member/ibh/</loc>
<lastmod>2015-03-08T15:31:18-07:00</lastmod>
</url>
@@ -102,12 +102,12 @@
</url>
<url>
- <loc>http://iot.eclipse.org/member/itemis/</loc>
+ <loc>http://iot.eclipse.org/member/laas/</loc>
<lastmod>2015-03-08T15:31:19-07:00</lastmod>
</url>
<url>
- <loc>http://iot.eclipse.org/member/laas/</loc>
+ <loc>http://iot.eclipse.org/member/itemis/</loc>
<lastmod>2015-03-08T15:31:19-07:00</lastmod>
</url>
diff --git a/public/working-group/index.html b/public/working-group/index.html
index 9dc7eda767e77e1128aaca5e0447f0ca93aad051..1c024e907c7161ed3748f1031dc6cd6e0f3d09e9 100644
--- a/public/working-group/index.html
+++ b/public/working-group/index.html
@@ -155,7 +155,7 @@
</div>
</div>
</div>
-
+
<div class="row members-info" id="member-ibm">
<div class="col-md-2 col-md-offset-1 mb-logo">
<a href="http://eclipse.org/membership/showMember.php?member_id=656">
@@ -172,7 +172,7 @@
</div>
</div>
</div>
-
+
<div class="row members-info" id="member-eurotech">
<div class="col-md-2 col-md-offset-1 mb-logo">
<a href="http://eclipse.org/membership/showMember.php?member_id=968">
@@ -263,15 +263,15 @@
</div>
</div>
- <div class="row members-info" id="member-itemis">
+ <div class="row members-info" id="member-laas">
<div class="col-md-2 col-md-offset-1 mb-logo">
- <a href="http://eclipse.org/membership/showMember.php?member_id=817">
- <img src="/assets/images/members/logo-itemis.png" alt="itemis" class="img-responsive" />
+ <a href="http://eclipse.org/membership/showMember.php?member_id=1108">
+ <img src="/assets/images/members/logo-laas.png" alt="LAAS-CNRS" class="img-responsive" />
</a>
</div>
<div class="col-md-8 col-md-offset-1 mb-info">
<div class="mb-info-container">
- <h2>itemis </h2>
+ <h2>LAAS-CNRS </h2>
</div>
<div>
@@ -280,15 +280,15 @@
</div>
</div>
- <div class="row members-info" id="member-laas">
+ <div class="row members-info" id="member-itemis">
<div class="col-md-2 col-md-offset-1 mb-logo">
- <a href="http://eclipse.org/membership/showMember.php?member_id=1108">
- <img src="/assets/images/members/logo-laas.png" alt="LAAS-CNRS" class="img-responsive" />
+ <a href="http://eclipse.org/membership/showMember.php?member_id=817">
+ <img src="/assets/images/members/logo-itemis.png" alt="itemis" class="img-responsive" />
</a>
</div>
<div class="col-md-8 col-md-offset-1 mb-info">
<div class="mb-info-container">
- <h2>LAAS-CNRS </h2>
+ <h2>itemis </h2>
</div>
<div>
@@ -296,7 +296,7 @@
</div>
</div>
</div>
-
+
<div class="row members-info" id="member-gadgetkeeper">
<div class="col-md-2 col-md-offset-1 mb-logo">
<a href="http://eclipse.org/membership/showMember.php?member_id=1152">
@@ -346,7 +346,7 @@
</div>
</div>
</div>
-
+
<div class="row members-info" id="member-is2t">
<div class="col-md-2 col-md-offset-1 mb-logo">
<a href="http://eclipse.org/membership/showMember.php?member_id=1140">
diff --git a/static/assets/css/bootstrap.css b/static/assets/css/bootstrap.css
index c7d4192bb7387999087d5046b5aa4e60180a4ebb..9a9964b5ebcf29ef1d55b55309fca7747342bb66 100644
--- a/static/assets/css/bootstrap.css
+++ b/static/assets/css/bootstrap.css
@@ -4234,6 +4234,11 @@ header {
text-align: center;
margin-bottom: -75px; }
+@media (max-width: 767px) {
+ .navbar-brand > img {
+ height: 60px;
+ margin-top: -14px; } }
+
main.main {
/* Item box: Layout item */
/* Project list: projects.html */ }
@@ -4496,9 +4501,13 @@ main.main {
top: -20px;
position: absolute; }
main.main .videos h2 {
- background-image: url(../images/heading-upcoming_events.jpg); }
+ background-image: url(../images/heading-featured.png); }
+ main.main .videos h2 span {
+ background-image: url(../images/heading-videos-icon.png); }
main.main .presentations h2 {
- background-image: url(../images/heading-upcoming_events.jpg); }
+ background-image: url(../images/heading-featured.png); }
+ main.main .presentations h2 span {
+ background-image: url(../images/heading-presentations-icon.png); }
main.main .tutorials .featured-tutorial-item {
background-image: url(../images/open-iot-bg.jpg);
background-size: cover;
diff --git a/static/assets/images/heading-presentations-icon.png b/static/assets/images/heading-presentations-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..07ef94442f1b64b5291dd4292de1bcc38727e114
Binary files /dev/null and b/static/assets/images/heading-presentations-icon.png differ
diff --git a/static/assets/images/heading-videos-icon.png b/static/assets/images/heading-videos-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..861c86bcb24875bbc5a0bdf6b7b62ee64a537aab
Binary files /dev/null and b/static/assets/images/heading-videos-icon.png differ
diff --git a/static/assets/stylesheets/theme/_main.scss b/static/assets/stylesheets/theme/_main.scss
index 9d194f3182dc1bf281dbb355e859c0cb4c638726..ea503f69fd545ac52b3a8ed02ebbf7131ab24240 100644
--- a/static/assets/stylesheets/theme/_main.scss
+++ b/static/assets/stylesheets/theme/_main.scss
@@ -1,3 +1,10 @@
+.navbar-brand > img {
+ @media (max-width: $screen-xs-max) {
+ height: 60px;
+ margin-top: -14px;
+ }
+}
+
main.main {
p, li {
color: $gray;
@@ -363,12 +370,18 @@ main.main {
// getting started page
.videos {
h2 {
- background-image: url(../images/heading-upcoming_events.jpg);
+ background-image: url(../images/heading-featured.png);
+ span {
+ background-image: url(../images/heading-videos-icon.png);
+ }
}
}
.presentations {
h2 {
- background-image: url(../images/heading-upcoming_events.jpg);
+ background-image: url(../images/heading-featured.png);
+ span {
+ background-image: url(../images/heading-presentations-icon.png);
+ }
}
}
.tutorials {
diff --git a/static/getting-started.html b/static/getting-started.html
index a10d96a0ddb988342f65c40e82cf62778a321c66..070d9f1ff37d27161242db135f6241f52f1b2b9b 100644
--- a/static/getting-started.html
+++ b/static/getting-started.html
@@ -106,7 +106,7 @@
<div class="container">
<div class="row tutorials">
<div class="col-md-12">
- <h1 class="purple">Tutorial</h1>
+ <h1 class="purple">Connected Greenhouse Tutorial</h1>
<p>If you are a Java developer we have a great <a href="/java/tutorial">tutorial</a> for you to get started with Eclipse IoT technology and help you implement an end-to-end solution that will help you connect a greenhouse and associated sensors to the Internet of Things.</p>
</div>
<!-- <div class="col-md-4">
@@ -124,7 +124,7 @@
<div class="row">
<div class="col-md-6">
<section class="subsection-header videos">
- <h2 id="videos">Videos</h2>
+ <h2 id="videos">Videos <span></span></h2>
<div class="grey-box">
<iframe width="100%" height="315" src="http://www.youtube.com/embed/videoseries?list=PL0D6A9FF9237853DF&hl=fr_FR" frameborder="0" allowfullscreen></iframe>
</div>
@@ -132,7 +132,7 @@
</div>
<div class="col-md-6">
<section class="subsection-header presentations">
- <h2 id="presentations">Presentations</h2>
+ <h2 id="presentations">Presentations<span></span></h2>
<a href="http://slideshare.net/kartben/endtoend-iot-solutions-with-java-and-the-eclipse-iot-stack-39711940" class="embed"></a>
</section>
</div>