From c80a315e5cfdd1eccd9c2e2bb43a4f2f7e63ca43 Mon Sep 17 00:00:00 2001 From: Matthew Evans Date: Fri, 22 Mar 2024 08:49:12 +0000 Subject: [PATCH 1/3] Fix gh pages build for develop; do not create a fresh branch --- .github/workflows/pages.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index ea0be6e90..de1adeee5 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -35,10 +35,11 @@ jobs: - name: Commit to gh-pages run: | - git branch -D gh-pages || true - git checkout -b gh-pages + git checkout gh-pages git add optimade.html - git commit -m "Deploy to GitHub Pages: ${SHA}" + mkdir -p specification/develop + mv optimade.html specification/develop/index.html + git commit -m "Deploy develop specification to GitHub Pages: ${SHA}" if git diff --cached --quiet; then exit 0 fi From 54329af665d23346449c403820b85c7e01e9de49 Mon Sep 17 00:00:00 2001 From: Matthew Evans Date: Fri, 22 Mar 2024 09:03:48 +0000 Subject: [PATCH 2/3] Update style following feedback --- tests/makefiles/style.css | 73 ++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 40 deletions(-) diff --git a/tests/makefiles/style.css b/tests/makefiles/style.css index ba3d5c071..61af4333b 100644 --- a/tests/makefiles/style.css +++ b/tests/makefiles/style.css @@ -1,5 +1,4 @@ -@import url('https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap'); -@import url('https://fonts.googleapis.com/css2?family=JetBrains+Mono:ital,wght@0,100..800;1,100..800&display=swap'); +/* This is an OPTIMADE adjustment of the minimal CSS for HTML output from Docutils. */ :root { --bg-color: white; @@ -10,10 +9,10 @@ --secondary: #50fa7b; --tertiary: #ff414d; --quaternary: #7a2dd0; - --external-refs: var(--secondary); + --external-refs: var(--tertiary); --inline-refs: var(--primary); - --monospace-font-family: "JetBrains Mono", monospace; - --sans-serif-font-family: Roboto, Arial, Helvetica, 'Liberation Sans', sans-serif; + --monospace-font-family: monospace; + --sans-serif-font-family: sans-serif; } @media (prefers-color-scheme: dark) { @@ -26,10 +25,10 @@ --secondary: #50fa7b; --tertiary: #ff414d; --quaternary: #7a2dd0; - --external-refs: var(--secondary); - --inline-refs: var(--tertiary); - --monospace-font-family: "JetBrains Mono", monospace; - --sans-serif-font-family: Roboto, Arial, Helvetica, 'Liberation Sans', sans-serif; + --external-refs: var(--tertiary); + --inline-refs: var(--primary); + --monospace-font-family: monospace; + --sans-serif-font-family: sans-serif; } } @@ -37,15 +36,34 @@ body { font-family: var(--sans-serif-font-family); font-size: 16px; + max-width: 60rem; + margin-left: 10rem; + margin-right: auto; + margin-top: 0; + margin-bottom: 0; color: var(--fg-color); + background-color: var(--bg-color); + --field-indent: 9em; /* default indent of fields in field lists */ } -div.document { - margin: 0 auto; - margin-left: auto; - margin-right: auto; - max-width: 900px; - background-color: var(--bg-color); +/* "page layout" */ +main, footer, header { + line-height:1.6; + /* avoid long lines --> better reading */ + /* optimum is 45…75 characters/line */ + /* OTOH: lines should not be too short because of missing hyphenation, */ + max-width: 60rem; + padding: 1px 2%; /* 1px on top avoids grey bar above title (mozilla) */ + margin: auto; +} +main { + counter-reset: table figure; + background-color: var(--bg-color); +} +footer, header { + font-size: smaller; + padding: 0.5em 2%; + border: none; } .reference.internal { @@ -379,31 +397,6 @@ p img, p video, figure img, figure video { /* Document Structure */ /* ****************** */ -/* "page layout" */ -body { - margin: 0; - max-width: 900px; - background-color: var(--bg-color); - --field-indent: 9em; /* default indent of fields in field lists */ -} -main, footer, header { - line-height:1.6; - /* avoid long lines --> better reading */ - /* optimum is 45…75 characters/line */ - /* OTOH: lines should not be too short because of missing hyphenation, */ - max-width: 60rem; - padding: 1px 2%; /* 1px on top avoids grey bar above title (mozilla) */ - margin: auto; -} -main { - counter-reset: table figure; - background-color: var(--bg-color); -} -footer, header { - font-size: smaller; - padding: 0.5em 2%; - border: none; -} /* Table of Contents */ ul.auto-toc > li > p { From d57e2ed462f099b78db26eb02f756ed533ecfff0 Mon Sep 17 00:00:00 2001 From: Matthew Evans Date: Fri, 22 Mar 2024 09:30:30 +0000 Subject: [PATCH 3/3] Add build outputs to gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 395e52c52..f10e9a442 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ Makeconf* .DS_Store schemas/output schemas/example/output +*.pdf +*.html