Prep for 1.2.0 release

facelessuser · Nov 2, 2016 · e461f8a · e461f8a
1 parent 4a2c614
commit e461f8a
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 36 deletions.
diff --git a/doc_theme/base.html b/doc_theme/base.html
@@ -3,7 +3,10 @@
 <!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
 <head>
   <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  {% if page_description %}<meta name="description" content="{{ page_description }}">{% endif %}
+  {% if site_author %}<meta name="author" content="{{ site_author }}">{% endif %}
   {% block htmltitle %}
   <title>{% if page_title %}{{ page_title }} - {% endif %}{{ site_name }}</title>
   {% endblock %}
@@ -16,20 +19,23 @@
 
   <link rel="stylesheet" href="{{ base_url }}/css/theme.css" type="text/css" />
   <link rel="stylesheet" href="{{ base_url }}/css/theme_extra.css" type="text/css" />
-  <link rel="stylesheet" href="{{ base_url }}/css/theme_custom.css" type="text/css" />
   <link rel="stylesheet" href="{{ base_url }}/css/highlight.css">
   {%- for path in extra_css %}
   <link href="{{ path }}" rel="stylesheet">
   {%- endfor %}
 
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/raphael/2.1.4/raphael-min.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/js-sequence-diagrams/1.0.6/sequence-diagram-min.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/flowchart/1.4.2/flowchart.min.js"></script>
+  {% if current_page %}
+  <script>
+    // Current page data
+    var mkdocs_page_name = "{{ page_title }}";
+    var mkdocs_page_input_path = "{{ current_page.input_path }}";
+    var mkdocs_page_url = "{{ current_page.abs_url }}";
+  </script>
+  {% endif %}
   <script src="{{ base_url }}/js/jquery-2.1.1.min.js"></script>
   <script src="{{ base_url }}/js/modernizr-2.8.3.min.js"></script>
   <script src="{{ base_url }}/js/theme.js"></script>
-  <script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
+
   {%- block extrahead %} {% endblock %}
 
   {%- for path in extra_javascript %}
@@ -99,21 +105,7 @@
 
   </div>
 
-<div class="rst-versions" role="note" style="cursor: pointer">
-    <span class="rst-current-version" data-toggle="rst-current-version">
-      {% if repo_name == 'GitHub' %}
-          <a class="icon icon-github" style="float: left; color: #fcfcfc"> GitHub</a>
-      {% elif repo_name == 'Bitbucket' %}
-          <a class="icon icon-bitbucket" style="float: left; color: #fcfcfc"> BitBucket</a>
-      {% endif %}
-      {% if previous_page %}
-        <span><a href="{{ previous_page.url }}" style="color: #fcfcfc;">&laquo; Previous</a></span>
-      {% endif %}
-      {% if next_page %}
-        <span style="margin-left: 15px"><a href="{{ next_page.url }}" style="color: #fcfcfc">Next &raquo;</a></span>
-      {% endif %}
-    </span>
-</div>
+{% include "versions.html" %}
 
 </body>
 </html>

diff --git a/doc_theme/css/theme_custom.css b/doc_theme/css/theme_custom.css
@@ -1,3 +1,10 @@
+.wy-menu-vertical .subnav li.current > a {
+    padding-left: 2.42em;
+}
+.wy-menu-vertical .subnav li.current > ul li a {
+    padding-left: 3.23em;
+}
+
 /* Code Blocks */
 .rst-content code, .rst-content tt {
   color: #333;

diff --git a/doc_theme/footer.html b/doc_theme/footer.html
@@ -2,7 +2,7 @@
   {% if next_page or previous_page %}
     <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
       {% if next_page %}
-        <a href="{{ next_page.url }}" class="btn btn-neutral float-right" title="{{ next_page.title }}"/>Next <span class="icon icon-circle-arrow-right"></span></a>
+        <a href="{{ next_page.url }}" class="btn btn-neutral float-right" title="{{ next_page.title }}">Next <span class="icon icon-circle-arrow-right"></span></a>
       {% endif %}
       {% if previous_page %}
         <a href="{{ previous_page.url }}" class="btn btn-neutral" title="{{ previous_page.title }}"><span class="icon icon-circle-arrow-left"></span> Previous</a>
@@ -13,11 +13,10 @@
   <hr/>
 
   <div role="contentinfo">
-    <p>
+    <!-- Copyright etc -->
     {% if copyright %}
-    {{ copyright }}
+      <p>{{ copyright }}</p>
     {% endif %}
-    </p>
   </div>
 
   Built with <a href="http://www.mkdocs.org">MkDocs</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,20 +1,27 @@
 # Changelog {: .doctitle}
 Changes between versions.
 
-## 1.0.0 Releases
+---
 
-### 1.0.1
+## 1.2.0
+> Released Nov 1, 2016
 
-- Fixed: Ordinal number 11th, 12th, and 13th
+- **NEW**: Add option to output tasklists in a more customizable way.
 
-### 1.0.0
+## 1.1.0
+> Released Mar 1, 2016
 
-- Initial release.
+- **NEW**: Add pypi 3.5 info in setup
+- **NEW**: Add option to magiclink extension to allow the stripping of link protocols (`http://` etc.).
+- **NEW**: Add option to github extension to disable the use of nl2br to reflect recent changes to Github Flavored Markdown.  Currently the default is the legacy (uses nl2br), but a warning will be displayed.  In the future, the option will be defaulted to not use nl2br.
 
-## 1.1.0 Releases
 
-### 1.1.0
+## 1.0.1
+> Released Dec 10, 2015
 
-- Add pypi 3.5 info in setup
-- Add option to magiclink extension to allow the stripping of link protocols (`http://` etc.).
-- Add option to github extension to disable the use of nl2br to reflect recent changes to Github Flavored Markdown.  Currently the default is the legacy (uses nl2br), but a warning will be displayed.  In the future, the option will be defaulted to not use nl2br.
+- **FIX**: Ordinal number 11th, 12th, and 13th
+
+## 1.0.0
+> Released Dec 8, 2015
+
+- **NEW**: Initial release.
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -56,3 +56,11 @@ markdown_extensions:
   - pymdownx.arithmatex
   - pymdownx.mark
   - pymdownx.critic
+extra_css:
+  - css/theme_custom.css
+extra_javascript:
+  - https://cdnjs.cloudflare.com/ajax/libs/raphael/2.1.4/raphael-min.js
+  - https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js
+  - https://cdnjs.cloudflare.com/ajax/libs/js-sequence-diagrams/1.0.6/sequence-diagram-min.js
+  - https://cdnjs.cloudflare.com/ajax/libs/flowchart/1.4.2/flowchart.min.js
+  - https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML
diff --git a/pymdownx/__version__.py b/pymdownx/__version__.py
@@ -1,7 +1,7 @@
 """Version."""
 
 #   (major, minor, micro, release type, pre-release build, post-release build)
-version_info = (1, 1, 0, 'final', 0, 0)
+version_info = (1, 2, 0, 'final', 0, 0)
 
 
 def _version():