From ce1a0f3f5330d61b13b019a4c9b7df9bf55da501 Mon Sep 17 00:00:00 2001
From: Carlos Cordoba <ccordoba12@gmail.com>
Date: Mon, 2 Jul 2018 23:20:06 -0500
Subject: [PATCH] Backport PRs 58 and 59

I forgot that we handle two branches here too.
---
 doc/_static/custom.css | 17 ++++++++++-------
 doc/conf.py            |  8 ++++----
 doc/overview.rst       | 16 ----------------
 3 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/doc/_static/custom.css b/doc/_static/custom.css
index 9b80c2d595a..64f62569e27 100644
--- a/doc/_static/custom.css
+++ b/doc/_static/custom.css
@@ -4,25 +4,24 @@ cite::before {
 
 cite {
     display: inline;
-    font-size: 15.4px;
+    font-size: 17px;
     color: black;
 }
 
 #doc-content{
-    font-size: 15.4px;
+    font-size: 17px;
 }
 
-.logo{
+.logo {
     display: none;
 }
 
 div .sphinxsidebarwrapper {
-    padding: 0px;
+    padding-top: 10px;
 }
 
-div .sphinxsidebarwrapper h3{
-    padding: 0px;
-    font-size: 200%;
+div .sphinxsidebarwrapper h3 {
+    margin: 0px;
 }
 
 kbd {
@@ -38,3 +37,7 @@ div .line-block {
 ul.simple {
     margin-bottom: 24px;
 }
+
+div.body p, div.body dd, div.body li {
+    line-height: 1.9em;
+}
diff --git a/doc/conf.py b/doc/conf.py
index 17ab2a36b31..a42e12d259f 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -138,15 +138,15 @@
         },
     'sidebar_collapse': True,
     'show_related': True,
-    'page_width': '920px',
-    'sidebar_width': '200px',
+    'page_width': '1100px',
+    'sidebar_width': '250px',
     'fixed_sidebar': False,
     'gray_1': '#303030',
     'gray_2': '#EBEBEB',
     'gray_3': '#EE1C24',
     'font_family': "Raleway, 'Open Sans', Arial, sans-serif",
-    'head_font_family': "Amiri, 'Open Sans', Arial, sans-serif",
-    'font_size': '15.4px',
+    'head_font_family': "Raleway, 'Open Sans', Arial, sans-serif",
+    'font_size': '17px',
     'link': '#EE1C24',
     'link_hover': '#EE1C24'
     }
diff --git a/doc/overview.rst b/doc/overview.rst
index ac030aa28cc..beaaed69e12 100644
--- a/doc/overview.rst
+++ b/doc/overview.rst
@@ -2,12 +2,6 @@
 Overview
 ########
 
-.. image:: images/mainwindow/mainwindow_custom_1610.png
-   :align: center
-   :alt: The Spyder main window, with numerous panels open in a custom layout
-
-|
-
 Spyder, the Scientific Python Development Environment, includes the following key features:
 
 * :doc:`editor`:
@@ -43,11 +37,6 @@ Spyder, the Scientific Python Development Environment, includes the following ke
     * PEP 8 and code style (powered by ``pycodestyle``)
     * Code annotation parsing and "Todo lists" (``TODO``, ``FIXME``, ``XXX``, etc.)
 
-.. image:: images/mainwindow/mainwindow_dark_1610.png
-   :align: right
-   :width: 60%
-   :alt: The Spyder main window, with a dark syntax highlighting theme applied
-
 * :doc:`ipythonconsole`:
 
   * Any number of individual consoles, each executed in a separate, isolated processes
@@ -81,11 +70,6 @@ Spyder, the Scientific Python Development Environment, includes the following ke
 * :doc:`historylog`: Chronologically records every command entered into any Spyder console with timestamps, syntax highlighting and de-duplication
 * :doc:`internalconsole`: Provides access to viewing, exploring and controlling Spyder's own operation
 
-.. image:: images/mainwindow/mainwindow_matlab_1610.png
-   :align: right
-   :width: 60%
-   :alt: The Spyder main window, with a panel layout mirroring that of MATLAB
-
 * Preferences:
 
   * Fully customizable keyboard shortcuts editor