Move incubation logo, update css, update history section.

Change-Id: I31fb6a9c8946d3d6216fbacd86510946e07ac00b
Signed-off-by: Hiroshi Ito <hiroshi.ito@gs.com>
diff --git a/css/landing-page.css b/css/landing-page.css
index ee4e569..3deaffc 100755
--- a/css/landing-page.css
+++ b/css/landing-page.css
@@ -17,7 +17,7 @@
 h4,
 h5,
 h6 {
-    font-family: "Lato","Helvetica Neue",Helvetica,Arial,sans-serif;
+    font-family: "Roboto Condensed","Helvetica Neue",Helvetica,Arial,sans-serif;
     font-weight: 700;
 }
 
@@ -43,7 +43,8 @@
 
 .intro-header {
     height: 350px;
-    padding-top: 50px; /* If you're making other pages, make sure there is 50px of padding to make sure the navbar doesn't overlap content! */
+    margin-top: 100px;
+    padding-top: 100px; /* If you're making other pages, make sure there is 50px of padding to make sure the navbar doesn't overlap content! */
     padding-bottom: 20px;
     text-align: center;
     color: #f8f8f8;
@@ -53,7 +54,7 @@
 
 .intro-message {
     position: relative;
-    padding-top: 8%;
+    padding-top: 4%;
     padding-bottom: 10%;
 }
 
@@ -75,10 +76,13 @@
 
 @media(max-width:767px) {
     .intro-header {
+        margin-top: 50px;
+        padding-top: 50px;
         height: 50%;
     }
 
     .intro-message {
+        padding-top: 8%;
         padding-bottom: 7%;
     }
 
diff --git a/index.html b/index.html
index 25d4d3f..0d27b17 100755
--- a/index.html
+++ b/index.html
@@ -9,7 +9,7 @@
     <meta name="description" content="">
     <meta name="author" content="">
 
-    <title>Eclipse Collections - Happy development with the best Java collections framework ever. </title>
+    <title>Eclipse Collections - More features, less waste. </title>
 
     <!-- Bootstrap Core CSS -->
     <link href="css/bootstrap.min.css" rel="stylesheet">
@@ -19,8 +19,7 @@
 
     <!-- Custom Fonts -->
     <link href="font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
-    <link href="http://fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
-
+    <link href="http://fonts.googleapis.com/css?family=Roboto+Condensed:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
     <!-- Google Code Prettify -->
     <link href="google-code-prettify/sunburst.css" rel="stylesheet" type="text/css">
 
@@ -82,6 +81,11 @@
                             <li><a href="ja/index.html">Japanese</a></li>
                         </ul>
                     </li>
+                    <li>
+                        <a href="https://projects.eclipse.org/projects/technology.collections">
+                            <img class="img-responsive" src="img/Egg-incubation.png" alt="Eclipse Incubation Egg">
+                        </a>
+                    </li>
                 </ul>
             </div>
             <!-- /.navbar-collapse -->
@@ -98,16 +102,11 @@
             <div class="row">
                 <div class="col-lg-push-2 col-lg-8">
                     <div class="intro-message">
-                        <h1>Eclipse Collections</h1>
-                        <h3>- Happy development with the best Java collections framework ever -</h3>
+                        <a  name="start"></a><!--TODO: Bring it back to correct place once incubation logo is removed.-->
+                        <h1>Eclipse <span style="font-weight: 400">Collections</span></h1>
+                        <h3>- More features, less waste -</h3>
                     </div>
                 </div>
-
-                <div class="col-lg-push-2 col-lg-2">
-                    <a href="https://projects.eclipse.org/projects/technology.collections">
-                        <img class="img-responsive" src="img/Egg-incubation.png" alt="Eclipse Incubation Egg">
-                    </a>
-                </div>
             </div>
 
         </div>
@@ -118,7 +117,6 @@
 
     <!-- Page Content -->
 
-	<a  name="start"></a>
     <div class="content-section-a">
 
         <div class="container-fluid">
@@ -127,6 +125,7 @@
                     <hr class="section-heading-spacer">
                     <div class="clearfix"></div>
                     <h2 class="section-heading">Get started with <br>Eclipse Collections</h2>
+                    <a name="concept"></a><!--TODO: Bring it back to correct place once incubation logo is removed.-->
                     <p class="lead">Eclipse Collections is the best Java collections framework ever
                         that brings happiness to your Java development.
                         <br><br>Integrate it to your codebase today with your favorite build tools!</p>
@@ -179,7 +178,6 @@
     </div>
     <!-- Get Started -->
 
-    <a name="concept"></a>
     <div class="content-section-b">
 
         <div class="container-fluid">
@@ -268,8 +266,8 @@
                 <div class="col-lg-5 col-sm-6">
                     <hr class="section-heading-spacer">
                     <div class="clearfix"></div>
-                    <h2 class="section-heading">More container types, <br>mutable, immutable, primitives, <br>all available to you.</h2>
-                    <p class="lead">You can make use of various container types, with leveraging handy factory methods to instantiate.</p>
+                    <h2 class="section-heading">Many container types including <br>immutable collections, primitive collections, bimaps, multimaps and bags</h2>
+                    <p class="lead">You can make use of various container types, leveraging handy factory methods for instantiation.</p>
                 </div>
                 <div class="col-lg-7 col-sm-6">
                     <ul class="nav nav-tabs">
@@ -378,7 +376,7 @@
                     <hr class="section-heading-spacer">
                     <div class="clearfix"></div>
                     <h2 class="section-heading">Reduce memory footprint <br>with memory efficient containers.</h2>
-                    <p class="lead">Eclipse Collections provides memory efficient implementation of Sets, Maps and all primitive collections. </p>
+                    <p class="lead">Eclipse Collections provides memory efficient implementation of Sets and Maps as well as primitive collections. </p>
                 </div>
                 <div class="col-lg-pull-6 col-lg-6 col-sm-pull-6 col-sm-6">
                     <ul class="nav nav-tabs">
@@ -386,6 +384,7 @@
                         <li><a href="#map" data-toggle="tab">Maps</a></li>
                         <li><a href="#ints" data-toggle="tab">Primitive Collections</a></li>
                     </ul>
+                    <a name="history"></a><!--TODO: Bring it back to correct place once incubation logo is removed.-->
                     <div id="memory" class="tab-content">
                         <div class="tab-pane fade in active" id="set">
                             <img class="img-responsive" src="img/set.png" alt="">
@@ -406,15 +405,16 @@
     </div>
     <!-- Memory footprint -->
 
-    <a name="history"></a>
     <div class="content-section-a">
 
         <div class="container-fluid">
 
             <h2 class="section-heading">History of Eclipse Collections</h2>
             <p class="lead">
-                Eclipse Collections started off as an open source project on GitHub called
-                <a href="https://github.com/goldmansachs/gs-collections">GS Collections</a> in 2012.
+                The origin of Eclipse Collections was started off as a collections framework named Caramel at Goldman Sachs in 2004.
+
+                Since then the framework has evolved, and in 2012, it was open sourced to GitHub as a project called
+                <a href="https://github.com/goldmansachs/gs-collections">GS Collections</a>.
                 <br><br>
                 GS Collections has been presented at number of
                 <a href="https://github.com/eclipse/eclipse-collections/wiki/Conference-talks-and-meetups">conferences</a>
@@ -425,7 +425,11 @@
                 There are <a href="https://github.com/eclipse/eclipse-collections/wiki/Articles">articles</a> on InfoQ.com
                 showing some of the capabilities of the collections framework through examples, and also interviews to the creator of GS Collections.
                 <br><br>
+
+                Over the years, around 40 or so developers from the same company have contributed to the collections framework.
+
                 To maximize the best nature of open source project, GS Collections has been migrated to Eclipse Foundation, re-branded as Eclipse Collections in 2015.
+                Now the framework if fully open to the community, accepting contributions!
             </p>
             <hr class="section-heading-spacer">
 
@@ -444,12 +448,12 @@
                 <div class="col-lg-4 col-sm-4">
                     <h3>Contribute</h3>
                     <p class="regular">
-                        We welcome contributions to the Eclipse Collections project!!
+                        We welcome contributions!
                         <br><br>
                         Eclipse Collections Project Roadmap can be found <a href="https://github.com/eclipse/eclipse-collections/wiki/Roadmap">here</a>.
                         <br><br>
-                        The Eclipse Collections project accepts contributions via pull requests in this GitHub.
-                        Please see <a href="https://github.com/eclipse/eclipse-collections/blob/master/CONTRIBUTING.md">How To Contribute</a> for more detail.
+                        We accept contributions via pull requests in GitHub.
+                        Please see <a href="https://github.com/eclipse/eclipse-collections/blob/master/CONTRIBUTING.md">How To Contribute</a> to get started.
                     </p>
                 </div>
                 <div class="col-lg-4 col-sm-4">
@@ -501,7 +505,7 @@
 
             <div class="row">
                 <div class="col-lg-12">
-                    <h3>- Happy development with the best Java collections framework ever -</h3>
+                    <h3>- More features, less waste -</h3>
                 </div>
             </div>
 
diff --git a/ja/index.html b/ja/index.html
index 58656a1..2bdfb0c 100644
--- a/ja/index.html
+++ b/ja/index.html
@@ -9,7 +9,7 @@
     <meta name="description" content="">
     <meta name="author" content="">
 
-    <title>Eclipse Collections - 最高のJavaコレクションフレームワークであなたの開発を幸せに </title>
+    <title>Eclipse Collections - More features, less waste. </title>
 
     <!-- Bootstrap Core CSS -->
     <link href="../css/bootstrap.min.css" rel="stylesheet">
@@ -82,6 +82,11 @@
                         <li><a href="">Japanese</a></li>
                     </ul>
                 </li>
+                <li>
+                    <a href="https://projects.eclipse.org/projects/technology.collections">
+                        <img class="img-responsive" src="../img/Egg-incubation.png" alt="Eclipse Incubation Egg">
+                    </a>
+                </li>
             </ul>
         </div>
         <!-- /.navbar-collapse -->
@@ -98,16 +103,11 @@
         <div class="row">
             <div class="col-lg-push-2 col-lg-8">
                 <div class="intro-message">
+                    <a  name="start"></a><!--TODO: Bring it back to correct place once incubation logo is removed.-->
                     <h1>Eclipse Collections</h1>
-                    <h3>- Happy development with the best Java collections framework ever -</h3>
+                    <h3>- More features, less waste  -</h3>
                 </div>
             </div>
-
-            <div class="col-lg-push-2 col-lg-2">
-                <a href="https://projects.eclipse.org/projects/technology.collections">
-                    <img class="img-responsive" src="../img/Egg-incubation.png" alt="Eclipse Incubation Egg">
-                </a>
-            </div>
         </div>
 
     </div>
@@ -118,7 +118,6 @@
 
 <!-- Page Content -->
 
-<a  name="start"></a>
 <div class="content-section-a">
 
     <div class="container-fluid">
@@ -127,6 +126,7 @@
                 <hr class="section-heading-spacer">
                 <div class="clearfix"></div>
                 <h2 class="section-heading">Eclipse Collectionsを始めてみよう</h2>
+                <a name="concept"></a><!--TODO: Bring it back to correct place once incubation logo is removed.-->
                 <p class="lead">Eclipse CollectionsはあなたのJava開発を幸せにする
                     最高のJavaコレクションフレームワークです。
                     <br><br>今すぐお好みのビルドツールを使ってあなたのJavaプロジェクトに導入してみてください!</p>
@@ -179,7 +179,6 @@
 </div>
 <!-- Get Started -->
 
-<a name="concept"></a>
 <div class="content-section-b">
 
     <div class="container-fluid">
@@ -385,6 +384,7 @@
                     <li><a href="#map" data-toggle="tab">Map</a></li>
                     <li><a href="#ints" data-toggle="tab">プリミティブコレクション</a></li>
                 </ul>
+                <a name="history"></a><!--TODO: Bring it back to correct place once incubation logo is removed.-->
                 <div id="memory" class="tab-content">
                     <div class="tab-pane fade in active" id="set">
                         <img class="img-responsive" src="../img/set.png" alt="">
@@ -405,15 +405,16 @@
 </div>
 <!-- Memory footprint -->
 
-<a name="history"></a>
 <div class="content-section-a">
 
     <div class="container-fluid">
 
         <h2 class="section-heading">Eclipse Collectionsの歴史</h2>
         <p class="lead">
-            Eclipse Collectionsは、2012年に
-            <a href="https://github.com/goldmansachs/gs-collections">GS Collections</a>と呼ばれるオープンソースプロジェクトとしてGitHub上で発足しました。
+            Eclipse Collectionsの起源は、2004年にゴールドマン・サックス社内製のCaramelと呼ばれるコレクションフレームワークから始まりました。
+
+            このフレームワークは進化し、2012年に
+            <a href="https://github.com/goldmansachs/gs-collections">GS Collections</a>としてGitHub上にオープンソースで公開されました。
             <br><br>
             GS Collectionsは2012年のJVM Summitや2014年のJavaOneなど、さまざまな
             <a href="https://github.com/eclipse/eclipse-collections/wiki/Conference-talks-and-meetups">カンファレンス</a>
@@ -423,7 +424,8 @@
             <br><br>
             メディアにおいては、GS Collections開発者の<a href="https://www.jclarity.com/2013/11/26/stalwarts-in-tech-an-interview-with-donald-raab-gs-collections-lead/">インタビュー記事</a>や、InfoQのGS Collections活用法を紹介した記事(日本語版<a href="http://www.infoq.com/jp/articles/GS-Collections-by-Example-1">Part1</a>・<a href="http://www.infoq.com/jp/articles/GS-Collections-by-Example-2">Part2</a>)などが掲載されてきました。
             <br><br>
-            2015年、オープンソースプロジェクトとしての特徴を最大限に活かすため、GS CollectionsはEclipse Foundationに移管され、Eclipse Collectionsとして生まれ変わりました。
+            10余年の年月を経て、同コレクションフレームワークには同社の40人余りもの開発者が携わってきました。
+            2015年、オープンソースプロジェクトとしての特徴を最大限に活かすため、GS CollectionsはEclipse Foundationに移管され、Eclipse Collectionsとして生まれ変わりました。コミュニティからのコントリビューションを受け付ける、完全にオープンなフレームワークになったのです。
         </p>
         <hr class="section-heading-spacer">
 
@@ -499,7 +501,7 @@
 
         <div class="row">
             <div class="col-lg-12">
-                <h3>- Happy development with the best Java collections framework ever -</h3>
+                <h3>- More features, less waste -</h3>
             </div>
         </div>