Merge branch 'cordova-website' of https://github.com/bgashler1/cordova-docs 
into cordova-website


Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/efbd1390
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/efbd1390
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/efbd1390

Branch: refs/heads/cordova-website
Commit: efbd1390668496f02862485ba8ef976fd209907c
Parents: 2b3012e abe784e
Author: Dmitry Blotsky <[email protected]>
Authored: Tue Aug 18 14:01:59 2015 -0700
Committer: Dmitry Blotsky <[email protected]>
Committed: Tue Aug 18 14:01:59 2015 -0700

----------------------------------------------------------------------
 _dev.yml                                |    4 +-
 www/_includes/footer.html               |    2 +-
 www/_includes/header.html               |    2 +-
 www/_includes/tools_and_samples.html    |   64 +
 www/_layouts/docs-en.html               |    2 +-
 www/_layouts/docs-ru.html               |    2 +-
 www/_layouts/post.html                  |    4 +-
 www/contact/index.html                  |  106 +
 www/contribute/index.html               |  171 +
 www/index.html                          |  129 +-
 www/plugins/index.html                  |  145 +
 www/static/css-src/_blog.scss           |  314 +
 www/static/css-src/_contact.scss        |   22 +
 www/static/css-src/_contribute.scss     |   36 +
 www/static/css-src/_docs.scss           |   68 +
 www/static/css-src/_home.scss           |  220 +
 www/static/css-src/_plugins.scss        |   55 +
 www/static/css-src/blog.scss            |  248 -
 www/static/css-src/docs.scss            |   68 -
 www/static/css-src/main.scss            |  105 +-
 www/static/img/3rdparty_logo_sprite.svg | 7918 +-------------------------
 www/static/img/platform-logos.svg       |   90 +
 www/static/img/pluggy.png               |  Bin 0 -> 16302 bytes
 www/static/img/post-next.png            |  Bin 0 -> 3589 bytes
 www/static/img/post-prev.png            |  Bin 0 -> 3221 bytes
 www/static/js/main.js                   |    9 +
 26 files changed, 1483 insertions(+), 8301 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/efbd1390/_dev.yml
----------------------------------------------------------------------
diff --cc _dev.yml
index d1f6562,433af3e..b5be687
--- a/_dev.yml
+++ b/_dev.yml
@@@ -7,6 -7,6 +7,7 @@@ exclude
      - docs/ja
      - docs/ko
      - docs/pl
++    - docs/ru
      - docs/sl
      - docs/zh
      - docs/en/1.5.0
@@@ -34,5 -34,6 +35,6 @@@
      - docs/en/3.5.0
      - docs/en/3.6.0
      - docs/en/4.0.0
++    # - docs/en/5.0.0
      - docs/en/5.1.1
 -    - docs/en #take this off to build docs
--    # not excluding edge or 5.0.0 for english (testing purposes)
++    # - docs/en/edge

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/efbd1390/www/_includes/footer.html
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/efbd1390/www/_includes/header.html
----------------------------------------------------------------------
diff --cc www/_includes/header.html
index 18363f6,823ecc9..827013d
--- a/www/_includes/header.html
+++ b/www/_includes/header.html
@@@ -18,20 -18,20 +18,20 @@@
                          <a href="{{ site.baseurl 
}}/docs/en/edge/guide/cli/">Documentation</a>
                      </li>
                      <li>
-                         <a href="http://plugins.cordova.io/";>Plugins</a>
+                         <a href="{{ site.baseurl }}/plugins">Plugins</a>
                      </li>
                      <li {% if page.blog_tab %}class="active"{% endif %}>
 -                        <a href="{{ site.baseurl }}/blog">Blog<span 
class="badge">5</span></a>
 +                        <a href="{{ site.baseurl }}/blog" 
id="blog_button">Blog<span class="badge" id="new_blog_count"></span></a>
                      </li>
 -                    <li>
 -                        <a href="{{ site.baseurl 
}}/contribute/">Contribute</a>
 +                    <li {% if page.contribute_tab %}class="active"{% endif %}>
 +                        <a href="{{ site.baseurl }}/contribute">Contribute</a>
                      </li>
                      <li>
 -                        <a href="{{ site.baseurl }}/contact/">Contact</a>
 +                        <a href="{{ site.baseurl }}/#getstarted">Get 
Started</a>
                      </li>
 -                    <li class="visible-xs hidden">
 +                    <!-- <li class="visible-xs">
                          <img class="" style="width:25px;margin-left:13px" 
src="{{ site.baseurl }}/static/img/search_icon.svg"/>
 -                    </li>
 +                    </li> -->
                  </ul>
              </div>
          </div><!--/.navbar-collapse -->

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/efbd1390/www/_includes/tools_and_samples.html
----------------------------------------------------------------------
diff --cc www/_includes/tools_and_samples.html
index 0000000,c2776c8..f142e0a
mode 000000,100644..100644
--- a/www/_includes/tools_and_samples.html
+++ b/www/_includes/tools_and_samples.html
@@@ -1,0 -1,168 +1,64 @@@
+ <div class="container">
 -        <div class="row showcase_section_intro">
 -            <div class="col-md-12 text-center">
 -                <h1>Codorva Tools</h1>
 -                <h2>Work with Cordova even more efficiently</h2>
 -                <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
Donec erat sem, cursus quis nibh porta, scelerisque blandit lorem. Vivamus 
blandit nec odio non bibendum. Morbi efficitur purus ut metus viverra sodales. 
In aliquet nunc sagittis, dignissim libero ut, vulputate nisi. Phasellus 
vulputate fermentum libero, lorem hah.</p>
 -            </div>
 -        </div>
 -        <!-- ROW 1 Starts -->
 -        <div class="row cordova_tools_gallery">
 -            <div class="col-lg-2 col-sm-4 card">
 -                <div class="card_inner">
 -                    <img src="{{ site.baseurl }}/static/img/cordova_48.png" 
class="center-block"/>
 -                    <p class="card_title">LitWare</p>
 -                    <p>Nullam dictum condimentum sapien, et venenatis lectus 
tempor vehicula. Aenean ac ligula in purus sollicitudin maximus.</p>
 -                </div>
 -            </div>
 -            <div class="col-lg-2 col-sm-4 card">
 -                <div class="card_inner">
 -                    <img src="{{ site.baseurl }}/static/img/cordova_48.png" 
class="center-block"/>
 -                    <p class="card_title">LitWare</p>
 -                    <p>Nullam dictum condimentum sapien, et venenatis lectus 
tempor vehicula. Aenean ac ligula in purus sollicitudin maximus.</p>
 -                </div>
 -            </div>
 -            <div class="col-lg-2 col-sm-4 card">
 -                <div class="card_inner">
 -                    <img src="{{ site.baseurl }}/static/img/cordova_48.png" 
class="center-block"/>
 -                    <p class="card_title">LitWare</p>
 -                    <p>Nullam dictum condimentum sapien, et venenatis lectus 
tempor vehicula. Aenean ac ligula in purus sollicitudin maximus.</p>
 -                </div>
 -            </div>
 -            <div class="col-lg-2 col-sm-4 card">
 -                <div class="card_inner">
 -                    <img src="{{ site.baseurl }}/static/img/cordova_48.png" 
class="center-block"/>
 -                    <p class="card_title">LitWare</p>
 -                    <p>Nullam dictum condimentum sapien, et venenatis lectus 
tempor vehicula. Aenean ac ligula in purus sollicitudin maximus.</p>
 -                </div>
 -            </div>
 -            <div class="col-lg-2 col-sm-4 card">
 -                <div class="card_inner">
 -                    <img src="{{ site.baseurl }}/static/img/cordova_48.png" 
class="center-block"/>
 -                    <p class="card_title">LitWare</p>
 -                    <p>Nullam dictum condimentum sapien, et venenatis lectus 
tempor vehicula. Aenean ac ligula in purus sollicitudin maximus.</p>
 -                </div>
 -            </div>
 -            <div class="col-lg-2 col-sm-4 card">
 -                <div class="card_inner">
 -                    <img src="{{ site.baseurl }}/static/img/cordova_48.png" 
class="center-block"/>
 -                    <p class="card_title">LitWare</p>
 -                    <p>Nullam dictum condimentum sapien, et venenatis lectus 
tempor vehicula. Aenean ac ligula in purus sollicitudin maximus.</p>
 -                </div>
 -            </div>
++    <div class="row showcase_section_intro">
++        <div class="col-md-12 text-center">
++            <h1>Codorva Tools</h1>
++            <h2>Work with Cordova even more efficiently</h2>
++            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec 
erat sem, cursus quis nibh porta, scelerisque blandit lorem. Vivamus blandit 
nec odio non bibendum. Morbi efficitur purus ut metus viverra sodales. In 
aliquet nunc sagittis, dignissim libero ut, vulputate nisi. Phasellus vulputate 
fermentum libero, lorem hah.</p>
+         </div>
 -        
 -        <!-- ROW 2 Starts -->
 -        <div class="row cordova_tools_gallery">
 -            <div class="col-lg-2 col-sm-4 card">
 -                <div class="card_inner">
 -                    <img src="{{ site.baseurl }}/static/img/cordova_48.png" 
class="center-block"/>
 -                    <p class="card_title">LitWare</p>
 -                    <p>Nullam dictum condimentum sapien, et venenatis lectus 
tempor vehicula. Aenean ac ligula in purus sollicitudin maximus.</p>
 -                </div>
 -            </div>
 -            <div class="col-lg-2 col-sm-4 card">
 -                <div class="card_inner">
 -                    <img src="{{ site.baseurl }}/static/img/cordova_48.png" 
class="center-block"/>
 -                    <p class="card_title">LitWare</p>
 -                    <p>Nullam dictum condimentum sapien, et venenatis lectus 
tempor vehicula. Aenean ac ligula in purus sollicitudin maximus.</p>
 -                </div>
 -            </div>
 -            <div class="col-lg-2 col-sm-4 card">
 -                <div class="card_inner">
 -                    <img src="{{ site.baseurl }}/static/img/cordova_48.png" 
class="center-block"/>
 -                    <p class="card_title">LitWare</p>
 -                    <p>Nullam dictum condimentum sapien, et venenatis lectus 
tempor vehicula. Aenean ac ligula in purus sollicitudin maximus.</p>
 -                </div>
 -            </div>
 -            <div class="col-lg-2 col-sm-4 card">
 -                <div class="card_inner">
 -                    <img src="{{ site.baseurl }}/static/img/cordova_48.png" 
class="center-block"/>
 -                    <p class="card_title">LitWare</p>
 -                    <p>Nullam dictum condimentum sapien, et venenatis lectus 
tempor vehicula. Aenean ac ligula in purus sollicitudin maximus.</p>
 -                </div>
 -            </div>
 -            <div class="col-lg-2 col-sm-4 card">
 -                <div class="card_inner">
 -                    <img src="{{ site.baseurl }}/static/img/cordova_48.png" 
class="center-block"/>
 -                    <p class="card_title">LitWare</p>
 -                    <p>Nullam dictum condimentum sapien, et venenatis lectus 
tempor vehicula. Aenean ac ligula in purus sollicitudin maximus.</p>
 -                </div>
 -            </div>
 -            <div class="col-lg-2 col-sm-4 card">
 -                <div class="card_inner">
 -                    <img src="{{ site.baseurl }}/static/img/cordova_48.png" 
class="center-block"/>
 -                    <p class="card_title">LitWare</p>
 -                    <p>Nullam dictum condimentum sapien, et venenatis lectus 
tempor vehicula. Aenean ac ligula in purus sollicitudin maximus.</p>
 -                </div>
++    </div>
++    <!-- ROW 1 Starts -->
++    <div class="row cordova_tools_gallery">
++        {% for tool in site.data.tools %}
++        <div class="col-lg-2 col-sm-va card">
++            <div class="card_inner">
++                <img src="{{ site.baseurl }}/static/img/tools/{{ tool.image 
}}" class="center-block"/>
++                <p class="card_title">
++                    {{ tool.name }}
++                </p>
++                <p>
++                    {{ tool.description | truncatewords:25 }}
++                </p>
+             </div>
+         </div>
 -        <div class="row"> <!-- Add yours or see more links -->
 -            <div class="col-sm-12">
 -                <div class="pull-right add_seemore_links">
 -                    <a href="#">Add your tool</a><a href="#">See more...</a>
 -                </div>
++        {% endfor %}
++    </div>
++    <div class="row"> <!-- Add yours or see more links -->
++        <div class="col-sm-12">
++            <div class="pull-right add_seemore_links">
++                <a href="#">Add your tool</a>
+             </div>
+         </div>
 -        
 -        
 -    </div><!-- /container -->
 -    <div class="container">
 -        <div class="row showcase_section_intro">
 -            <div class="col-md-12 text-center">
 -                <h1>Sample Cordova Apps</h1>
 -                <h2>See examples how to access native device APIs and 
more</h2>
 -            </div>
++    </div>
++</div><!-- /container -->
++
++<div class="container">
++    <div class="row showcase_section_intro">
++        <div class="col-md-12 text-center">
++            <h1>Sample Cordova Apps</h1>
++            <h2>See examples how to access native device APIs and more</h2>
+         </div>
 -        <div class="row cordova_tools_gallery">
 -            <div class="col-lg-2 col-sm-4 card">
 -                <div class="sample_app_thumb"></div>
 -                <div class="card_inner">
 -                    <p class="card_title">LitWare</p>
 -                    <p>Aenean ac ligula in purus sollicitudin maximus.</p>
 -                </div>
 -            </div>
 -            <div class="col-lg-2 col-sm-4 card">
 -                <div class="sample_app_thumb"></div>
 -                <div class="card_inner">
 -                    <p class="card_title">LitWare</p>
 -                    <p>Aenean ac ligula in purus sollicitudin maximus.</p>
 -                </div>
 -            </div>
 -            <div class="col-lg-2 col-sm-4 card">
 -                <div class="sample_app_thumb"></div>
 -                <div class="card_inner">
 -                    <p class="card_title">LitWare</p>
 -                    <p>Aenean ac ligula in purus sollicitudin maximus.</p>
 -                </div>
 -            </div>
 -            <div class="col-lg-2 col-sm-4 card">
 -                <div class="sample_app_thumb"></div>
 -                <div class="card_inner">
 -                    <p class="card_title">LitWare</p>
 -                    <p>Aenean ac ligula in purus sollicitudin maximus.</p>
 -                </div>
 -            </div>
 -            <div class="col-lg-2 col-sm-4 card">
 -                <div class="sample_app_thumb"></div>
 -                <div class="card_inner">
 -                    <p class="card_title">LitWare</p>
 -                    <p>Aenean ac ligula in purus sollicitudin maximus.</p>
 -                </div>
 -            </div>
 -            <div class="col-lg-2 col-sm-4 card">
 -                <div class="sample_app_thumb"></div>
 -                <div class="card_inner">
 -                    <p class="card_title">LitWare</p>
 -                    <p>Aenean ac ligula in purus sollicitudin maximus.</p>
 -                </div>
++    </div>
++    <div class="row cordova_tools_gallery">
++        {% for app in site.data.sample-apps %}
++        <div class="col-lg-2 col-sm-4 card">
++            <div class="sample_app_thumb"></div>
++            <div class="card_inner">
++                <p class="card_title">{{ app.name }}</p>
++                <p>{{ app.description | truncatewords:10 }}</p>
+             </div>
+         </div>
 -        <div class="row"> <!-- Add yours or see more links -->
 -            <div class="col-sm-12">
 -                <div class="pull-right add_seemore_links">
 -                    <a href="#">Add your app</a><a href="#">See more...</a>
 -                </div>
++        {% endfor %}
++    </div>
++    <div class="row"> <!-- Add yours or see more links -->
++        <div class="col-sm-12">
++            <div class="pull-right add_seemore_links">
++                <a href="#">Add your app</a>
+             </div>
+         </div>
 -    </div>
++    </div>
++    <div class="row">
++        <p>
++            &nbsp;
++        </p>
++    </div>
++</div>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/efbd1390/www/_layouts/post.html
----------------------------------------------------------------------
diff --cc www/_layouts/post.html
index 1472a7e,c90ca37..41fd7a9
--- a/www/_layouts/post.html
+++ b/www/_layouts/post.html
@@@ -3,54 -3,52 +3,54 @@@ layout: blo
  ---
  
  <div class="blog">
 - <div id="content" class="container">
 -     <div class="row">
 -        <div class="blogHeader">
 -          <h1>Blog</h1>
 -          <div>
 -            <img src="{{ site.baseurl }}/static/img/subscribe.png">
 -            <a href="{{ site.baseurl }}{{ site.rss_path }}">Subscribe</a>
 -          </div>
 -        </div>                 
 -        <div class="post">
 -            <header>
 -              <div class="title">{{ page.title }}</div>
 -              <div class="author">By: {{ page.author.name }}</div>
 -              <div class="date">{{ page.date | date_to_string }}</div>
 -            </header>
 -            <section>
 -              <div class="content">
 -                {{ content }}
 -              </div>
 -            </section>                                            
 -        </div>              
 -     </div>
 -     <div class="row">
 -        <section class="nextprev-controls">               
 -          <div class="prev">
 -            <img src="{{ site.baseurl }}/static/img/post-prev.png">
 -          </div>
 -          <div class="next">
 -            <div class="title"><a href="{{ site.baseurl }}{{ post.url 
}}">Title next article</a></div>
 -            <div><span class="date">3 days ago</span><span> - </span><span 
class="author">Author name</span></div>
 -            <img src="{{ site.baseurl }}/static/img/post-next.png">
 -          </div>
 -        </section>            
 -        <section class="nextprev-posts">                                      
   
 -          <div class="prev col-sm-6">
 -            <div class="header"><a href="{{ site.baseurl }}{{ post.url 
}}">Prev article</a></div>
 -            <div class="title"><a href="{{ site.baseurl }}{{ post.url 
}}">Title prev article</a></div>
 -            <div><span class="date">3 days ago</span><span> - by </span><span 
class="author">Author name</span></div>
 -            <div class="excerpt">Gumbo beet greens corn soko endive gumbo 
gourd. Parsley shallot courgette tatsoi pea sprouts fava bean collard greens 
wakame tomato...</div>
 -          </div>
 -          <div class="next col-sm-6">
 -            <div class="header"><a href="{{ site.baseurl }}{{ post.url 
}}">Next article</a></div>
 -            <div class="title"><a href="{{ site.baseurl }}{{ post.url 
}}">Title next article</a></div>
 -            <div><span class="date">2 days ago</span><span> - by </span><span 
class="author">Author name</span></div>
 -            <div class="excerpt"> Dandelion cucumber earthnut pea peanut soko 
zucchini. Gumbo beet greens corn soko endive gumbo gourd... </div>
 -          </div>                                                
 -        </section>               
 -     </div>       
 -  </div>
 +    <div id="content" class="container">
 +         <div class="row">
 +            <div class="blogHeader">
 +                <h1>Blog</h1>
 +                <div>
-                     <!-- <img src="{{ site.baseurl 
}}/static/img/subscribe.png"> -->
-                     <!-- <a href="{{ site.baseurl }}{{ site.rss_path 
}}">Subscribe</a> -->
++                    <img src="{{ site.baseurl }}/static/img/subscribe.png">
++                    <a href="{{ site.baseurl }}{{ site.rss_path 
}}">Subscribe</a>
 +                </div>
 +            </div>
 +            <div class="post">
 +                <header>
 +                    <div class="title">{{ page.title }}</div>
 +                    <div class="author">By: {{ page.author.name }}</div>
 +                    <div class="date">{{ page.date | date_to_string }}</div>
 +                </header>
 +                <section>
 +                    <div>
 +                        {{ content }}
 +                    </div>
 +                </section>
 +                <footer>
 +                    <div class="row">
 +                        <div class="col-sm-6">
 +                            {% if page.previous %}
 +                                <a href="{{ site.baseurl }}{{ 
page.previous.url }}">Previous</a>
 +                                <br>
 +                                <br>
 +                                <a class="title" href="{{ site.baseurl }}{{ 
page.previous.url }}">{{ page.previous.title }}</a>
 +                                <div class="date"> {{ page.previous.date | 
date_to_string }} - By {{ page.previous.author.name }} </div>
 +                                <div class="content"> {{ 
page.previous.content | strip_html | truncatewords:20 }} </div>
 +                            {% endif %}
 +                        </div>
 +                        <div class="col-sm-6">
 +                            {% if page.next %}
 +                                <a href="{{ site.baseurl }}{{ page.next.url 
}}">Next</a>
 +                                <br>
 +                                <br>
 +                                <a class="title" href="{{ site.baseurl }}{{ 
page.next.url }}">{{ page.next.title }}</a>
 +                                <div class="date"> {{ page.next.date | 
date_to_string }} - By {{ page.next.author.name}} </div>
 +                                <div class="content"> {{ page.next.content | 
strip_html | truncatewords:20 }} </div>
 +                            {% endif %}
 +                        </div>
 +                    </div>
 +                </footer>
 +                <div class="disqus">
 +                    {% include disqus.html %}
 +                </div>
 +            </div>
 +        </div>
 +    </div>
 +</div>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/efbd1390/www/index.html
----------------------------------------------------------------------
diff --cc www/index.html
index 4739b0f,f124ae2..5a362c9
--- a/www/index.html
+++ b/www/index.html
@@@ -20,15 -20,11 +21,15 @@@ permalink: 
                  <p>Target multiple platforms with one code base</p>
                  <p>Free and open source</p>
                  <div>
-                     <img src="{{ site.baseurl }}/static/img/4-platforms.png" 
/>
+                     <img src="{{ site.baseurl 
}}/static/img/platform-logos.svg" width="188px" /><a 
href="#supported_platforms_section" class="platforms_more">+6 more...</a>
                  </div>
                  <div>
 -                    <button type="button" class="btn btn-lg btn-primary">Get 
Started</button>
 -                    <button type="button" class="btn btn-lg 
btn-primary">Documentation</button>
 +                    <a href="#getstarted" class="btn btn-lg btn-primary">
 +                        Get Started
 +                    </a>
 +                    <a href="{{ site.baseurl }}/docs/en/edge" class="btn 
btn-lg btn-primary">
 +                        Documentation
 +                    </a>
                  </div>
              </div>
          </div>
@@@ -62,11 -58,9 +63,10 @@@
      <!-- Example row of columns -->
      <div class="row">
          <div class="col-md-12 text-center">
 +            <a id="getstarted" name="getstarted" class="fragment-anchor"></a>
              <h1>Get Started Fast</h1>
              <p>Looks like you're using
-                 <span id="current_os">Windows</span>
-                 to develop your apps</p>
+                 <span id="current_os">Windows</span> to develop your apps</p>
              <p>
                  <a href="#" role="button">Use a different OS?</a>
              </p>
@@@ -181,6 -172,6 +180,7 @@@
              </div>
          </div>
      </div><!-- /container -->
++
      <div class="container-fluid supported_platforms">
          <div class="container">
              <div class="row">
@@@ -192,70 -183,9 +192,11 @@@
              </div>
          </div>
      </div>
-     <div class="container">
-         <div class="row showcase_section_intro">
-             <div class="col-md-12 text-center">
-                 <h1>Codorva Tools</h1>
-                 <h2>Work with Cordova even more efficiently</h2>
-                 <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
Donec erat sem, cursus quis nibh porta, scelerisque blandit lorem. Vivamus 
blandit nec odio non bibendum. Morbi efficitur purus ut metus viverra sodales. 
In aliquet nunc sagittis, dignissim libero ut, vulputate nisi. Phasellus 
vulputate fermentum libero, lorem hah.</p>
-             </div>
-         </div>
-         <!-- ROW 1 Starts -->
-         <div class="row cordova_tools_gallery">
-             {% for tool in site.data.tools %}
-             <div class="col-lg-2 col-sm-va card">
-                 <div class="card_inner">
-                     <img src="{{ site.baseurl }}/static/img/tools/{{ 
tool.image }}" class="center-block"/>
-                     <p class="card_title">
-                         {{ tool.name }}
-                     </p>
-                     <p>
-                         {{ tool.description | truncatewords:25 }}
-                     </p>
-                 </div>
-             </div>
-             {% endfor %}
-         </div>
-         <div class="row"> <!-- Add yours or see more links -->
-             <div class="col-sm-12">
-                 <div class="pull-right add_seemore_links">
-                     <a href="#">Add your tool</a>
-                 </div>
-             </div>
-         </div>
-     </div><!-- /container -->
 +
-     <div class="container">
-         <div class="row showcase_section_intro">
-             <div class="col-md-12 text-center">
-                 <h1>Sample Cordova Apps</h1>
-                 <h2>See examples how to access native device APIs and 
more</h2>
-             </div>
-         </div>
-         <div class="row cordova_tools_gallery">
-             {% for app in site.data.sample-apps %}
-             <div class="col-lg-2 col-sm-4 card">
-                 <div class="sample_app_thumb"></div>
-                 <div class="card_inner">
-                     <p class="card_title">{{ app.name }}</p>
-                     <p>{{ app.description | truncatewords:10 }}</p>
-                 </div>
-             </div>
-             {% endfor %}
-         </div>
-         <div class="row"> <!-- Add yours or see more links -->
-             <div class="col-sm-12">
-                 <div class="pull-right add_seemore_links">
-                     <a href="#">Add your app</a>
-                 </div>
-             </div>
-         </div>
-         <div class="row">
-             <p>
-                 &nbsp;
-             </p>
-         </div>
-     </div>
+     {% comment %} <!--Remove these comment markers to include the Tools and 
Sample Apps sections. -->
+     {% include tools_and_samples.html %}
 -    {% endcomment %} <!-- End of comment -->
++    {% endcomment %}
++
  </div><!-- /container-fluid -->
  
  

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/efbd1390/www/static/css-src/_blog.scss
----------------------------------------------------------------------
diff --cc www/static/css-src/_blog.scss
index 0000000,25161f0..79535e5
mode 000000,100644..100644
--- a/www/static/css-src/_blog.scss
+++ b/www/static/css-src/_blog.scss
@@@ -1,0 -1,294 +1,314 @@@
+ .blog{
 -      padding-top:20px;       
 -      .blogHeader{    
 -              position: relative;
 -              padding:0 15px 25px 15px;       
 -              h1{
 -                      color: #b58733;
 -                      font-size: 30pt;                
 -              }                       
 -              div{
 -                      position: absolute;
 -                      top: 20px;      
 -              left: 96px;
 -                                      
 -                      img{
 -                              float: left;
 -                              padding-left:14px;
 -                      }
 -                      a{
 -                              float: left;
 -                              font-size: 12pt;
 -                              padding-left:4px;
 -                              font-weight: lighter;
 -                              color: #4cc2e4;
 -                      }       
 -              }                                       
 -      }
 -      //landing page
 -      .blog-list{
 -              max-width: 700px;
 -              padding-top: 30px;
 -              padding-right: 30px;
 -              
 -              ul {
 -                      list-style-type: none;
 -              }
 -              
 -              .posts{
 -      
 -                      li:first-child header .adorner
 -                      {
 -                              background-color: #3992ab;
 -                      }               
 -                      
 -                      header{
 -                              
 -                              position: relative;
 -                              height: 64px;
 -                              
 -                              .adorner{
 -                                      height: 50px;
 -                                  width: 5px;
 -                                  background-color: #f2f2f2;
 -                                  position: absolute;
 -                                  left: -20px;
 -                              }
 -                                              
 -                              .title{
 -                                      text-overflow: ellipsis;
 -                                      overflow: hidden;
 -                                      white-space: nowrap;
 -                              }
 -                              
 -                              div:nth-of-type(2){
 -                                      color: #b58733;
 -                                      font-size: 18pt;
 -                                      top:-4px;
 -                                      position: relative;
 -                                      
 -                                      span {
 -                                          font-size: 80%;
 -                                              color: #999;
 -                                              position: relative;
 -                                              top:-6px;
 -                                      }
 -                                      
 -                                      .date{
 -                                              color: #2f2f2f;
 -                                      }                       
 -                              }               
 -                      }
 -                      section{
 -                              padding-bottom: 100px;                          
                
 -                      }
 -                      
 -              }
 -
 -      }
 -      
 -      .social-container{
 -              max-width: 360px;
 -              padding-top: 140px;
 -              
 -              .container{
 -                      background-color: #f2f2f2;
 -                      width: 330px;
 -                      height: 868px;
 -                      
 -                      .header{
 -                          position: relative;
 -                          padding-top: 24px;
 -                          padding-bottom: 20px;
 -                              
 -                              div{
 -                                      float:left;
 -                                      color: #808080;
 -                                      font-size: 18px;
 -                                      padding-left:2px;
 -                              }
 -                              
 -                              img{
 -                                      padding-left:18px;
 -                              }
 -                              
 -                      }
 -                      
 -                      .feed{
 -                          background-color: white;
 -                              height: 730px;
 -                          padding: 14px;
 -                              
 -                              ul {
 -                                      list-style-type: none;
 -                                      padding: 0;
 -                                      
 -                                      li{
 -                                              position: relative;
 -                                      
 -                                              img{
 -                                                      top: 0px;
 -                                                      float: left;
 -                                              }
 -                                              .name{
 -                                                      color: black;
 -                                                      text-overflow: ellipsis;
 -                                                      overflow: hidden;
 -                                                      white-space: nowrap;
 -                                                      font-weight: bold;
 -                                                      font-size: 110%;
 -                                                      padding-left: 8px;
 -                                              }
 -                                              .handle{
 -                                                      color:gray;
 -                                                      font-weight: lighter;
 -                                                      text-overflow: ellipsis;
 -                                                      overflow: hidden;
 -                                                      white-space: nowrap;
 -                                                      font-size: 90%; 
 -                                                      padding-left: 7px;
 -                                                      margin-top: -3px;       
                                
 -                                              }
 -                                              .date{
 -                                                      color: gray;
 -                                                      font-weight: bold;
 -                                                      float: right;
 -                                              }
 -                                              .content{
 -                                                      color: black;
 -                                                      padding-top: 4px;
 -                                                      padding-left: 1px;
 -                                              }                               
                                                                        
 -                                      }
 -                                                                              
 -                              }
 -                      }
 -                      .promo{
 -                              color: gray;
 -                          background-color: white;
 -                          height: 42px;
 -                          padding-top: 10px;
 -                          margin-top: 12px;
 -                          text-align: center;
 -                          font-size: 110%;
 -                      }
 -
 -              }
 -      
 -      }
 -      
 -      
 -      //blog post page
 -      div.post{
 -              padding:0 15px;
 -              
 -              header{
 -
 -                      .title{
 -                              color: #3992ab;
 -                              font-size: 30pt;
 -                      }
 -                      .author, .date{
 -                              font-size: 14pt;
 -                              color: #999;
 -                              padding: 0 4px;                 
 -                      }
 -                      .date{
 -                              float:right;
 -                              position: relative;
 -                              top:-20pt;              
 -                      }                                               
 -              }               
 -              section > div.content{
 -                      padding: 40px 0;
 -                      color: black;
 -              }       
 -              
 -      }
 -      
 -      section.nextprev-posts{                         
 -              div{                    
 -                      .header{
 -                              padding: 10px 0;                                
 -                      }                                       
 -                      .title{
 -                              color: #3992ab;
 -                              font-size: 14pt;
 -                      }
 -                      span{
 -                              font-size: 9pt;
 -                              color: #999;
 -                              padding: 0 4px;                 
 -                      }                                               
 -              }
 -              .next , .prev{
 -                      padding: 10px 15px;
 -              }                                                               
                        
 -      }
 -      
 -      section.nextprev-controls{
 -                                              
 -              div{
 -                      position: fixed;
 -                      top:37%;        
 -                      .title{
 -                              color: white;
 -                              font-size: 12pt;                                
                                
 -                      }
 -                      span{
 -                              font-size: 9pt;
 -                              color: #999;
 -                              padding: 0 2px;                         
 -                      }
 -                      div{
 -                              position: relative;
 -                              top: 64px;
 -                              left: 20px;     
 -                              z-index:10;
 -                              width: 240px;
 -                              text-overflow: ellipsis;
 -                              overflow: hidden;
 -                              white-space: nowrap;                            
 -                      }                               
 -              }
 -                              
 -              .next {
 -                      right: 0px;
 -                      height:90px;
 -                      width: 321px;
 -                      top:calc(37% - 38px);   
 -                      img{
 -                              position: fixed;
 -                              right: 0px;
 -                      }                                                       
 -              }
 -              .prev{
 -                      left:0px;                       
 -              }
 -              
 -              
 -              @media (max-width: 1800px) { 
 -                      .next {
 -                              img{
 -                              clip: rect(0px, 321px, 89px, 262px);
 -                                      top:37%;
 -                              }                                               
        
 -                      }
 -                      div{    
 -                              .title{
 -                                      display:none;                           
 -                              }
 -                              span{
 -                                      display:none;  
 -                              }                               
 -                      }                                               
 -              }
 -              @media (max-width: 1300px) { 
 -                      .next, .prev {
 -                              img{
 -                              display:none;  
 -                              }                                               
        
 -                      }
 -              }                                                               
                                                        
 -      }                                               
 -}
++    .blogHeader{
++        position: relative;
++        padding:0 15px 25px 15px;
++        h1{
++            color: #b58733;
++            font-size: 30pt;
++        }
++        div{
++            position: absolute;
++            top: 20px;
++            left: 96px;
++
++            img{
++                float: left;
++                padding-left:14px;
++            }
++            a{
++                float: left;
++                font-size: 12pt;
++                padding-left:4px;
++                font-weight: lighter;
++                color: #4cc2e4;
++            }
++        }
++    }
++    //landing page
++    .blog-list{
++        max-width: 700px;
++        padding-top: 10px;
++        padding-right: 30px;
++
++        ul {
++            list-style-type: none;
++        }
++
++        .posts{
++
++            li .newBlog
++            {
++                background-color: #3992ab;
++            }
++
++            header{
++
++                position: relative;
++                height: 64px;
++
++                .adorner{
++                    height: 50px;
++                    width: 5px;
++                    background-color: #f2f2f2;
++                    position: absolute;
++                    left: -20px;
++                }
++
++                .title{
++                    text-overflow: ellipsis;
++                    overflow: hidden;
++                    white-space: nowrap;
++                }
++
++                div:nth-of-type(2){
++                    color: #b58733;
++                    font-size: 18pt;
++                    top:-4px;
++                    position: relative;
++
++                    span {
++                        font-size: 80%;
++                        color: #999;
++                        position: relative;
++                        top:-6px;
++                    }
++
++                    .date{
++                        color: #2f2f2f;
++                    }
++
++                    .comment{
++                        float: right;
++                        font-size: 15px;
++                    }
++                }
++            }
++            section{
++                padding-bottom: 100px;
++            }
++
++        }
++
++    }
++
++    .social-container{
++        max-width: 360px;
++        padding-top: 40px;
++
++        .container{
++            background-color: #f2f2f2;
++            width: 330px;
++            height: 868px;
++
++            .header{
++                position: relative;
++                padding-top: 24px;
++                padding-bottom: 20px;
++
++                div{
++                    float:left;
++                    color: #808080;
++                    font-size: 18px;
++                    padding-left:2px;
++                }
++
++                img{
++                    padding-left:18px;
++                }
++
++            }
++
++            .feed{
++                background-color: white;
++                height: 730px;
++                padding: 14px;
++
++                ul {
++                    list-style-type: none;
++                    padding: 0;
++
++                    li{
++                        position: relative;
++
++                        img{
++                            top: 0px;
++                            float: left;
++                        }
++                        .name{
++                            color: black;
++                            text-overflow: ellipsis;
++                            overflow: hidden;
++                            white-space: nowrap;
++                            font-weight: bold;
++                            font-size: 110%;
++                            padding-left: 8px;
++                        }
++                        .handle{
++                            color:gray;
++                            font-weight: lighter;
++                            text-overflow: ellipsis;
++                            overflow: hidden;
++                            white-space: nowrap;
++                            font-size: 90%;
++                            padding-left: 7px;
++                            margin-top: -3px;
++                        }
++                        .date{
++                            color: gray;
++                            font-weight: bold;
++                            float: right;
++                        }
++                        .content{
++                            color: black;
++                            padding-top: 4px;
++                            padding-left: 1px;
++                        }
++                    }
++
++                }
++            }
++            .promo{
++                color: gray;
++                background-color: white;
++                height: 42px;
++                padding-top: 10px;
++                margin-top: 12px;
++                text-align: center;
++                font-size: 110%;
++            }
++
++        }
++
++    }
++
++    //blog post page
++    div.post{
++        padding:0 15px;
++
++        header{
++
++            .title{
++                color: #3992ab;
++                font-size: 30pt;
++            }
++            .author, .date{
++                font-size: 14pt;
++                color: #999;
++                padding: 0 4px;
++            }
++            .date{
++                float:right;
++                position: relative;
++                top:-20pt;
++            }
++        }
++        section > div.content{
++            padding: 40px 0;
++            color: black;
++        }
++        footer{
++            .title{
++                color: #3992ab;
++                font-size: 12pt;
++                margin-top: 20px;
++            }
++            .author, .date{
++                font-size: 10pt;
++                color: #999;
++                padding: 0 2px;
++            }
++            .content{
++                max-height: 40px;
++            }
++        }
++    }
++    .disqus{
++        margin-top: 30px;
++    }
++
++    section.nextprev-posts{
++        div{
++            .header{
++                padding: 10px 0;
++            }
++            .title{
++                color: #3992ab;
++                font-size: 14pt;
++            }
++            span{
++                font-size: 9pt;
++                color: #999;
++                padding: 0 4px;
++            }
++        }
++        .next , .prev{
++            padding: 10px 15px;
++        }
++    }
++
++    section.nextprev-controls{
++
++        div{
++            position: fixed;
++            top:37%;
++            .title{
++                color: white;
++                font-size: 12pt;
++            }
++            span{
++                font-size: 9pt;
++                color: #999;
++                padding: 0 2px;
++            }
++            div{
++                position: relative;
++                top: 64px;
++                left: 20px;
++                z-index:10;
++                width: 240px;
++                text-overflow: ellipsis;
++                overflow: hidden;
++                white-space: nowrap;
++            }
++        }
++
++        .next {
++            right: 0px;
++            height:90px;
++            width: 321px;
++            top:calc(37% - 38px);
++            img{
++                position: fixed;
++                right: 0px;
++            }
++        }
++        .prev{
++            left:0px;
++        }
++
++
++        @media (max-width: 1800px) {
++            .next {
++                img{
++                    clip: rect(0px, 321px, 89px, 262px);
++                    top:37%;
++                }
++            }
++            div{
++                .title{
++                    display:none;
++                }
++                span{
++                    display:none;
++                }
++            }
++        }
++        @media (max-width: 1300px) {
++            .next, .prev {
++                img{
++                    display:none;
++                }
++            }
++        }
++    }
++}

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/efbd1390/www/static/css-src/_docs.scss
----------------------------------------------------------------------
diff --cc www/static/css-src/_docs.scss
index 0000000,1012fd8..394160c
mode 000000,100644..100644
--- a/www/static/css-src/_docs.scss
+++ b/www/static/css-src/_docs.scss
@@@ -1,0 -1,77 +1,68 @@@
+ @import 'main';
+ 
 -.site-toc-container {
 -    position: fixed;
 -}
+ .site-toc-title {
+     font-weight: 300;
+     font-size: 22px;
+     text-transform: uppercase;
+ }
+ 
+ /* outer ToC for the site */
+ .site-toc {
+     padding: 0px;
+ }
+ .site-toc li {
+     list-style: none;
+ }
+ .site-toc > li {
+     list-style: none;
+     font-size: 18px;
+     font-weight: 300;
+     padding: 0.5em 0em;
+ }
+ .site-toc > li .this-page {
+     font-weight: bold;
+ }
+ 
+ /* inner ToC for the page */
+ .page-toc ul {
+     padding: 14px 0px 0px 0px;
+ }
+ .page-toc ul > li {
+     padding: 0.5em 0em 0.5em 1em;
+     font-size: 14px;
+     border-left: 0.5em solid rgba($brand-primary, 0.5);
+ }
+ .page-toc ul > li.toc-active {
+     font-weight: bold;
+     border-left: 0.5em solid $brand-primary;
+ }
+ 
+ /* header above page content */
+ .content-header {
+     text-align: right;
+     margin-top: 22px;
+ }
+ .content-header .dropdown {
+     display: inline-block;
+     margin-left: 0.3em;
+ }
++.content-header .dropdown .selected {
++    font-weight: bold;
++    font-style: italic;
++}
+ .content-header .dropdown button.dropdown-toggle {
+     border-radius: 4px;
+     background-color: rgb(214, 214, 214);
+     &:hover {
+         background-color: rgb(191, 191, 191);
+     }
+ }
+ .content-header .edit {
+     margin-right: 1em;
+     margin-left: 1em;
+ }
+ 
 -/*
 - * the id that gets assigned to each heading in a page,
 - * and which gets referred by the <a>s in the page ToC
 - */
 -.page-toc-anchor {
 -    display: block;
 -    position: relative;
 -    bottom: 50px;
 -}
 -
+ /* missing version highlight */
+ .missing-version {
+     color: gray !important;
+ }

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/efbd1390/www/static/css-src/main.scss
----------------------------------------------------------------------
diff --cc www/static/css-src/main.scss
index 1bba377,604f2b8..7a2d41a
--- a/www/static/css-src/main.scss
+++ b/www/static/css-src/main.scss
@@@ -34,227 -33,24 +33,157 @@@ $gray-20: lighten($gray-base, 80%)
  $gray-10: lighten($gray-base, 90%);
  $brand-primary: #4CC2E4;
  
- #hero {
-       height:1020px;
-       background-color:$gray-transparent;
-     background-image: url("{{ site.baseurl }}/static/img/wisplight.jpg");
-     background-size: cover;
-       position:relative;
-       color:white;
-       #hero_section {
-               width:730px;
-               font-size:18px;
-               margin-top:-100px;  /* vertically centers more accuaretly since 
bottom bar is absolutely positioned*/
-               #hero_section_left {
-                       width:312px;
-                       float:left;
-               }
-               #hero_section_right {
-                       width:730px - 312px;
-                       float:right;
-                       div {
-                               padding-bottom:20px;
-                       }
-               }
-       }
-       #hero_logo {
-               width:350px;
-               padding-top:40px;
-               padding-bottom:20px;
-       }
- }
- 
- #hero_bottom_strip {
-     position: absolute;
-     top: 100%;
-     min-height: 200px;
-     background-color: rgba(128,128,128,.15);
-     width: 100%;
-     margin: 0;
-     /* margin-top: -200px; */ /* Less responsive */
-     transform: translateY(-100%);
-       .container {
-               padding-top:55px;
-               padding-bottom:55px;
-               font-size: 18px;
-       }
-       .sprite_img {
-               position:relative;
-           left: 0px;
-           margin: 0;
-           padding: 0;
-               top:0;
-               width: 85px;
-               height: 85px;
-               background-repeat: no-repeat;
-       background-size: cover;
-       }
- }
- .value_prop {
- 
- }
- 
- @mixin sprite-img($a, $b) {
-       background: url("{{ site.baseurl }}/static/img/value-prop-sprite.svg") 
$a $b;
- }
+ /* Grid size (mirrors Bootstraps) */
+ $screen-sm-min: 768px;
+ $screen-xs-max: $screen-sm-min - 1;
+ $screen-md-min: 992px;
+ $screen-sm-max: $screen-md-min - 1;
+ $screen-lg: (min-width: 1200px);
+ $scree-md-max: $screen-lg - 1;
  
- #sprite_shared_code { @include sprite-img(0px, 0) }
- #sprite_offline { @include sprite-img(-84px, 0) }
- #sprite_apis { @include sprite-img(-84px*2, 0) }
  
- .navbar-brand {
-       padding:0;
-       position: absolute;
+ /* Mixin that prefixes any CSS rule */
+ @mixin vendor-prefix($property, $argument) {
+   -webkit-#{$property}: #{$argument};
+   -ms-#{$property}: #{$argument};
+   -moz-#{$property}: #{$argument};
+   -o-#{$property}: #{$argument};
+   #{$property}: #{$argument};
  }
- img#logo_top {
-       width:190px;
-       padding:5px;
- }
- 
- @media (min-width: 768px) { /* Center the navs when not collapsed */
-       .nav_bar_center {
-               text-align:center;
-               height:50px;
-       }
-       .nav_bar_center > ul {
-               display: inline-block;
-               float:none;
-       }
-   }
  
 +.vertical-center-parent {
 +      position: relative;
 +      width:100%;
 +      height:100%;
 +      .vertical-center-child {
 +              position:absolute;
 +              top:50%;
 +              left:50%;
 +              transform:translate(-50%,-50%);
 +      }
 +}
 +
 +/*
 +********* Getting Started ***********
 +*/
 +#current_os {
 +      font-weight: bold;
 +}
 +.number_circle {
 +    display: inline-block;
 +    width: 50px;
 +      height:50px;
 +    padding: 8px;
 +    font-size: 24px;
 +    color: #ffffff;
 +    vertical-align: middle;
 +    white-space: nowrap;
 +    text-align: center;
 +    background-color: $brand-primary-darker;
 +    border-radius: 50%;
 +      margin-top: 20px;
 +}
 +
 +.well_code {
 +      @extend .well;
 +      padding-bottom:19px + 50px;
 +      position:relative;
 +      background-color: $gray-10;
 +      margin-top:46px;
 +      div {
 +              @extend .well_code;
 +              position: absolute;
 +          top: 100%;
 +          transform: translateY(-100%);
 +          padding: 0;
 +              margin:0;
 +              background-color: $gray-20;
 +              width: 100%;
 +              margin-left:-19px;
 +              button {
 +                      background-color: $brand-primary;
 +                      margin:5px;
 +              }
 +      }
 +}
 +
 +
 +/*
 +********* Showcase Section ***********
 +*/
 +.dark {
 +      background-color: $gray-90;
 +}
 +.showcase_section_intro {
 +    margin: auto;
 +      float:none;
 +    max-width: 700px;
 +      h1 { color: $brand-gold; padding-bottom:0; }
 +      h2 { color: white; font-size: 18px; font-weight:normal; padding:0; 
margin-top:0 }
 +      p, span { color: $gray-40; text-align: left; }
 +    padding-top: 4px;
 +      padding-bottom: 35px;
 +}
 +
 +.supported_platforms {
 +      background-color: darken(white, 85%);
 +    margin-left: -15px;
 +    margin-right: -15px;
 +}
 +.platform_logos {
 +      list-style-type: none;
 +      padding-left:0;
 +    padding-top: 20px;
 +    padding-bottom: 20px;
 +}
 +.cordova_tools_gallery {
 +      color:white;
 +      .card {
 +                      padding:8px;
 +                      .card_title {
 +                              color: $brand-primary;
 +                              font-weight: bold;
 +                      }
 +                      .card_inner {
 +                              background-color:darken(white, 85%);
 +                              padding: 32px 16px 32px 16px;
 +                      }
 +                      .sample_app_thumb {
 +                              background-color: #AD6E6E;
 +                width: 100%;
 +                height: 100px;
 +                      }
 +                      img {
 +                              height:50px;
 +                              padding-bottom:5px;
 +                      }
 +              }
 +}
 +.add_seemore_links {
 +      margin-top:10px;
 +      a {     padding-left:30px; }
 +}
 +
 +/* footer */
 +footer {
 +    background-color: white;
 +    position: relative;
 +}
 +footer ul.nav li > a {
 +    padding-left: 0px;
 +}
 +footer .copyright_text {
 +    margin-top: 25px;
 +}
 +
 +/*
 + * position anchirs of fragment links slightly above their targets
 + */
 +.fragment-anchor {
 +    display: block;
 +    position: relative;
 +    bottom: 50px;
 +}
  
  /*
  ********* Modifications to Bootstrap ***********
@@@ -282,6 -78,8 +211,12 @@@ h2 
        padding: 1px 5px;
  }
  
 +.contribute-content {
 +      padding-top: 15px;
 +}
++
+ @import 'home';
+ @import 'blog';
+ @import 'plugins';
+ @import 'contribute';
 -@import 'contact';
++@import 'contact';


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to