cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblot...@apache.org
Subject docs commit: CB-11021 Changing docs styling: improving ToC, changing color scheme for headings, and changing the font.
Date Wed, 06 Apr 2016 23:20:20 GMT
Repository: cordova-docs
Updated Branches:
  refs/heads/master a890e4de3 -> 04aa49086


CB-11021 Changing docs styling: improving ToC, changing color scheme for headings, and changing the font.


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

Branch: refs/heads/master
Commit: 04aa490863eb1d8d091e607f794683fdbf70a7ab
Parents: a890e4d
Author: Dmitry Blotsky <dmitry.blotsky@gmail.com>
Authored: Tue Mar 22 18:35:41 2016 -0700
Committer: Dmitry Blotsky <dmitry.blotsky@gmail.com>
Committed: Wed Apr 6 16:14:56 2016 -0700

----------------------------------------------------------------------
 README.md                                     |   5 +
 gulpfile.js                                   |   2 +
 www/_data/toc/en-dev-manual.yml               |  28 +-
 www/_includes/footer.html                     |  73 ----
 www/_includes/footer_contents.html            |  66 ++++
 www/_includes/footer_docs.html                |   6 +
 www/_includes/footer_site.html                |   6 +
 www/_includes/head.html                       |   3 +
 www/_includes/toc_recursive_main.html         |  26 +-
 www/_layouts/base.html                        |  14 +
 www/_layouts/cordova.html                     |  15 +-
 www/_layouts/docs.html                        | 403 +++++++++++----------
 www/attributions.html                         |  31 ++
 www/docs/en/dev/guide/hybrid/plugins/index.md |  85 ++---
 www/static/css-src/_docs.scss                 | 185 ++++++----
 www/static/css-src/_home.scss                 |  13 +-
 www/static/css-src/lib/bootstrap.css          |   6 +-
 www/static/css-src/main.scss                  |  44 ++-
 18 files changed, 570 insertions(+), 441 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/04aa4908/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 319fb94..18c5f86 100644
--- a/README.md
+++ b/README.md
@@ -390,6 +390,11 @@ You could try a different method to install Ruby. Checkout [rbenv][rbenvgh]. Ins
 
 Please ask for help on the Slack channel. Join at [slack.cordova.io](http://slack.cordova.io/).
 
+Attributions
+============
+
+For attributions for used open-source work, please see the attributions page: `www/attributions.html`.
+
 [ruby_linux]: https://www.ruby-lang.org/en/documentation/installation/#package-management-systems
 [homebrew]: http://brew.sh/
 [linux_node]: https://nodesource.com/blog/nodejs-v012-iojs-and-the-nodesource-linux-repositories#installing-node-js-v0-12

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/04aa4908/gulpfile.js
----------------------------------------------------------------------
diff --git a/gulpfile.js b/gulpfile.js
index 0afd09d..b4acf68 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -257,6 +257,8 @@ gulp.task("watch", ["serve"], function () {
             //      watch all non-docs HTML, and only docs/en/dev HTML because
             //      versions other than dev usually don't change much; this is
             //      an optimization
+            path.join(SOURCE_DIR, "_layouts", "*.html"),
+            path.join(SOURCE_DIR, "_includes", "*.html"),
             path.join(SOURCE_DIR, "**", "*.html") + "!" + path.join(DOCS_DIR, "**"),
             path.join(SOURCE_DIR, "**", "*.md") + "!" + path.join(DOCS_DIR, "**") ,
             path.join(DOCS_DIR, "en", "dev", "**", "*.md") ,

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/04aa4908/www/_data/toc/en-dev-manual.yml
----------------------------------------------------------------------
diff --git a/www/_data/toc/en-dev-manual.yml b/www/_data/toc/en-dev-manual.yml
index 5d437bc..3b28dbe 100644
--- a/www/_data/toc/en-dev-manual.yml
+++ b/www/_data/toc/en-dev-manual.yml
@@ -30,12 +30,12 @@
                     url: "guide/platforms/wp8/home.html"
         -   name: "Manage versions and platforms"
             url: "platform_plugin_versioning_ref/index.html"
-        -   name: "Debug and test"
-            url:
+#         -   name: "Debug and test"
+#             url:
         -   name: "Customize icons"
             url: "config_ref/images.html"
-        -   name: "Automate Tasks"
-            url:
+#         -   name: "Automate Tasks"
+#             url:
         -   name: "Store data"
             url: "cordova/storage/storage.html"
         -   name: "Manage privacy"
@@ -44,14 +44,14 @@
             url: "guide/appdev/security/index.html"
         -   name: "Whitelisting"
             url: "guide/appdev/whitelist/index.html"
-        -   name: "Publish"
-            url:
+#         -   name: "Publish"
+#             url:
 -   name: "Create plugins"
     children:
         -   name: "Create a plugin"
             url: "guide/hybrid/plugins/index.html"
-        -   name: "Register with NPM"
-            url:
+#         -   name: "Register with NPM"
+#             url:
         -   name: "Develop for platforms"
             children:
                 -   name: "Android"
@@ -66,14 +66,14 @@
                     url: "guide/platforms/wp8/plugin.html"
         -   name: "Use Plugman"
             url: "plugin_ref/plugman.html"
-        -   name: "Debug and test"
-            url:
+#         -   name: "Debug and test"
+#             url:
 -   name: "Advanced Topics"
     children:
         -   name: "Embed Cordova in native apps"
             url: "guide/hybrid/webviews/index.html"
-        -   name: "Pass data from Cordova app to host"
-            url:
+#         -   name: "Pass data from Cordova app to host"
+#             url:
         -   name: "Next Steps"
             url: "guide/next/index.html"
 -   name: "Reference"
@@ -136,5 +136,5 @@
 #     children:
 #         -   name: "Share your app in source control"
 #             url:
--   name: "Sample Apps"
-    url:
+# -   name: "Sample Apps"
+#     url:

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/04aa4908/www/_includes/footer.html
----------------------------------------------------------------------
diff --git a/www/_includes/footer.html b/www/_includes/footer.html
deleted file mode 100644
index 50b538e..0000000
--- a/www/_includes/footer.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<div class="blue-divider"></div>
-<footer>
-    <div class="container" id="footer">
-        <div class="row">
-            <div class="col-sm-9">
-                <h1>More Resources</h1>
-                <div class="row">
-                    <div class="col-sm-4">
-                        <h2>General</h2>
-                        <ul class="nav">
-                            <li>
-                                <a target="_blank" href="https://projects.apache.org/project.html?cordova">Apache Project Page</a>
-                            </li>
-                            <li>
-                                <a href="https://dist.apache.org/repos/dist/release/cordova/">Source Distribution</a>
-                            </li>
-                            <li>
-                                <a target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">License</a>
-                            </li>
-                            <li>
-                                <a href="{{ site.baseurl }}/artwork">Artwork</a>
-                            </li>
-                        </ul>
-                    </div>
-                    <div class="col-sm-4">
-                        <h2>Development</h2>
-                        <ul class="nav">
-                            <li><a target="_blank" href="https://github.com/apache?utf8=%E2%9C%93&amp;query=cordova-">Source Code</a></li>
-                            <li><a target="_blank" href="https://issues.apache.org/jira/browse/CB/">Issue Tracker</a></li>
-                            <li><a target="_blank" href="http://stackoverflow.com/questions/tagged/cordova">Stack Overflow</a></li>
-                            <li><a href="{{ site.baseurl }}/contact">Mailing List</a></li>
-                        </ul>
-                    </div>
-                    <div class="col-sm-4">
-                        <h2>Apache Software Foundation</h2>
-                        <ul class="nav">
-                            <li>
-                                <a target="_blank" href="http://www.apache.org/">About ASF</a>
-                            </li>
-                            <li>
-                                <a target="_blank" href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a>
-                            </li>
-                            <li>
-                                <a target="_blank" href="http://www.apache.org/foundation/thanks.html">Thanks</a>
-                            </li>
-                            <li>
-                                <a target="_blank" href="http://www.apache.org/security/">Security</a>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-3">
-                <h1>Contribute</h1>
-                <p style="padding-top:20px"><strong>Help Cordova move forward!</strong></p>
-                <p>Report bugs, improve the docs, or contribute to the code.</p>
-                <a href="{{ site.baseurl }}/contribute" class="btn btn-lg btn-primary">
-                    Learn More
-                </a>
-                <p style="padding-top:20px"> <a href="https://twitter.com/apachecordova" class="twitter-follow-button" data-show-count="false">Follow @apachecordova</a></p>
-                <script async defer src="https://slack.cordova.io/slackin.js"></script>
-            </div>
-        </div>
-        <p class="copyright_text">
-            Copyright &copy; 2012, 2013, 2015 The Apache Software Foundation, Licensed under the <a target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>
-            Apache and the Apache feather logos are <a target="_blank" href="http://www.apache.org/foundation/marks/list/">trademarks</a> of The Apache Software Foundation.
-        </p>
-        <a class="closing" href="#top"></a>
-    </div>
-</footer>
-
-<script defer type="text/javascript" src="{{ site.baseurl }}/static/js/index.js"></script>
-<script defer type="text/javascript" src="{{ site.baseurl }}/static/js/twitter.js"></script>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/04aa4908/www/_includes/footer_contents.html
----------------------------------------------------------------------
diff --git a/www/_includes/footer_contents.html b/www/_includes/footer_contents.html
new file mode 100644
index 0000000..594b2f9
--- /dev/null
+++ b/www/_includes/footer_contents.html
@@ -0,0 +1,66 @@
+<div class="row">
+    <div class="col-sm-9">
+        <h1>More Resources</h1>
+        <div class="row">
+            <div class="col-sm-4">
+                <h2>General</h2>
+                <ul class="nav">
+                    <li>
+                        <a target="_blank" href="https://projects.apache.org/project.html?cordova">Apache Project Page</a>
+                    </li>
+                    <li>
+                        <a href="https://dist.apache.org/repos/dist/release/cordova/">Source Distribution</a>
+                    </li>
+                    <li>
+                        <a target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">License</a>
+                    </li>
+                    <li>
+                        <a href="{{ site.baseurl }}/artwork">Artwork</a>
+                    </li>
+                </ul>
+            </div>
+            <div class="col-sm-4">
+                <h2>Development</h2>
+                <ul class="nav">
+                    <li><a target="_blank" href="https://github.com/apache?utf8=%E2%9C%93&amp;query=cordova-">Source Code</a></li>
+                    <li><a target="_blank" href="https://issues.apache.org/jira/browse/CB/">Issue Tracker</a></li>
+                    <li><a target="_blank" href="http://stackoverflow.com/questions/tagged/cordova">Stack Overflow</a></li>
+                    <li><a href="{{ site.baseurl }}/contact">Mailing List</a></li>
+                </ul>
+            </div>
+            <div class="col-sm-4">
+                <h2>Apache Software Foundation</h2>
+                <ul class="nav">
+                    <li>
+                        <a target="_blank" href="http://www.apache.org/">About ASF</a>
+                    </li>
+                    <li>
+                        <a target="_blank" href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a>
+                    </li>
+                    <li>
+                        <a target="_blank" href="http://www.apache.org/foundation/thanks.html">Thanks</a>
+                    </li>
+                    <li>
+                        <a target="_blank" href="http://www.apache.org/security/">Security</a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
+    <div class="col-sm-3">
+        <h1>Contribute</h1>
+        <p style="padding-top:20px"><strong>Help Cordova move forward!</strong></p>
+        <p>Report bugs, improve the docs, or contribute to the code.</p>
+        <a href="{{ site.baseurl }}/contribute" class="btn btn-lg btn-primary">
+            Learn More
+        </a>
+        <p style="padding-top:20px"> <a href="https://twitter.com/apachecordova" class="twitter-follow-button" data-show-count="false">Follow @apachecordova</a></p>
+        <script async defer src="https://slack.cordova.io/slackin.js"></script>
+    </div>
+</div>
+<p class="copyright_text">
+    Copyright &copy; 2012, 2013, 2015 The Apache Software Foundation, Licensed under the <a target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>
+    Apache and the Apache feather logos are <a target="_blank" href="http://www.apache.org/foundation/marks/list/">trademarks</a> of The Apache Software Foundation.
+    <br/>
+    "Raleway" font used under license. For details see the <a href="{{ site.baseurl }}/attributions/">attributions page</a>.
+</p>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/04aa4908/www/_includes/footer_docs.html
----------------------------------------------------------------------
diff --git a/www/_includes/footer_docs.html b/www/_includes/footer_docs.html
new file mode 100644
index 0000000..68c6a5c
--- /dev/null
+++ b/www/_includes/footer_docs.html
@@ -0,0 +1,6 @@
+<div class="blue-divider"></div>
+<footer>
+    <div class="container-fluid">
+        {% include footer_contents.html %}
+    </div>
+</footer>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/04aa4908/www/_includes/footer_site.html
----------------------------------------------------------------------
diff --git a/www/_includes/footer_site.html b/www/_includes/footer_site.html
new file mode 100644
index 0000000..4b7fb1d
--- /dev/null
+++ b/www/_includes/footer_site.html
@@ -0,0 +1,6 @@
+<div class="blue-divider"></div>
+<footer>
+    <div class="container">
+        {% include footer_contents.html %}
+    </div>
+</footer>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/04aa4908/www/_includes/head.html
----------------------------------------------------------------------
diff --git a/www/_includes/head.html b/www/_includes/head.html
index 4a77bcf..2e34e5a 100644
--- a/www/_includes/head.html
+++ b/www/_includes/head.html
@@ -25,6 +25,9 @@
     <link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/static/css/main.css">
     <link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/static/css/lib/syntax.css">
 
+    <!-- Fonts -->
+    <!-- For attribution information, see www/attributions.html -->
+    <link href='https://fonts.googleapis.com/css?family=Raleway:700,400,300,700italic,400italic,300italic' rel='stylesheet' type='text/css'>
 
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/04aa4908/www/_includes/toc_recursive_main.html
----------------------------------------------------------------------
diff --git a/www/_includes/toc_recursive_main.html b/www/_includes/toc_recursive_main.html
index e5a4f9e..b42d50d 100644
--- a/www/_includes/toc_recursive_main.html
+++ b/www/_includes/toc_recursive_main.html
@@ -1,24 +1,18 @@
 <ul class="site-toc">
     {% for entry in include.entries %}
 
-    {% comment %}
-    Skip entries that have no URI and no children.
-    {% endcomment %}
-    {% unless entry.url %}
-        {% unless entry.children %}
-            {% continue %}
-        {% endunless %}
-    {% endunless %}
-
     <li>
-        {% if entry.url != null %}
-        <a class="{% if include.my_entry == entry.url %}this-page{% endif %}" href="{{ include.path_to_root }}{{ entry.url }}">
-            {{ entry.name }}
-        </a>
+        {% if entry.children %}
+            <span class="toc-section-heading">
+                {{ entry.name }}
+            </span>
         {% else %}
-        <span class="toc-section-heading">
-            {{ entry.name }}
-        </span>
+            <a class="{% if include.my_entry == entry.url %}this-page{% endif %}" href="{{ include.path_to_root }}{{ entry.url }}">
+                {{ entry.name }}
+            </a>
+            {% if include.my_entry == entry.url %}
+                <span class="entry-highlight"></span>
+            {% endif %}
         {% endif %}
 
         {% comment %}

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/04aa4908/www/_layouts/base.html
----------------------------------------------------------------------
diff --git a/www/_layouts/base.html b/www/_layouts/base.html
new file mode 100644
index 0000000..c1342cb
--- /dev/null
+++ b/www/_layouts/base.html
@@ -0,0 +1,14 @@
+---
+analytics_id: UA-64283057-3
+---
+
+<!DOCTYPE html>
+<html lang="{% if page.language %}{{ page.language }}{% else %}{{ site.language }}{% endif %}">
+{% include head.html %}
+<body>
+    {{ content }}
+    {% include analytics.html %}
+    <script defer type="text/javascript" src="{{ site.baseurl }}/static/js/index.js"></script>
+    <script defer type="text/javascript" src="{{ site.baseurl }}/static/js/twitter.js"></script>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/04aa4908/www/_layouts/cordova.html
----------------------------------------------------------------------
diff --git a/www/_layouts/cordova.html b/www/_layouts/cordova.html
index 54d5468..40aee7a 100644
--- a/www/_layouts/cordova.html
+++ b/www/_layouts/cordova.html
@@ -1,14 +1,7 @@
 ---
-analytics_id: UA-64283057-3
+layout: base
 ---
 
-<!DOCTYPE html>
-<html lang="{% if page.language %}{{ page.language }}{% else %}{{ site.language }}{% endif %}">
-{% include head.html %}
-<body>
-    {% include header.html %}
-    {{ content }}
-    {% include footer.html %}
-    {% include analytics.html %}
-</body>
-</html>
+{% include header.html %}
+{{ content }}
+{% include footer_site.html %}

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/04aa4908/www/_layouts/docs.html
----------------------------------------------------------------------
diff --git a/www/_layouts/docs.html b/www/_layouts/docs.html
index b3a05fe..665b6fd 100644
--- a/www/_layouts/docs.html
+++ b/www/_layouts/docs.html
@@ -1,9 +1,11 @@
 ---
-layout: cordova
+layout: base
 docs_tab: true
 analytics_id: UA-64283057-1
 ---
 
+{% include header.html %}
+
 <!-- Use the manual ToC, and if it doesn't exist, use the generated one -->
 {% assign toc_dir = site.data.toc %}
 {% if toc_dir.[page.manual_toc] %}
@@ -27,227 +29,232 @@ analytics_id: UA-64283057-1
 <div class="docs container">
 
     <!-- Table of Contents -->
-    <div class="hidden-xs hidden-sm col-md-3 site-toc-container">
-        <h2 class="site-toc-title">{{ page.toc_text }}</h2>
+    <div class="hidden-xs hidden-sm col-md-4 col-lg-3 site-toc-container">
         {% include toc_recursive_main.html entries=tocfile my_entry=my_entry path_to_root=path_to_root %}
     </div>
 
     <!-- Page content -->
-    <div class="col-md-8 col-md-offset-1">
-        <div class=" content-header">
-
-            <!-- ToC Dropdown (for XS and SM sizes only) -->
-            <div class="toc-dropdown dropdown visible-xs-block visible-sm-block">
-                <button class="btn btn-default dropdown-toggle" type="button" id="tocDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-                    {{ page.toc_text }}
-                    <span class="caret"></span>
-                </button>
-                <ul class="dropdown-menu">
-                    {% include toc_recursive_dropdown.html entries=tocfile my_entry=my_entry path_to_root=path_to_root %}
-                </ul>
-            </div>
+    <div class="col-md-8 col-md-offset-4 col-lg-9 col-lg-offset-3 page-content-container container">
+        <div class="page-content row">
+            <div class="col-md-offset-1 col-md-10">
+                <div class="content-header">
+
+                    <!-- ToC Dropdown (for XS and SM sizes only) -->
+                    <div class="toc-dropdown dropdown visible-xs-block visible-sm-block">
+                        <button class="btn btn-default dropdown-toggle" type="button" id="tocDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                            {{ page.toc_text }}
+                            <span class="caret"></span>
+                        </button>
+                        <ul class="dropdown-menu">
+                            {% include toc_recursive_dropdown.html entries=tocfile my_entry=my_entry path_to_root=path_to_root %}
+                        </ul>
+                    </div>
 
-            {% comment %}
-            Show a simple edit link if the page has a specific edit link.
-            {% endcomment %}
-            {% if page.edit_link %}
-                <a class="edit" href="{{ page.edit_link }}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> {{ page.edit_text }}</a>
-
-            {% comment %}
-            Otherwise, have a dropdown of editing options.
-            {% endcomment %}
-            {% else %}
-
-                {% capture edit_link %}{{ site.repo.uri }}/tree/{{ site.repo.branch }}/www/{{ page.path }}{% endcapture %}
-                {% capture version_string %}/{{ page.version }}/{% endcapture %}
-                {% capture language_string %}/{{ page.language }}/{% endcapture %}
-                {% capture src_language_string %}/{{ site.src_language }}/{% endcapture %}
-
-                {% comment %}
-                Compute related edit links (i.e. source language edit link and /dev/ edit link).
-                {% endcomment %}
-                {% assign dev_edit_link     = edit_link | replace:version_string,"/dev/" %}
-                {% assign src_dev_edit_link = dev_edit_link | replace:language_string,src_language_string %}
-
-                {% comment %}
-                NOTE:
-                     Pages that are under /dev/ or /latest/ (i.e. site.latest_docs_version) have page.current set to "true".
-                {% endcomment %}
-
-                <!-- Links for editing -->
-                {% if page.language != site.src_language and page.current %}
-
-                    {% capture page_path_prefix %}docs/{{ page.language }}/{{ page.version }}{% endcapture %}
-                    {% assign page_path_end = page.path | split:"/" | last %}
-                    {% assign page_path     = page.path | replace:page_path_prefix,"docs/en/dev" | replace:page_path_end,"" %}
-                    {% capture crowdin_link %}https://crowdin.com/project/cordova/{{ page.language }}#/cordova-docs/{{ page_path }}{% endcapture %}
-
-                    <a class="edit" href="{{ src_dev_edit_link }}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> {{ page.edit_source_text }}</a>
-                    <a class="edit" href="{{ crowdin_link }}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> {{ page.edit_translation_text }}</a>
-
-                {% else %}
-                    {% if page.version == site.latest_docs_version %}
-                        {% assign edit_link = dev_edit_link %}
-                    {% endif %}
+                    {% comment %}
+                    Show a single edit link if the page has a specific edit link.
+                    {% endcomment %}
+                    {% if page.edit_link %}
+                        <a class="edit" href="{{ page.edit_link }}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> {{ page.edit_text }}</a>
 
-                    <a class="edit" href="{{ edit_link }}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> {{ page.edit_source_text }}</a>
-                {% endif %}
-            {% endif %}
+                    {% comment %}
+                    Otherwise, show editing and translating options.
+                    {% endcomment %}
+                    {% else %}
 
-            <!-- Language dropdown -->
-            <div class="dropdown">
-                <button class="btn btn-default dropdown-toggle" type="button" id="languageDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-                    {{ site.data.docs-versions.[page.language].name }}
-                    <span class="caret"></span>
-                </button>
+                        {% capture edit_link %}{{ site.repo.uri }}/tree/{{ site.repo.branch }}/www/{{ page.path }}{% endcapture %}
+                        {% capture version_string %}/{{ page.version }}/{% endcapture %}
+                        {% capture language_string %}/{{ page.language }}/{% endcapture %}
+                        {% capture src_language_string %}/{{ site.src_language }}/{% endcapture %}
+
+                        {% comment %}
+                        Compute related edit links (i.e. source language edit link and /dev/ edit link).
+                        {% endcomment %}
+                        {% assign dev_edit_link     = edit_link | replace:version_string,"/dev/" %}
+                        {% assign src_dev_edit_link = dev_edit_link | replace:language_string,src_language_string %}
 
-                <!-- List all languages -->
-                <ul class="dropdown-menu" aria-labelledby="languageDropdown">
-                    {% for language_entry in site.data.docs-versions %}
+                        {% comment %}
+                        NOTE:
+                             Pages that are under /dev/ or /latest/ (i.e. site.latest_docs_version) have page.current set to "true".
+                        {% endcomment %}
 
-                    {% assign language_id = language_entry[0] %}
-                    {% assign language    = language_entry[1] %}
+                        <!-- Links for editing -->
+                        {% if page.language != site.src_language and page.current %}
 
-                    {% capture current_language_path %}/docs/{{ page.language }}/{% endcapture %}
-                    {% capture target_language_path %}/docs/{{ language_id }}/{% endcapture %}
+                            {% capture page_path_prefix %}docs/{{ page.language }}/{{ page.version }}{% endcapture %}
+                            {% assign page_path_end = page.path | split:"/" | last %}
+                            {% assign page_path     = page.path | replace:page_path_prefix,"docs/en/dev" | replace:page_path_end,"" %}
+                            {% capture crowdin_link %}https://crowdin.com/project/cordova/{{ page.language }}#/cordova-docs/{{ page_path }}{% endcapture %}
 
-                    {% comment %}
-                    <!--
-                    Replace only the language part of the URI, thereby
-                    redirecting to the same page in the other language.
-                    The page will exist because translations are clones
-                    of each other.
-                     -->
-                    {% endcomment %}
-                    {% assign target_language_url = page.url | replace:current_language_path,target_language_path %}
+                            <a class="edit" href="{{ src_dev_edit_link }}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> {{ page.edit_source_text }}</a>
+                            <a class="edit" href="{{ crowdin_link }}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> {{ page.edit_translation_text }}</a>
 
-                    {% capture missing_version_class %}
-                        {% if language.versions contains page.version %}
                         {% else %}
-                            missing-version
-                        {% endif %}
-                    {% endcapture %}
-
-                    <li>
-                        <a href="{{ site.baseurl }}{{ target_language_url }}" class="{{ missing_version_class }}"
-                        >
-                            {% if page.language == language_id %}
-                                <span class="selected">
-                                    {{ language.name }}
-                                </span>
-                            {% else %}
-                                {{ language.name }}
+                            {% if page.version == site.latest_docs_version %}
+                                {% assign edit_link = dev_edit_link %}
                             {% endif %}
-                        </a>
-                    </li>
-                    {% endfor %}
-                </ul>
-            </div>
-
-            <!-- Version dropdown -->
-            <div class="dropdown">
-                <button class="btn btn-default dropdown-toggle" type="button" id="versionDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-                    {{ page.version }}
-                    {% if page.version == site.latest_docs_version %}
-                        ({{ page.latest_text }})
-                    {% endif %}
-                    <span class="caret"></span>
-                </button>
-                <ul class="dropdown-menu" aria-labelledby="versionDropdown">
 
-                    <!-- List versions available in this language -->
-                    {% for version in site.data.docs-versions.[page.language].versions reversed %}
-                    <li>
-                        {% comment %}
-                        Name the latest version as "latest" to take advantage of
-                        redirects for "/latest/".
-                        {% endcomment %}
-                        {% if version == site.latest_docs_version %}
-                            {% assign version_string = "latest" %}
-                        {% else %}
-                            {% assign version_string = version %}
+                            <a class="edit" href="{{ edit_link }}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> {{ page.edit_source_text }}</a>
                         {% endif %}
+                    {% endif %}
 
-                        {% capture current_version_path %}/docs/{{ page.language }}/{{ page.version }}/{% endcapture %}
-                        {% capture target_version_path %}/docs/{{ page.language }}/{{ version_string }}/{% endcapture %}
-
-                        {% capture version_entry_string %}
-                            {{ version }}
-                            {% if version == site.latest_docs_version %}
+                    <!-- Language dropdown -->
+                    <div class="dropdown">
+                        <button class="btn btn-default dropdown-toggle" type="button" id="languageDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                            {{ site.data.docs-versions.[page.language].name }}
+                            <span class="caret"></span>
+                        </button>
+
+                        <!-- List all languages -->
+                        <ul class="dropdown-menu" aria-labelledby="languageDropdown">
+                            {% for language_entry in site.data.docs-versions %}
+
+                            {% assign language_id = language_entry[0] %}
+                            {% assign language    = language_entry[1] %}
+
+                            {% capture current_language_path %}/docs/{{ page.language }}/{% endcapture %}
+                            {% capture target_language_path %}/docs/{{ language_id }}/{% endcapture %}
+
+                            {% comment %}
+                            <!--
+                            Replace only the language part of the URI, thereby
+                            redirecting to the same page in the other language.
+                            The page will exist because translations are clones
+                            of each other.
+                             -->
+                            {% endcomment %}
+                            {% assign target_language_url = page.url | replace:current_language_path,target_language_path %}
+
+                            {% capture missing_version_class %}
+                                {% if language.versions contains page.version %}
+                                {% else %}
+                                    missing-version
+                                {% endif %}
+                            {% endcapture %}
+
+                            <li>
+                                <a href="{{ site.baseurl }}{{ target_language_url }}" class="{{ missing_version_class }}"
+                                >
+                                    {% if page.language == language_id %}
+                                        <span class="selected">
+                                            {{ language.name }}
+                                        </span>
+                                    {% else %}
+                                        {{ language.name }}
+                                    {% endif %}
+                                </a>
+                            </li>
+                            {% endfor %}
+                        </ul>
+                    </div>
+
+                    <!-- Version dropdown -->
+                    <div class="dropdown">
+                        <button class="btn btn-default dropdown-toggle" type="button" id="versionDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                            {{ page.version }}
+                            {% if page.version == site.latest_docs_version %}
                                 ({{ page.latest_text }})
                             {% endif %}
-                        {% endcapture %}
+                            <span class="caret"></span>
+                        </button>
+                        <ul class="dropdown-menu" aria-labelledby="versionDropdown">
+
+                            <!-- List versions available in this language -->
+                            {% for version in site.data.docs-versions.[page.language].versions reversed %}
+                            <li>
+                                {% comment %}
+                                Name the latest version as "latest" to take advantage of
+                                redirects for "/latest/".
+                                {% endcomment %}
+                                {% if version == site.latest_docs_version %}
+                                    {% assign version_string = "latest" %}
+                                {% else %}
+                                    {% assign version_string = version %}
+                                {% endif %}
+
+                                {% capture current_version_path %}/docs/{{ page.language }}/{{ page.version }}/{% endcapture %}
+                                {% capture target_version_path %}/docs/{{ page.language }}/{{ version_string }}/{% endcapture %}
+
+                                {% capture version_entry_string %}
+                                    {{ version }}
+                                    {% if version == site.latest_docs_version %}
+                                        ({{ page.latest_text }})
+                                    {% endif %}
+                                {% endcapture %}
+
+                                {% comment %}
+                                <!--
+                                Replace only the version part of the URI, thereby
+                                redirecting to the same page in the other version.
+
+                                WARNING:
+                                    this page might not exist in the target version
+                                    because page layouts change from version to version
+                                 -->
+                                {% endcomment %}
+                                {% assign target_version_url = page.url | replace:current_version_path,target_version_path%}
+
+                                <a href="{{ site.baseurl }}{{ target_version_url }}">
+                                    {% if page.version == version %}
+                                        <span class="selected">
+                                            {{ version_entry_string }}
+                                        </span>
+                                    {% else %}
+                                        {{ version_entry_string }}
+                                    {% endif %}
+                                </a>
+                            </li>
+                            {% endfor %}
+                        </ul>
+                    </div>
+                </div>
+
+                <!-- Get URL for this page in the latest version -->
+                {% capture current_version_path %}/docs/{{ page.language }}/{{ page.version }}/{% endcapture %}
+                {% capture latest_version_path %}/docs/{{ page.language }}/latest/{% endcapture %}
+                {% assign latest_url = page.url | replace:current_version_path,latest_version_path %}
+
+                <!-- Show warnings for special versions (i.e. non-latest, and dev) -->
+                {% if page.version == 'dev' or page.version != site.latest_docs_version %}
+
+                    {% if page.version == 'dev' %}
+                        {% assign alert_class = "alert-info" %}
+                        {% assign warning_text = page.in_development_text %}
+                    {% elsif page.version != site.latest_docs_version %}
+                        {% assign alert_class = "alert-danger" %}
+                        {% assign warning_text = page.outdated_text %}
+                    {% endif %}
 
-                        {% comment %}
-                        <!--
-                        Replace only the version part of the URI, thereby
-                        redirecting to the same page in the other version.
-
-                        WARNING:
-                            this page might not exist in the target version
-                            because page layouts change from version to version
-                         -->
-                        {% endcomment %}
-                        {% assign target_version_url = page.url | replace:current_version_path,target_version_path%}
-
-                        <a href="{{ site.baseurl }}{{ target_version_url }}">
-                            {% if page.version == version %}
-                                <span class="selected">
-                                    {{ version_entry_string }}
-                                </span>
-                            {% else %}
-                                {{ version_entry_string }}
-                            {% endif %}
+                    <div class="alert {{ alert_class }} docs-alert" role="alert">
+                        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                        {{ warning_text }}
+                        <a href="{{ site.baseurl }}{{ latest_url }}">
+                            {{ page.click_here_text }}
                         </a>
-                    </li>
-                    {% endfor %}
-                </ul>
-            </div>
-        </div>
-
-        <!-- Get URL for this page in the latest version -->
-        {% capture current_version_path %}/docs/{{ page.language }}/{{ page.version }}/{% endcapture %}
-        {% capture latest_version_path %}/docs/{{ page.language }}/latest/{% endcapture %}
-        {% assign latest_url = page.url | replace:current_version_path,latest_version_path %}
-
-        <!-- Show warnings for special versions (i.e. non-latest, and dev) -->
-        {% if page.version == 'dev' or page.version != site.latest_docs_version %}
-
-            {% if page.version == 'dev' %}
-                {% assign alert_class = "alert-info" %}
-                {% assign warning_text = page.in_development_text %}
-            {% elsif page.version != site.latest_docs_version %}
-                {% assign alert_class = "alert-danger" %}
-                {% assign warning_text = page.outdated_text %}
-            {% endif %}
-
-            <div class="alert {{ alert_class }} docs-alert" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-                {{ warning_text }}
-                <a href="{{ site.baseurl }}{{ latest_url }}">
-                    {{ page.click_here_text }}
-                </a>
-            </div>
+                    </div>
 
-        {% endif %}
-
-        {% if page.plugin_name and page.plugin_version %}
-            <div class="alert alert-warning docs-alert" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-                {{ page.plugin_version_text }} {{ page.plugin_version }}.
-                <a href="https://github.com/apache/{{ page.plugin_name }}/releases">
-                    {{ page.visit_github_text }}
-                </a>
-            </div>
+                {% endif %}
 
-        {% endif %}
+                {% if page.plugin_name and page.plugin_version %}
+                    <div class="alert alert-warning docs-alert" role="alert">
+                        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                        {{ page.plugin_version_text }} {{ page.plugin_version }}.
+                        <a href="https://github.com/apache/{{ page.plugin_name }}/releases">
+                            {{ page.visit_github_text }}
+                        </a>
+                    </div>
+                {% endif %}
 
-        <div id="page-toc-source">
-            {{ content }}
+                <div id="page-toc-source">
+                    {{ content }}
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            {% include footer_docs.html %}
         </div>
     </div>
 </div>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/04aa4908/www/attributions.html
----------------------------------------------------------------------
diff --git a/www/attributions.html b/www/attributions.html
new file mode 100644
index 0000000..01e81d8
--- /dev/null
+++ b/www/attributions.html
@@ -0,0 +1,31 @@
+---
+layout: page
+title: Attributions
+permalink: /attributions/
+---
+
+<h1>Attributions</h1>
+
+<section>
+    <h2>
+        Raleway Font -
+        <a href="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL">
+            SIL Open Font License, 1.1
+        </a>
+    </h2>
+    <hr>
+    <p>
+        Raleway-Light.ttf: Copyright &copy; 2010 - 2013, <a href="mailto:matt@pixelspread.com">Matt McInerney</a>, <a href="mailto:impallari@gmail.com">Pablo Impallari</a>, <a href="mailto:hello@rfuenzalida.com">Rodrigo Fuenzalida</a> with Reserved Font Name "Raleway"
+        <br/>
+        Raleway-LightItalic.ttf: Copyright &copy; 2010 - 2012, <a href="mailto:matt@pixelspread.com">Matt McInerney</a>, <a href="mailto:impallari@gmail.com">Pablo Impallari</a>, <a href="mailto:hello@rfuenzalida.com">Rodrigo Fuenzalida</a> with Reserved Font Name "Raleway"
+        <br/>
+        Raleway-Regular.ttf: Copyright &copy; 2010 - 2013, <a href="mailto:matt@pixelspread.com">Matt McInerney</a>, <a href="mailto:impallari@gmail.com">Pablo Impallari</a>, <a href="mailto:hello@rfuenzalida.com">Rodrigo Fuenzalida</a> with Reserved Font Name "Raleway"
+        <br/>
+        Raleway-Italic.ttf: Copyright &copy; 2010 - 2012, <a href="mailto:matt@pixelspread.com">Matt McInerney</a>, <a href="mailto:impallari@gmail.com">Pablo Impallari</a>, <a href="mailto:hello@rfuenzalida.com">Rodrigo Fuenzalida</a> with Reserved Font Name "Raleway"
+        <br/>
+        Raleway-Bold.ttf: Copyright &copy; 2010 - 2013, <a href="mailto:matt@pixelspread.com">Matt McInerney</a>, <a href="mailto:impallari@gmail.com">Pablo Impallari</a>, <a href="mailto:hello@rfuenzalida.com">Rodrigo Fuenzalida</a> with Reserved Font Name "Raleway"
+        <br/>
+        Raleway-BoldItalic.ttf: Copyright &copy; 2010 - 2012, <a href="mailto:matt@pixelspread.com">Matt McInerney</a>, <a href="mailto:impallari@gmail.com">Pablo Impallari</a>, <a href="mailto:hello@rfuenzalida.com">Rodrigo Fuenzalida</a> with Reserved Font Name "Raleway"
+        <br/>
+    </p>
+</section>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/04aa4908/www/docs/en/dev/guide/hybrid/plugins/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/dev/guide/hybrid/plugins/index.md b/www/docs/en/dev/guide/hybrid/plugins/index.md
index ec6191f..1ede551 100644
--- a/www/docs/en/dev/guide/hybrid/plugins/index.md
+++ b/www/docs/en/dev/guide/hybrid/plugins/index.md
@@ -54,7 +54,7 @@ argument to that command is the URL for a _git_ repository containing
 the plugin code.  This example implements Cordova's Device API:
 
 ```bash
-    $ cordova plugin add https://git-wip-us.apache.org/repos/asf/cordova-plugin-device.git
+cordova plugin add https://git-wip-us.apache.org/repos/asf/cordova-plugin-device.git
 ```
 
 The plugin repository must feature a top-level `plugin.xml` manifest
@@ -62,26 +62,26 @@ file. There are many ways to configure this file, details for which
 are available in the [Plugin Specification](../../../plugin_ref/spec.html). This abbreviated version of the `Device` plugin provides a simple example to use as a model:
 
 ```xml
-    <?xml version="1.0" encoding="UTF-8"?>
-    <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
-            id="cordova-plugin-device" version="0.2.3">
-        <name>Device</name>
-        <description>Cordova Device Plugin</description>
-        <license>Apache 2.0</license>
-        <keywords>cordova,device</keywords>
-        <js-module src="www/device.js" name="device">
-            <clobbers target="device" />
-        </js-module>
-        <platform name="ios">
-            <config-file target="config.xml" parent="/*">
-                <feature name="Device">
-                    <param name="ios-package" value="CDVDevice"/>
-                </feature>
-            </config-file>
-            <header-file src="src/ios/CDVDevice.h" />
-            <source-file src="src/ios/CDVDevice.m" />
-        </platform>
-    </plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
+        id="cordova-plugin-device" version="0.2.3">
+    <name>Device</name>
+    <description>Cordova Device Plugin</description>
+    <license>Apache 2.0</license>
+    <keywords>cordova,device</keywords>
+    <js-module src="www/device.js" name="device">
+        <clobbers target="device" />
+    </js-module>
+    <platform name="ios">
+        <config-file target="config.xml" parent="/*">
+            <feature name="Device">
+                <param name="ios-package" value="CDVDevice"/>
+            </feature>
+        </config-file>
+        <header-file src="src/ios/CDVDevice.h" />
+        <source-file src="src/ios/CDVDevice.m" />
+    </platform>
+</plugin>
 ```
 
 The top-level `plugin` tag's `id` attribute uses the same
@@ -101,7 +101,7 @@ correctly for each platform.  Install `plugman` with the following
 [node](http://nodejs.org/) command:
 
 ```bash
-    $ npm install -g plugman
+npm install -g plugman
 ```
 
 You need an valid app source directory, such as the top-level `www`
@@ -112,7 +112,7 @@ Then run a command such as the following to test whether iOS
 dependencies load properly:
 
 ```bash
-    $ plugman install --platform ios --project /path/to/my/project/www --plugin /path/to/my/plugin
+plugman install --platform ios --project /path/to/my/project/www --plugin /path/to/my/plugin
 ```
 
 For details on `plugman` options, see [Using Plugman to Manage Plugins](../../../plugin_ref/plugman.html). For information on how to actually _debug_ plugins, see each platform's native interface listed at the bottom of this page.
@@ -126,11 +126,11 @@ plugin's JavaScript however you like, but you need to call
 following syntax:
 
 ```javascript
-    cordova.exec(function(winParam) {},
-                 function(error) {},
-                 "service",
-                 "action",
-                 ["firstArgument", "secondArgument", 42, false]);
+cordova.exec(function(winParam) {},
+             function(error) {},
+             "service",
+             "action",
+             ["firstArgument", "secondArgument", 42, false]);
 ```
 
 Here is how each parameter works:
@@ -160,20 +160,20 @@ This example shows one way to implement the plugin's JavaScript
 interface:
 
 ```javascript
-    window.echo = function(str, callback) {
-        cordova.exec(callback, function(err) {
-            callback('Nothing to echo.');
-        }, "Echo", "echo", [str]);
-    };
+window.echo = function(str, callback) {
+    cordova.exec(callback, function(err) {
+        callback('Nothing to echo.');
+    }, "Echo", "echo", [str]);
+};
 ```
 
 In this example, the plugin attaches itself to the `window` object as
 the `echo` function, which plugin users would call as follows:
 
 ```javascript
-    window.echo("echome", function(echoValue) {
-        alert(echoValue == "echome"); // should alert true.
-    });
+window.echo("echome", function(echoValue) {
+    alert(echoValue == "echome"); // should alert true.
+});
 ```
 
 Look at the last three arguments to the `cordova.exec` function. The
@@ -204,6 +204,7 @@ listed below, and each builds on the simple Echo Plugin example above:
 You can publish your plugin to any `npmjs`-based registry, but the recommended one is the [NPM registry](https://www.npmjs.com). Other developers can install your plugin automatically using either `plugman` or the Cordova CLI.
 
 To publish a plugin to NPM registry you need to follow steps below:
+
   * install the `plugman` CLI:
 
     ```bash
@@ -235,12 +236,12 @@ Plugman's `createpackagejson` command does this for you, but if you did not use
 For example, for a plugin that supports android, iOS & Windows, the keywords in package.json should include:
 
 ```json
-    "keywords": [
-      "ecosystem:cordova",
-      "cordova-android",
-      "cordova-ios",
-      "cordova-windows"
-    ]
+"keywords": [
+    "ecosystem:cordova",
+    "cordova-android",
+    "cordova-ios",
+    "cordova-windows"
+]
 ```
 
 For more detailed example of a package.json, review the [package.json file of cordova-plugin-device](https://github.com/apache/cordova-plugin-device/blob/master/package.json).

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/04aa4908/www/static/css-src/_docs.scss
----------------------------------------------------------------------
diff --git a/www/static/css-src/_docs.scss b/www/static/css-src/_docs.scss
index da627fa..0fcf3e0 100644
--- a/www/static/css-src/_docs.scss
+++ b/www/static/css-src/_docs.scss
@@ -1,14 +1,9 @@
 .docs {
-    /* overriding h2 to correct value */
-    h2 {
-        font-size: 30px;
-    }
-
-    margin-bottom: 20px;
-
-    .this-page {
-        font-weight: bold;
-    }
+    width: 100%;
+    height: 100%;
+    margin: 0px;
+    padding: 0px;
+    font-family: "Raleway", Helvetica, Arial, sans-serif;
 
     /* this is so that wide images don't stick out of their paragraphs */
     p {
@@ -17,29 +12,6 @@
         }
     }
 
-    /*
-    * Anchor links on documentation headers
-    */
-    .header-link {
-        position: relative;
-        left: 0.5em;
-        opacity: 0;
-        font-size: 0.7em;
-
-        -webkit-transition: opacity 0.2s ease-in-out 0.1s;
-        -moz-transition: opacity 0.2s ease-in-out 0.1s;
-        -ms-transition: opacity 0.2s ease-in-out 0.1s;
-    }
-
-    h1:hover .header-link,
-    h2:hover .header-link,
-    h3:hover .header-link,
-    h4:hover .header-link,
-    h5:hover .header-link,
-    h6:hover .header-link {
-        opacity: 1;
-    }
-
     pre {
         word-wrap: normal;
 
@@ -48,13 +20,14 @@
             white-space: pre;
         }
     }
-
+    .row {
+        margin: 0px;
+    }
     mark {
         background-color: lightblue;
         padding: 0.1px 0.2px 0.1px 0.2px;
         margin-right: 7px;
     }
-
     .site-toc-title {
         font-weight: 300;
         font-size: 22px;
@@ -63,20 +36,125 @@
 
     /* outer ToC for the site */
     .site-toc-container {
+        position: fixed;
+        height: 100%;
+        overflow-y: scroll;
+        background: $gray-85;
+
         .site-toc {
-            padding: 0px;
+
+            /* NOTE: the bottom padding is special because it offsets the header */
+            padding-top: 35px;
+            padding-bottom: 80px;
+            padding-left: 55px;
+            padding-right: 10px;
+
+            li {
+                list-style: none;
+            }
+            > li {
+                font-size: 16px;
+                font-weight: 600;
+                padding-top: 0.05em;
+                line-height: 30px;
+                a {
+                    color: white;
+                    &.this-page {
+                        font-weight: bold;
+                    }
+                }
+                .entry-highlight {
+                    width: 200%;
+                    position: absolute;
+                    height: 31px;
+                    background-color: #d60c3f;
+                    opacity: 0.7;
+                    margin-left: -100%;
+                    z-index: -1;
+                }
+            }
+            .toc-section-heading {
+                font-size: 30px;
+                font-weight: 300;
+                margin: 0.3em 0em 0.3em 0em;
+                display: block;
+                color: $brand-primary;
+            }
+
+            /* NOTE: this is not a mistake; .site-toc gets nested inside itself */
             .site-toc {
                 padding-left: 15px;
+                padding-right: 0px;
+                padding-top: 0px;
+                padding-bottom: 0px;
+                .toc-section-heading {
+                    font-size: 16px;
+                    font-weight: 600;
+                }
             }
         }
-        .site-toc li {
-            list-style: none;
-        }
-        .site-toc > li {
-            list-style: none;
-            font-size: 16px;
-            font-weight: 300;
-            padding-top: 0.05em;
+    }
+
+    /* non-IE scrollbar styling */
+    .site-toc-container::-webkit-scrollbar {
+        width: 13px;  /* for vertical scrollbars */
+        height: 13px; /* for horizontal scrollbars */
+    }
+    .site-toc-container::-webkit-scrollbar-track {
+        background-color: black;
+    }
+    .site-toc-container::-webkit-scrollbar-thumb {
+        background-color: $gray-70;
+    }
+
+    /* IE-only scrollbar styling */
+    .site-toc-container {
+        scrollbar-arrow-color: $gray-70;
+        scrollbar-face-color: $gray-70;
+        scrollbar-highlight-color: black;
+        scrollbar-shadow-color: $gray-70;
+    }
+
+    .page-content-container {
+        padding: 0px;
+        .page-content {
+            margin-bottom: 20px;
+            .header-link {
+                position: relative;
+                left: 0.5em;
+                opacity: 0;
+                font-size: 0.7em;
+
+                -webkit-transition: opacity 0.2s ease-in-out 0.1s;
+                -moz-transition: opacity 0.2s ease-in-out 0.1s;
+                -ms-transition: opacity 0.2s ease-in-out 0.1s;
+            }
+            h1:hover .header-link,
+            h2:hover .header-link,
+            h3:hover .header-link,
+            h4:hover .header-link,
+            h5:hover .header-link,
+            h6:hover .header-link {
+                opacity: 1;
+            }
+            h1, h2, h3, h4, h5, h6 {
+                color: #2C7185;
+            }
+            h1 {
+                font-size: 48px;
+                font-weight: 300;
+            }
+            h2 {
+                color: #D60C3F;
+                font-size: 30px;
+                font-weight: 300;
+            }
+            h3 {
+                font-size: 22px;
+            }
+            h3, h4, h5, h6 {
+                font-weight: 600;
+            }
         }
     }
 
@@ -87,25 +165,16 @@
     .page-toc ul > li {
         padding: 0.05em 0em 0.05em 1em;
         font-size: 14px;
-        border-left: 0.5em solid rgba($brand-primary, 0.5);
+        font-weight: 300;
     }
     .page-toc ul > li.toc-active {
         font-weight: bold;
-        border-left: 0.5em solid $brand-primary;
     }
 
     /* Quick fix to remove redundant TOC entries */
     .page-toc li:first-of-type {
         display: none;
     }
-    .page-toc li:nth-of-type(2) {
-        margin-top: 5px;
-    }
-    .toc-section-heading {
-        font-size: 18px;
-        padding-top: 5px;
-        display: block;
-    }
 
     /* header above page content */
     .content-header {
@@ -181,7 +250,6 @@
             border-color: white;
             padding:2px;
         }
-
         th {
             text-align: center;
         }
@@ -216,12 +284,10 @@
             text-align: left;
             vertical-align: middle;
         }
-
         td[rowspan="2"], th[colspan="3"], td[data-col="code"] {
             text-align: center;
             vertical-align: middle;
         }
-
         td[data-col="description"] {
             text-align: left;
             vertical-align: middle;
@@ -235,7 +301,6 @@
             padding-bottom: 20px;
             margin: 30px 0px;
         }
-
         h2 {
             font-weight: normal;
             margin: 0px 0px 10px 0px;
@@ -243,21 +308,17 @@
             display: block;
             font-size: 18px;
         }
-
         h2:after {
             content: '';
         }
-
         span {
             font-size: 14px;
         }
-
         ul {
             float:left;
             margin: 0px;
             padding: 0px;
         }
-
         ul li {
             float: left;
             list-style: none;

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/04aa4908/www/static/css-src/_home.scss
----------------------------------------------------------------------
diff --git a/www/static/css-src/_home.scss b/www/static/css-src/_home.scss
index fcac9f2..72483fb 100644
--- a/www/static/css-src/_home.scss
+++ b/www/static/css-src/_home.scss
@@ -263,8 +263,17 @@ img#logo_top {
     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 }
+    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;

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/04aa4908/www/static/css-src/lib/bootstrap.css
----------------------------------------------------------------------
diff --git a/www/static/css-src/lib/bootstrap.css b/www/static/css-src/lib/bootstrap.css
index e2ae54a..e980deb 100644
--- a/www/static/css-src/lib/bootstrap.css
+++ b/www/static/css-src/lib/bootstrap.css
@@ -1073,7 +1073,7 @@ html {
   -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
 }
 body {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: "Raleway", Helvetica, Arial, sans-serif;
   font-size: 14px;
   line-height: 1.42857143;
   color: #333333;
@@ -6009,7 +6009,7 @@ button.close {
   position: absolute;
   z-index: 1070;
   display: block;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: "Raleway", Helvetica, Arial, sans-serif;
   font-style: normal;
   font-weight: normal;
   letter-spacing: normal;
@@ -6127,7 +6127,7 @@ button.close {
   display: none;
   max-width: 276px;
   padding: 1px;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: "Raleway", Helvetica, Arial, sans-serif;
   font-style: normal;
   font-weight: normal;
   letter-spacing: normal;

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/04aa4908/www/static/css-src/main.scss
----------------------------------------------------------------------
diff --git a/www/static/css-src/main.scss b/www/static/css-src/main.scss
index 94f502e..9cf25c5 100644
--- a/www/static/css-src/main.scss
+++ b/www/static/css-src/main.scss
@@ -1,13 +1,13 @@
 @import 'lib/bootstrap';
 
 /* Customized Variables for Bootstrap */
-$gray-base:black;
-$gray-transparent:rgba($gray-base,.8);
+$gray-base: black;
+$gray-transparent: rgba($gray-base,.8);
 $brand-primary-darker: rgb(57, 146, 171);
 $brand-success: rgb(41, 177, 106);
 $brand-info: rgb(76, 194, 228);
 $brand-danger: rgb(241, 83, 68);
-$font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif;
+$font-family-sans-serif: "Raleway", "Helvetica Neue", Helvetica, Arial, sans-serif;
 $border-radius-large: 8px;
 $border-radius-small: 4px;
 $caret-width-base: 5px;
@@ -27,6 +27,10 @@ $badge-line-height: 1.25;
 $brand-gold: #F1B444;
 $brand-gold-darker: #B58733;
 $gray-90: lighten($gray-base, 10%);
+$gray-85: lighten($gray-base, 15%);
+$gray-80: lighten($gray-base, 20%);
+$gray-70: lighten($gray-base, 30%);
+$gray-60: lighten($gray-base, 40%);
 $gray-50: lighten($gray-base, 50%);
 $gray-40: lighten($gray-base, 60%);
 $gray-20: lighten($gray-base, 80%);
@@ -75,14 +79,14 @@ footer {
     position: relative;
     strong { color:inherit; }
     h1 {
-        font-size:2.5em;
-        color:$brand-primary-darker;
+        font-size: 2.5em;
+        color: $brand-primary-darker;
     }
     h2 {
-    text-transform: uppercase;
-    color:$gray-50;
-    font-size: 1em;
-    font-weight: bold;
+        text-transform: uppercase;
+        color:$gray-50;
+        font-size: 1em;
+        font-weight: bold;
     }
 }
 footer ul.nav li > a {
@@ -114,12 +118,12 @@ footer .copyright_text {
 */
 button.btn, a.btn {
     border-radius: 0;
-    background-color:$brand-primary;
-    color:black;
-    border:0;
+    background-color: $brand-primary;
+    color: black;
+    border: 0;
 }
 button.btn:hover, a.btn {
-    color:black;
+    color: black;
 }
 h1 {
     color: $brand-gold-darker;
@@ -130,8 +134,8 @@ h2 {
     font-size: 18px;
 }
 .badge {
-    font-size:12px;
-    margin-top:-14px;
+    font-size: 12px;
+    margin-top: -14px;
     padding: 1px 5px;
 }
 .blue-divider {
@@ -143,12 +147,12 @@ h2 {
 /* misc */
 .vertical-center-parent {
     position: relative;
-    width:100%;
-    height:100%;
+    width: 100%;
+    height: 100%;
     .vertical-center-child {
-        position:absolute;
-        top:50%;
-        left:50%;
+        position: absolute;
+        top: 50%;
+        left: 50%;
         @include vendor-prefix(transform, translate(-50%,-50%));
     }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message