Merge from 3.x: PR spyder-ide#21

goanpeca · May 2, 2018 · 881301e · 881301e
2 parents ba151f3 + fd3e53b
commit 881301e
Show file tree

Hide file tree

Showing 4 changed files with 110 additions and 12 deletions.
diff --git a/doc/_static/custom.css b/doc/_static/custom.css
@@ -0,0 +1,26 @@
+cite::before {
+    content: "";
+}
+
+cite {
+    display: inline;
+    font-size: 15.4px;
+    color: black;
+}
+
+#doc-content{
+    font-size: 15.4px;
+}
+
+.logo{
+    display: none;
+}
+
+div .sphinxsidebarwrapper {
+    padding: 0px;
+}
+
+div .sphinxsidebarwrapper h3{
+    padding: 0px;
+    font-size: 240%;
+}
diff --git a/doc/_static/favicon.ico b/doc/_static/favicon.ico
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
@@ -0,0 +1,77 @@
+{% extends "!layout.html" %}
+{% block linktags %}
+<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Amiri">
+<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway">
+<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Inconsolata">
+<link rel="stylesheet" href="https://www.spyder-ide.org/static/css/bootstrap.css">
+<link rel="stylesheet" href="https://www.spyder-ide.org/static/css/style.css">
+<link rel="stylesheet" href="https://www.spyder-ide.org/static/css/styles.css">
+{{ super() }}
+<link rel="stylesheet" href="https://www.spyder-ide.org/static/css/animate.css">
+<!-- Icomoon Icon Fonts-->
+<link rel="stylesheet" href="https://www.spyder-ide.org/static/css/icomoon.css">
+<!-- Simple Line Icons -->
+<link rel="stylesheet" href="https://www.spyder-ide.org/static/css/simple-line-icons.css">
+<!-- Magnific Popup -->
+<link rel="stylesheet" href="https://www.spyder-ide.org/static/css/magnific-popup.css">
+{% endblock %}
+
+
+{% block content %}
+<div class="fh5co-page">
+    <div id="fh5co-container">
+        <div class="js-sticky">
+            <div class="fh5co-main-nav navbar fixed-top">
+                <div class="container">
+                    <div class="fh5co-menu-1">                        
+                        <div class="pull-left">
+                            <ul class="dropdown menu" data-dropdown-menu>
+                                <li id="menu-logo">
+                                    <p></p>
+                                    <a href="./index.html">
+                                        <img src="https://www.spyder-ide.org/static/images/spyder-logo.svg">
+                                        <span>
+                                            <span id="logo-text"><big>S</big>pyder | Docs</span>                  
+                                        </span>
+                                    </a>
+                                    <p></p>
+                                </li>
+                            </ul>
+                        </div>
+                        <a class="pull-right" href="./index.html" data-nav-section="Docs">Docs</a>
+                        <a class="pull-right" href="https://www.spyder-ide.org/blog">Blog</a>
+                        <a class="pull-right" href="https://www.spyder-ide.org">Home</a>
+                    </div>
+                </div>
+            </div>	  
+        </div>
+<div id="doc-content" data-section="Docs">
+    {{super()}}
+</div>
+</div>	  
+</div>
+{% endblock %}
+{% block footer %}
+{{ super() }}
+<script>
+    ((window.gitter = {}).chat = {}).options = {
+        room: 'spyder-ide/public',
+        activationElement: '#open_chat',
+    };
+</script>
+<a href="https://gitter.im/spyder-ide/public" id="open_chat" class="gitter-open-chat-button">Open Chat</a>
+<script src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer></script>
+<!-- jQuery Easing -->
+<script src="https://www.spyder-ide.org/static/js/jquery.easing.1.3.js"></script>
+<!-- Bootstrap -->
+<script src="https://www.spyder-ide.org/static/js/bootstrap.min.js"></script>
+<!-- Waypoints -->
+<script src="https://www.spyder-ide.org/static/js/jquery.waypoints.min.js"></script>
+<!-- Stellar Parallax -->
+<script src="https://www.spyder-ide.org/static/js/jquery.stellar.min.js"></script>
+<!-- Magnific Popup -->
+<script src="https://www.spyder-ide.org/static/js/jquery.magnific-popup.min.js"></script>
+<script src="https://www.spyder-ide.org/static/js/magnific-popup-options.js"></script>
+<!-- Main JS -->
+<script src="https://www.spyder-ide.org/static/js/main.js"></script>
+{% endblock %}
diff --git a/doc/conf.py b/doc/conf.py
@@ -121,16 +121,9 @@
 # further.  For a list of options available for each theme, see the
 # documentation.
 html_theme_options = {
-    'logo': 'spyder_logo_lightbg_text_left.png',
-    'logo_text_align': 'left',
     'body_text_align': 'left',
-    'description': 'The Scientific Python<br>Development Environment',
-    'description_font_style': 'italic',
-    'github_user': 'spyder-ide',
-    'github_repo': 'spyder',
-    'github_type': 'star',
-    'github_banner': True,
-    'travis_button': True,
+    'github_banner': False,
+    'travis_button': False,
     'codecov_button': False,
     'extra_nav_links': {
         'Main Website': 'https://www.spyder-ide.org/',
@@ -151,9 +144,11 @@
     'gray_1': '#303030',
     'gray_2': '#EBEBEB',
     'gray_3': '#EE1C24',
-    'font_family': "'Open Sans', Arial, sans-serif",
-    'head_font_family': "'Open Sans', Arial, sans-serif",
-    'font_size': '14px'
+    'font_family': "Raleway, 'Open Sans', Arial, sans-serif",
+    'head_font_family': "Amiri, 'Open Sans', Arial, sans-serif",
+    'font_size': '15.4px',
+    'link': '#EE1C24',
+    'link_hover': '#EE1C24'
     }
 
 # Add any paths that contain custom themes here, relative to this directory.