Use Mkdocs 0.13.0-dev w/ search

facelessuser · Apr 28, 2015 · 8a5f2e5 · 8a5f2e5
1 parent 14d4c5d
commit 8a5f2e5
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 26 deletions.
diff --git a/doc_theme/base.html b/doc_theme/base.html
@@ -25,12 +25,12 @@
   <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>
+  {%- block extrahead %} {% endblock %}
+
   {%- for path in extra_javascript %}
   <script src="{{ path }}"></script>
   {%- endfor %}
 
-  {%- block extrahead %} {% endblock %}
-
   {% if google_analytics %}
   <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@@ -75,12 +75,14 @@
           {% include "breadcrumbs.html" %}
           <div role="main">
             <div class="section">
-              {{ content }}
+              {% block content %}
+                {{ content }}
+              {% endblock %}
             </div>
           </div>
-    {%- block footer %}
+	  {%- block footer %}
           {% include "footer.html" %}
-    {% endblock %}
+	  {% endblock %}
         </div>
       </div>
 
@@ -90,19 +92,23 @@
 
 <div class="rst-versions" role="note" style="cursor: pointer">
     <span class="rst-current-version" data-toggle="rst-current-version">
-        {% if repo_name == 'GitHub' %}
-            <a href="{{ repo_url }}" class="icon icon-github" style="float: left; color: #fcfcfc"> GitHub</a>
-        {% elif repo_name == 'Bitbucket' %}
-            <a href="{{ repo_url }}" class="icon icon-bitbucket" style="float: left; color: #fcfcfc"> BitBucket</a>
-        {% endif %}
-      <span><a href="{{ previous_page.url }}" style="color: #fcfcfc;">&laquo; Previous</a></span>
-      <span style="margin-left: 15px"><a href="{{ next_page.url }}" style="color: #fcfcfc">Next &raquo;</a></span>
+      {% 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>
 
 <!--
-MkDocs version  : {{ mkdocs_version }}
-Docs Build Date : {{ build_date_utc }}
+MkDocs version      : {{ mkdocs_version }}
+Docs Build Date UTC : {{ build_date_utc }}
 -->
 </body>
 </html>
diff --git a/doc_theme/css/theme_custom.css b/doc_theme/css/theme_custom.css
@@ -43,13 +43,6 @@
   height: 20px;
 }
 
-/* Mark */
-.rst-content mark {
-  background: #fef56f;
-  padding: 2px;
-  margin: 0;
-}
-
 /* Links */
 .rst-content .section a {
   word-wrap: break-word;
@@ -421,18 +414,14 @@
 
 .rst-content span.critic {
   background: #ddddff;
-  font-size: 0;
   border: 0;
-}
-
-.rst-content span.critic:hover {
-  font-size: initial;
   border-top: 1px solid #0000bb;
   border-bottom: 1px solid #0000bb;
 }
 
 .rst-content span.critic:before,
 .rst-content span.critic:after {
+  font-size: inherit;
   background: #ddddff;
   border: 1px solid #0000bb;
 }
@@ -464,6 +453,11 @@
   padding: .02em;
 }
 
+.rst-content .block:before,
+.rst-content .block:after {
+  content: '';
+}
+
 /* Special Doc Stuff */
 .rst-content table.doctable {
   border: 0;

diff --git a/doc_theme/js/theme.js b/doc_theme/js/theme.js
@@ -4,14 +4,17 @@ $( document ).ready(function() {
       $("[data-toggle='wy-nav-shift']").toggleClass("shift");
       $("[data-toggle='rst-versions']").toggleClass("shift");
     });
+
     // Close menu when you click a link.
     $(document).on('click', ".wy-menu-vertical .current ul li a", function() {
       $("[data-toggle='wy-nav-shift']").removeClass("shift");
       $("[data-toggle='rst-versions']").toggleClass("shift");
     });
+
     $(document).on('click', "[data-toggle='rst-current-version']", function() {
       $("[data-toggle='rst-versions']").toggleClass("shift-up");
     });
+
     // Make tables responsive
     $("table.docutils:not(.field-list)").wrap("<div class='wy-table-responsive'></div>");