diff --git a/doc/_static/site.css b/doc/_static/site.css deleted file mode 100644 index 76e2af6a2..000000000 --- a/doc/_static/site.css +++ /dev/null @@ -1,16 +0,0 @@ -@import url("cloud.css"); -@import url("http://fonts.googleapis.com/css?family=Comfortaa"); - -.pkgdb-logo span { - background: url("pkgdb.png") no-repeat scroll 50% 0 transparent; - display: block; - width: 134px; - height: 64px; - margin-bottom: 10px; - } - -h1.pkgdb-logo { - font-family: 'Comfortaa', sans-serif; - margin-top: -10px; - margin-bottom: 12px; -} diff --git a/doc/_templates/mm2-logo.html b/doc/_templates/mm2-logo.html deleted file mode 100644 index 9e81b40dd..000000000 --- a/doc/_templates/mm2-logo.html +++ /dev/null @@ -1 +0,0 @@ -

MirrorManager

diff --git a/doc/conf.py b/doc/conf.py index 1cf8aae1b..b79044b46 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -46,7 +46,7 @@ master_doc = "index" # General information about the project. -project = "MirrorManager2" +project = "Mirror Manager" copyright = "2014, Pierre-Yves Chibon " # The version info for the project you're documenting, acts as replacement @@ -106,14 +106,10 @@ # -- Options for HTML output ---------------------------------------------- -import cloud_sptheme as csp - -html_style = "site.css" - # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. # html_theme = 'default' -html_theme = "cloud" +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 @@ -121,40 +117,22 @@ # html_theme_options = {} html_theme_options = { - "sidebarwidth": "200px", - "max_width": "900px", - "compact_width": "800px", - "minimal_width": "700px", - # Style it like Fedora.. - "bodyfont": "Cantarell", - "highlightcolor": "#79db32", # First Green - "sidebarbgcolor": "#FEFEFE", - "sidebartrimcolor": "#FEFEFE", - "sectionbgcolor": "#FEFEFE", - "sectiontrimcolor": "#FEFEFE", - "sectiontextcolor": "#444444", - "relbarbgcolor": "#FEFEFE", - "relbartextcolor": "#444444", - "relbarlinkcolor": "#444444", - "bgcolor": "#FEFEFE", - "textcolor": "#444444", - # "linkcolor": "#79db32", # First Green - "linkcolor": "#00009d", - "headtextcolor": "#444444", - "headlinkcolor": "#444444", - # "codebgcolor" - # "codetextcolor" - "codetrimcolor": "#79db32", # First Green - "footerbgcolor": "#FEFEFE", + "github_user": "fedora-infra", + "github_repo": "mirrormanager2", + "page_width": "1040px", + "show_related": True, + "sidebar_collapse": True, + "caption_font_size": "140%", } # Add any paths that contain custom themes here, relative to this directory. # html_theme_path = [] -html_theme_path = [csp.get_theme_dir()] # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". # html_title = None +# html_style = "site.css" + # A shorter title for the navigation bar. Default is the same as html_title. # html_short_title = None @@ -181,15 +159,14 @@ # html_use_smartypants = True # Custom sidebar templates, maps document names to template names. -html_sidebars = { - "**": [ - "mm2-logo.html", - "localtoc.html", - "relations.html", - "sourcelink.html", - "searchbox.html", - ] -} +# html_sidebars = { +# "**": [ +# "localtoc.html", +# "relations.html", +# "sourcelink.html", +# "searchbox.html", +# ] +# } # Additional templates that should be rendered to pages, maps page names to # template names. diff --git a/doc/index.rst b/doc/index.rst index c500ec8a1..7003100ff 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -1,5 +1,5 @@ -MirrorManagement2 -================= +Mirror Manager +============== The MirrorManager project is the application used by the Fedora Project to manage their mirrors. diff --git a/poetry.lock b/poetry.lock index 5fcc8511a..c3618f11b 100644 --- a/poetry.lock +++ b/poetry.lock @@ -472,20 +472,6 @@ files = [ [package.dependencies] colorama = {version = "*", markers = "platform_system == \"Windows\""} -[[package]] -name = "cloud-sptheme" -version = "1.10.1.post20200504175005" -description = "a nice sphinx theme named 'Cloud', and some related extensions" -optional = false -python-versions = "*" -files = [ - {file = "cloud_sptheme-1.10.1.post20200504175005-py2.py3-none-any.whl", hash = "sha256:82be47ddebbc045e7386269fc062f79d6f87cefe8e5c1e35fe0e9f4266a57723"}, - {file = "cloud_sptheme-1.10.1.post20200504175005.tar.gz", hash = "sha256:caf47ac4c6346eef47fc11e799adbeaf645921c712cc099cf2530560e7ecde44"}, -] - -[package.dependencies] -sphinx = ">=1.6" - [[package]] name = "colorama" version = "0.4.6" @@ -2762,4 +2748,4 @@ deploy = ["gunicorn", "psycopg2"] [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "650bb62ba7f6ab1e62af9d50bf72d56d76ac671126c71711c414fd8b32428282" +content-hash = "8d83a083e298a1031969862112b762db06438a897b1ef595ec17595d7ff985e8" diff --git a/pyproject.toml b/pyproject.toml index 04d85daac..102d94c77 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -77,7 +77,6 @@ responses = "^0.23.3 || ^0.25.0" sphinx = ">=6.1.3" myst-parser = ">=0.16" sphinxcontrib-httpdomain = "^1.8.1" -cloud-sptheme = "^1.10.1.post20200504175005" sphinxcontrib-mermaid = "^0.9.2" [tool.poetry.scripts] diff --git a/utility/mirrormanager2.spec b/utility/mirrormanager2.spec index f2b064714..1c517fdc0 100644 --- a/utility/mirrormanager2.spec +++ b/utility/mirrormanager2.spec @@ -41,7 +41,6 @@ BuildRequires: python%{python_pkgversion}-coverage BuildRequires: python%{python_pkgversion}-sphinx BuildRequires: python%{python_pkgversion}-blinker BuildRequires: python%{python_pkgversion}-sphinxcontrib-httpdomain -BuildRequires: python%{python_pkgversion}-cloud-sptheme BuildRequires: rsync BuildRequires: python%{python_pkgversion}-responses BuildRequires: poetry