From 4dc6ff23b9acc72d3e2751ce65880cc7cfc3e232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merlin=20B=C3=B6gershausen?= Date: Mon, 6 Dec 2021 14:49:35 +0100 Subject: [PATCH 1/4] add empty stylesheets to repository --- stylesheets/adoptium-docu.css | 1 + 1 file changed, 1 insertion(+) create mode 100644 stylesheets/adoptium-docu.css diff --git a/stylesheets/adoptium-docu.css b/stylesheets/adoptium-docu.css new file mode 100644 index 0000000..4d5c50e --- /dev/null +++ b/stylesheets/adoptium-docu.css @@ -0,0 +1 @@ +/* Website Adoptium Documentation Styles*/ \ No newline at end of file From de37488c4de4182dc3cc8537ef18d4f4dcb46d91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merlin=20B=C3=B6gershausen?= Date: Mon, 6 Dec 2021 14:50:24 +0100 Subject: [PATCH 2/4] configure build script and actions to use the stylesheets --- .github/workflows/build.yml | 2 +- build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cc71556..19370b3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: uses: actions/checkout@v2 - name: Build - run: asciidoctor --source-dir=. --trace --base-dir=. '*/*.adoc' + run: asciidoctor --source-dir=. --trace --base-dir=. '*/*.adoc' -a stylesheet=stylesheets/adoptium-docu.css - name: Store Result uses: actions/upload-artifact@v2 diff --git a/build.sh b/build.sh index 92bebc0..1a57aaa 100755 --- a/build.sh +++ b/build.sh @@ -1 +1 @@ -asciidoctor --source-dir=. --base-dir=. '*/*.adoc' \ No newline at end of file +asciidoctor --source-dir=. --base-dir=. '*/*.adoc' -a stylesheet=./stylesheets/adoptium-docu.css \ No newline at end of file From 5a3fbf2e55d2a230287ccfc4b16dbbfeff7045c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merlin=20B=C3=B6gershausen?= Date: Mon, 6 Dec 2021 14:50:46 +0100 Subject: [PATCH 3/4] fix broken include --- documentation-documentation/index.adoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/documentation-documentation/index.adoc b/documentation-documentation/index.adoc index 7e84f26..f4a85e8 100644 --- a/documentation-documentation/index.adoc +++ b/documentation-documentation/index.adoc @@ -13,8 +13,12 @@ = How to contribute to this documentation? +<<<<<<< HEAD To have a common sense about how to document Adoptium Documentation has a, wait a minute... **Documentation** include::eca-sign-off.adoc[] include::asciidoc-attributes.adoc[] +======= +include::documentation-documentation/eca-sign-off.adoc[] +>>>>>>> ab33d9e (fix broken include) From 8d3f62c161f83e2966647d4e34dd3246fd4f14a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merlin=20B=C3=B6gershausen?= Date: Mon, 6 Dec 2021 14:59:35 +0100 Subject: [PATCH 4/4] update fork --- .github/workflows/build.yml | 2 +- documentation-documentation/index.adoc | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 19370b3..e5d1113 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: uses: actions/checkout@v2 - name: Build - run: asciidoctor --source-dir=. --trace --base-dir=. '*/*.adoc' -a stylesheet=stylesheets/adoptium-docu.css + run: asciidoctor --source-dir=. --trace --base-dir=. '*/*.adoc' -a stylesheet=./stylesheets/adoptium-docu.css - name: Store Result uses: actions/upload-artifact@v2 diff --git a/documentation-documentation/index.adoc b/documentation-documentation/index.adoc index f4a85e8..7dbd10b 100644 --- a/documentation-documentation/index.adoc +++ b/documentation-documentation/index.adoc @@ -13,12 +13,8 @@ = How to contribute to this documentation? -<<<<<<< HEAD To have a common sense about how to document Adoptium Documentation has a, wait a minute... **Documentation** -include::eca-sign-off.adoc[] - -include::asciidoc-attributes.adoc[] -======= include::documentation-documentation/eca-sign-off.adoc[] ->>>>>>> ab33d9e (fix broken include) + +include::documentation-documentation/asciidoc-attributes.adoc[]