Merge from 3.x: PR #29

Author: ccordoba12

README.md

@@ -60,6 +60,8 @@ your support of the project!
 
 [Download Spyder (with Anaconda)](https://www.anaconda.com/download/)
 
+[Online Documentation](http://docs.spyder-ide.org/)
+
 [Spyder Github](https://github.com/spyder-ide/spyder)
 
 [Troubleshooting Guide and FAQ](
@@ -69,6 +71,10 @@ https://github.com/spyder-ide/spyder/wiki/Troubleshooting-Guide-and-FAQ)
 
 [Gitter Chatroom](https://gitter.im/spyder-ide/public)
 
-[Google Group](http://groups.google.com/group/spyderlib)
+[Google Group](https://groups.google.com/group/spyderlib)
+
+[@Spyder_IDE on Twitter](https://twitter.com/spyder_ide)
+
+[@SpyderIDE on Facebook](https://www.facebook.com/SpyderIDE/)
 
 [Support Spyder on OpenCollective](https://opencollective.com/spyder/)

doc/_static/custom.css

@@ -34,8 +34,8 @@ div .line-block {
     margin-bottom: 0px;
 }
 
-ul.simple {
-    margin-bottom: 24px;
+ul.simple, div .toctree-wrapper, ol.arabic {
+    margin-bottom: 1.57em;
 }
 
 div.body p, div.body dd, div.body li {

doc/_templates/layout.html

@@ -23,15 +23,15 @@
         <div class="js-sticky">
             <div class="fh5co-main-nav navbar fixed-top">
                 <div class="container">
-                    <div class="fh5co-menu-1">                        
+                    <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 id="logo-text"><big>S</big>pyder | Docs</span>
                                         </span>
                                     </a>
                                     <p></p>
@@ -42,12 +42,12 @@
                         <a class="pull-right" href="https://www.spyder-ide.org">Home</a>
                     </div>
                 </div>
-            </div>	  
+            </div>
         </div>
 <div id="doc-content" data-section="Docs">
     {{super()}}
 </div>
-</div>	  
+</div>
 </div>
 {% endblock %}
 {% block footer %}

doc/conf.py

@@ -126,15 +126,9 @@
     'travis_button': False,
     'codecov_button': False,
     'extra_nav_links': {
-        'Main Website': 'https://www.spyder-ide.org/',
-        'Download (Anaconda)': 'https://www.anaconda.com/download/',
-        'Spyder Github': 'https://github.com/spyder-ide/spyder',
         'Troubleshooting': ('https://github.com/spyder-ide/spyder/wiki/'
                             + 'Troubleshooting-Guide-and-FAQ'),
-        'Dev Wiki': 'https://github.com/spyder-ide/spyder/wiki/Dev:-Index',
-        'Gitter Chatroom': 'https://gitter.im/spyder-ide/public',
-        'Google Group': 'http://groups.google.com/group/spyderlib',
-        'Donate': 'https://opencollective.com/spyder/'
+        'Spyder Wiki': 'https://github.com/spyder-ide/spyder/wiki',
         },
     'sidebar_collapse': True,
     'show_related': True,
@@ -195,7 +189,7 @@
     '**': [
         'about.html',
         'navigation.html',
-        'relations.html',
+        #'relations.html',
         'searchbox.html',
         'donate.html',
     ]