aprantl updated this revision to Diff 199641.
aprantl added a comment.
Herald added a subscriber: mgorny.
I think I addressed most/all of the outstanding bugs.
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D61913/new/
https://reviews.llvm.org/D61913
Files:
lldb/docs/CMakeLists.txt
lldb/docs/_static/lldb.css
lldb/docs/conf.py
lldb/docs/index.rst
Index: lldb/docs/index.rst
===================================================================
--- lldb/docs/index.rst
+++ lldb/docs/index.rst
@@ -22,6 +22,7 @@
.. toctree::
:maxdepth: 1
+ :caption: Goals & Status
status/about
status/goals
@@ -34,6 +35,7 @@
.. toctree::
:maxdepth: 1
+ :caption: Use & Extension
use/tutorial
use/map
@@ -52,6 +54,7 @@
.. toctree::
:maxdepth: 1
+ :caption: Resources
resources/download
resources/source
@@ -63,13 +66,21 @@
API Documentation
=================
-* `Public Python API Reference <https://lldb.llvm.org/python_reference/index.html>`_
-* `Public C++ API Reference <https://lldb.llvm.org/cpp_reference/namespacelldb.html>`_
-* `Private C++ Reference <https://lldb.llvm.org/cpp_reference/index.html>`_
+.. toctree::
+ :maxdepth: 1
+ :caption: API Documentation
+
+ Public Python API Reference <https://lldb.llvm.org/python_reference/index.html>
+ Public C++ API Reference <https://lldb.llvm.org/cpp_reference/namespacelldb.html>
+ Private C++ Reference <https://lldb.llvm.org/cpp_reference/index.html>
External Links
==============
-* `Source Code <http://llvm.org/viewvc/llvm-project/lldb/trunk/>`_
-* `Code Reviews <https://reviews.llvm.org>`_
-* `Bug Reports <https://bugs.llvm.org/>`_
+.. toctree::
+ :maxdepth: 1
+ :caption: External Links
+
+ Source Code <http://llvm.org/viewvc/llvm-project/lldb/trunk/>
+ Code Reviews <https://reviews.llvm.org>
+ Bug Reports <https://bugs.llvm.org/>
Index: lldb/docs/conf.py
===================================================================
--- lldb/docs/conf.py
+++ lldb/docs/conf.py
@@ -92,12 +92,14 @@
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
-html_theme = 'haiku'
+html_theme = 'alabaster'
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
# documentation.
-#html_theme_options = {}
+html_theme_options = {
+ 'font_size': '11pt'
+}
# Add any paths that contain custom themes here, relative to this directory.
#html_theme_path = []
Index: lldb/docs/_static/lldb.css
===================================================================
--- lldb/docs/_static/lldb.css
+++ lldb/docs/_static/lldb.css
@@ -1,3 +1,11 @@
+div.document {
+ width: 90%;
+}
+
+div.body {
+ max-width: 90%;
+}
+
table.mapping {
width: 100%;
}
@@ -9,7 +17,7 @@
table.mapping td.hed {
background: #606060;
- color: white;
+ color: #fefefe;
text-align: left;
border-bottom: 2px #fff solid;
font-weight: bold;
@@ -24,3 +32,52 @@
padding-bottom: 15px;
}
+div.sphinxsidebar h4,
+div.sphinxsidebar p, div.sphinxsidebar p a {
+ font: bold 12px Helvetica, Verdana, sans-serif;
+ color: #fefefe;
+ background: #606060;
+ margin-bottom: 0; /*bottom spacing between header and rest of content*/
+ text-transform: uppercase;
+ padding: 7px 0 7px 7px;
+}
+
+div.sphinxsidebar a.reference {
+ text-decoration: none;
+ border-bottom: 1px solid #fefefe;
+}
+
+div.sphinxsidebar li {
+ margin-left: 0px;
+ padding-left: 0px;
+}
+
+div.sphinxsidebar ul {
+ margin: 0px;
+}
+
+div.sphinxsidebar ul,
+div.sphinxsidebar ul a {
+ font: normal 10px Helvetica, Verdana, sans-serif;
+ background: #E9E9E9;
+ display: block;
+ padding: 5px 0;
+ line-height: 17px;
+ border-bottom: 1px solid #fefefe;
+}
+
+div.sphinxsidebar h1 {
+ /* Hide LLDB. */
+ visibility: hidden;
+}
+
+div.sphinxsidebar h3 {
+ /* Hide Navigation. */
+ display: none;
+}
+
+div.body p.caption {
+ /* Hide duplicate ToC entries. */
+ display: none;
+}
+
Index: lldb/docs/CMakeLists.txt
===================================================================
--- lldb/docs/CMakeLists.txt
+++ lldb/docs/CMakeLists.txt
@@ -58,6 +58,11 @@
if (SPHINX_FOUND)
if (${SPHINX_OUTPUT_HTML})
add_sphinx_target(html lldb)
+ # Sphinx does not reliably update the custom CSS files, so force
+ # a clean rebuild of the documentation every time.
+ add_custom_target(clean-lldb-html COMMAND "${CMAKE_COMMAND}" -E
+ remove_directory ${CMAKE_CURRENT_BINARY_DIR}/html)
+ add_dependencies(docs-lldb-html clean-lldb-html)
endif()
endif()
endif()
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
