Merge upstream/main and resolve conflicts

Combined our padding improvements with upstream UI fixes:
- Kept our padding/spacing improvements (20px margin, 30px padding, line-height)
- Integrated upstream header size reductions
- Integrated upstream dark mode link visibility improvements
- Integrated upstream sidebar navigation spacing
- Integrated upstream list indentation fixes

Signed-off-by: Gyan Ranjan Panda <gyanranjanpanda@gmail.com>

Author: Gyan Ranjan Panda

docs/source/_static/images/aboutcode_logo.svg

@@ -25,4 +25,31 @@ div.rst-content {
         margin-left: 0px;
         line-height: 1.5;
     }
+}
+
+/* Minimal UI fixes */
+
+/* Fix 1: Reduce excessive header sizes */
+.rst-content h1 {
+    font-size: 2.2rem;
+}
+
+.rst-content h2 {
+    font-size: 1.8rem;
+}
+
+/* Fix 2: Improve dark mode link visibility */
+[data-theme="dark"] .rst-content a {
+    color: #5ca8ff;
+}
+
+/* Fix 3: Better sidebar navigation spacing */
+.wy-menu-vertical li a {
+    padding: 0.6em 1.2em;
+}
+
+/* Fix 4: Reduce list indentation */
+.rst-content ul,
+.rst-content ol {
+    margin-left: 1.5rem;
 }

docs/source/_static/theme_overrides.css

@@ -1,8 +1,29 @@
 {% extends "!layout.html" %}
 
-  {% block menu %}
-    {{ super() }}
-    <div class="toc-index-div">
-        <a href="{{pathto('genindex.html', 1)}}" class="reference internal toc-index">Index</a>
-    </div>
-  {% endblock %}
+{%- block sidebartitle %}
+{%- set _logo_url = logo_url|default(pathto('_static/' + (logo or ""), 1)) %}
+<a href="https://aboutcode.org" class="icon icon-home">
+  {% if not theme_logo_only %}{{ project }}{% endif %}
+  {%- if logo or logo_url %}
+  <img src="{{ _logo_url }}" class="logo" alt="{{ _('Logo') }}" />
+  {%- endif %}
+</a>
+
+{%- if READTHEDOCS or DEBUG %}
+{%- if theme_version_selector or theme_language_selector %}
+<div class="switch-menus">
+  <div class="version-switch"></div>
+  <div class="language-switch"></div>
+</div>
+{%- endif %}
+{%- endif %}
+
+{%- include "searchbox.html" %}
+{%- endblock %}
+
+{% block menu %}
+{{ super() }}
+<div class="toc-index-div">
+  <a href="{{pathto('genindex.html', 1)}}" class="reference internal toc-index">Index</a>
+</div>
+{% endblock %}

docs/source/_templates/layout.html

@@ -2,9 +2,10 @@ Google Summer of Code 2017
 ==========================
 
 
-.. image:: https://cdn.rawgit.com/wiki/nexB/aboutcode/aboutcode_logo.svg
-   :target: http://www.aboutcode.org/
+.. image:: /_static/images/aboutcode_logo.svg
+   :target: https://www.aboutcode.org/
    :alt: AboutCode Logo
+   :width: 200px
 
 
 Welcome to AboutCode! This year AboutCode is a mentoring Organization for

docs/source/archive/gsoc/org_pages/gsoc_2017.rst

@@ -79,7 +79,7 @@
 
 html_context = {
     "display_github": True,
-    "github_user": "nexB",
+    "github_user": "aboutcode-org",
     "github_repo": "aboutcode",
     "github_version": "master",  # branch
     "conf_py_path": "/docs/source/",  # path in the checkout to the docs root