From 9e9672545e35d3725fe2386e8f7664804b843db5 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 31 Jan 2023 15:39:40 +1300 Subject: [PATCH 1/7] Use Furo theme --- docs/conf.py | 2 +- docs/reference/publication_formats/csv.md | 7 +------ requirements.in | 2 +- requirements.txt | 20 ++++++++++++++------ 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index ccc2dee..1b1cbdb 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -138,7 +138,7 @@ import os on_rtd = os.environ.get('READTHEDOCS', None) == 'True' -html_theme = 'sphinx_rtd_theme' +html_theme = 'furo' # otherwise, readthedocs.org uses their theme by default, so no need to specify it diff --git a/docs/reference/publication_formats/csv.md b/docs/reference/publication_formats/csv.md index 640cef4..7a46b61 100644 --- a/docs/reference/publication_formats/csv.md +++ b/docs/reference/publication_formats/csv.md @@ -10,12 +10,7 @@ To comment on or create discussions and issues, you need to [sign up for a free This section describes the structure of the tables in the CSV format and the relationship between the tables. Example CSV files and blank templates are provided for each table. -The CSV format consists of several tables, reflecting the structure of the [schema](../schema.md). The networks table is the main table. Arrays of objects in the schema are represented as separate tables: - -```{contents} ---- -local: true -``` +The CSV format consists of several tables, reflecting the structure of the [schema](../schema.md). The [networks table](#networks) is the main table. Arrays of objects in the schema are represented using the tables listed in the right sidebar. The field in the schema that each column represents is identified by the field's [JSON Pointer](https://tools.ietf.org/html/rfc6901). Rows in child tables are related to rows in parent tables using the parent object's `id` field. diff --git a/requirements.in b/requirements.in index d8dbee5..f60aec4 100644 --- a/requirements.in +++ b/requirements.in @@ -4,7 +4,6 @@ sphinxcontrib-opendataservices sphinxcontrib-opendataservices-jsonschema sphinx-intl transifex-client -sphinx_rtd_theme myst-parser sphinx-autobuild pyairtable @@ -17,3 +16,4 @@ pytest jscc mdformat jsonschema +furo diff --git a/requirements.txt b/requirements.txt index 8b91b53..16104dd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,6 +20,8 @@ babel==2.10.3 # sphinx-intl backports-datetime-fromisoformat==1.0.0 # via flattentool +beautifulsoup4==4.11.1 + # via furo btrees==4.10.1 # via zodb cattrs==22.1.0 @@ -46,7 +48,6 @@ docutils==0.17.1 # via # myst-parser # sphinx - # sphinx-rtd-theme # sphinxcontrib-opendataservices # sphinxcontrib-opendataservices-jsonschema et-xmlfile==1.1.0 @@ -57,6 +58,8 @@ exceptiongroup==1.0.0rc9 # pytest flattentool==0.20.0 # via -r requirements.in +furo==2022.12.7 + # via -r requirements.in gitdb==4.0.9 # via gitpython gitpython==3.1.27 @@ -156,7 +159,9 @@ pycparser==2.21 pygithub==1.55 # via -r requirements.in pygments==2.12.0 - # via sphinx + # via + # furo + # sphinx pyjwt==2.4.0 # via pygithub pynacl==1.5.0 @@ -205,23 +210,26 @@ smmap==5.0.0 # via gitdb snowballstemmer==2.2.0 # via sphinx -sphinx==4.5.0 +soupsieve==2.3.2.post1 + # via beautifulsoup4 +sphinx==5.3.0 # via # -r requirements.in + # furo # myst-parser # sphinx-autobuild + # sphinx-basic-ng # sphinx-design # sphinx-intl - # sphinx-rtd-theme # sphinxcontrib-opendataservices sphinx-autobuild==2021.3.14 # via -r requirements.in +sphinx-basic-ng==1.0.0b1 + # via furo sphinx-design==0.3.0 # via -r requirements.in sphinx-intl==2.0.1 # via -r requirements.in -sphinx-rtd-theme==1.0.0 - # via -r requirements.in sphinxcontrib-applehelp==1.0.2 # via sphinx sphinxcontrib-devhelp==1.0.2 From 7803afdadc222ba1f8eff5516d06e133117a01b4 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 31 Jan 2023 15:39:52 +1300 Subject: [PATCH 2/7] Customise Furo theme --- docs/_static/furo_custom.css | 23 +++++++++++++++++++++++ docs/_static/ods_logo_dark.png | Bin 0 -> 22466 bytes docs/_static/ods_logo_light.png | Bin 0 -> 27404 bytes docs/conf.py | 24 +++++++++++++++++++++--- 4 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 docs/_static/furo_custom.css create mode 100644 docs/_static/ods_logo_dark.png create mode 100644 docs/_static/ods_logo_light.png diff --git a/docs/_static/furo_custom.css b/docs/_static/furo_custom.css new file mode 100644 index 0000000..9066b99 --- /dev/null +++ b/docs/_static/furo_custom.css @@ -0,0 +1,23 @@ +table.docutils { + font-size: 75%; +} + +.admonition { + border-color: #bb437f; +} + +p.admonition-title { + background-color: #BB437F4F; +} + +p.admonition-title::before { + background-color: #c24886; +} + +table.docutils th { + background: transparent; +} + +tr.row-even { + background-color: var(--color-background-secondary); +} diff --git a/docs/_static/ods_logo_dark.png b/docs/_static/ods_logo_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..70dea02d64441fead25c59066cd14599a7941cf1 GIT binary patch literal 22466 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

Yd&1>&PA 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 literal 0 HcmV?d00001 diff --git a/docs/conf.py b/docs/conf.py index 1b1cbdb..08d56d1 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -146,7 +146,24 @@ # further. For a list of options available for each theme, see the # documentation. # -html_theme_options = {'navigation_depth': 5} +html_theme_options = { + 'light_css_variables': { + 'color-brand-primary': '#BE5D82', + 'color-brand-content': '#BE5D82', + 'color-background-secondary': '#FAF8F9', + 'color-sidebar-brand-text': '#BE5D82' + }, + 'dark_css_variables': { + 'color-brand-primary': '#BE5D82', + 'color-brand-content': '#BE5D82', + 'color-sidebar-brand-text': '#BE5D82' + }, + "light_logo": "ods_logo_light.png", + "dark_logo": "ods_logo_dark.png" +} + +pygments_style = "perldoc" +pygments_dark_style = "dracula" # Add any paths that contain custom themes here, relative to this directory. # html_theme_path = [] @@ -154,7 +171,7 @@ # The name for this set of Sphinx documents. # " v documentation" by default. # -# html_title = 'Open Data Services Sphinx Base' +html_title = 'Open Fibre Data Standard' # A shorter title for the navigation bar. Default is the same as html_title. # @@ -163,7 +180,6 @@ # The name of an image file (relative to this directory) to place at the top # of the sidebar. # -# html_logo = None # The name of an image file (relative to this directory) to use as a favicon of # the docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 @@ -176,6 +192,8 @@ # so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ['_static', '../schema'] +html_css_files = ['furo_custom.css'] + # Add any extra paths that contain custom files (such as robots.txt or # .htaccess) here, relative to this directory. These files are copied # directly to the root of the documentation. From e6ec2f423be1c4739df7d940a7efa5a2154e2ce1 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 31 Jan 2023 16:01:53 +1300 Subject: [PATCH 3/7] Customise docson --- docs/_static/furo_custom.css | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/docs/_static/furo_custom.css b/docs/_static/furo_custom.css index 9066b99..df211a6 100644 --- a/docs/_static/furo_custom.css +++ b/docs/_static/furo_custom.css @@ -21,3 +21,27 @@ table.docutils th { tr.row-even { background-color: var(--color-background-secondary); } + +.docson .box-header { + background: #bb437f7d; +} + +.docson .box-name { + color: var(--color-foreground-primary); +} + +.docson .box-description { + color: var(--color-foreground-primary); +} + +.docson .box { + background-color: var(--color-admonition-background); +} + +.docson .property-name { + color: var(--color-foreground-primary); +} + +.docson .signature-description { + color: var(--color-foreground-primary); +} From 0caaee68895bb261748b41194a7ff7dec9fda494 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Wed, 1 Feb 2023 15:35:52 +1300 Subject: [PATCH 4/7] Make colours accessible --- docs/_static/furo_custom.css | 4 ++-- docs/conf.py | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/_static/furo_custom.css b/docs/_static/furo_custom.css index df211a6..464b1d0 100644 --- a/docs/_static/furo_custom.css +++ b/docs/_static/furo_custom.css @@ -3,7 +3,7 @@ table.docutils { } .admonition { - border-color: #bb437f; + border-color: #aa2b5c; } p.admonition-title { @@ -11,7 +11,7 @@ p.admonition-title { } p.admonition-title::before { - background-color: #c24886; + background-color: #aa2b5c; } table.docutils th { diff --git a/docs/conf.py b/docs/conf.py index 08d56d1..c81e56c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -148,15 +148,15 @@ # html_theme_options = { 'light_css_variables': { - 'color-brand-primary': '#BE5D82', - 'color-brand-content': '#BE5D82', + 'color-brand-primary': '#aa2b5c', + 'color-brand-content': '#aa2b5c', 'color-background-secondary': '#FAF8F9', - 'color-sidebar-brand-text': '#BE5D82' + 'color-sidebar-brand-text': '#aa2b5c' }, 'dark_css_variables': { - 'color-brand-primary': '#BE5D82', - 'color-brand-content': '#BE5D82', - 'color-sidebar-brand-text': '#BE5D82' + 'color-brand-primary': '#da8ba9', + 'color-brand-content': '#da8ba9', + 'color-sidebar-brand-text': '#da8ba9' }, "light_logo": "ods_logo_light.png", "dark_logo": "ods_logo_dark.png" From 2108c59e557b440eeab2a89fa4b15bff141138af Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Wed, 1 Feb 2023 15:39:53 +1300 Subject: [PATCH 5/7] Fix build error --- docs/conf.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index c81e56c..65c5310 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -33,8 +33,7 @@ extensions = ['myst_parser', 'sphinxcontrib.opendataservices', 'sphinxcontrib.jsonschema', -'sphinx_design', -'sphinx_rtd_theme'] +'sphinx_design'] #MyST extenions myst_enable_extensions = [ From 7aff00dd5d0b6de9bbf1026b6a18582f99dd1208 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Wed, 1 Feb 2023 15:42:39 +1300 Subject: [PATCH 6/7] Make docson background white --- docs/_static/furo_custom.css | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/docs/_static/furo_custom.css b/docs/_static/furo_custom.css index 464b1d0..0b9240d 100644 --- a/docs/_static/furo_custom.css +++ b/docs/_static/furo_custom.css @@ -22,26 +22,6 @@ tr.row-even { background-color: var(--color-background-secondary); } -.docson .box-header { - background: #bb437f7d; -} - -.docson .box-name { - color: var(--color-foreground-primary); -} - -.docson .box-description { - color: var(--color-foreground-primary); -} - .docson .box { - background-color: var(--color-admonition-background); -} - -.docson .property-name { - color: var(--color-foreground-primary); -} - -.docson .signature-description { - color: var(--color-foreground-primary); + background-color: rgb(255, 255, 255); } From b27b9c68d9df1cbce1ad800c52f6b4c6aed24686 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Wed, 1 Feb 2023 15:44:59 +1300 Subject: [PATCH 7/7] Increase table font size --- docs/_static/furo_custom.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_static/furo_custom.css b/docs/_static/furo_custom.css index 0b9240d..53513d6 100644 --- a/docs/_static/furo_custom.css +++ b/docs/_static/furo_custom.css @@ -1,5 +1,5 @@ table.docutils { - font-size: 75%; + font-size: 85%; } .admonition {