From 46191b847e577743af2a7c2435d6fd3ec5b3572b Mon Sep 17 00:00:00 2001 From: Saeedniko Date: Thu, 1 Aug 2024 15:26:51 +0200 Subject: [PATCH 1/8] Update OpenEMS theme --- .vscode/settings.json | 1 + preview-src/ui-model.yml | 6 ++++-- src/css/vars.css | 5 +++-- src/img/feneco.ico | Bin 0 -> 105943 bytes src/partials/footer.hbs | 1 - src/partials/header-content.hbs | 28 ++++++---------------------- 6 files changed, 14 insertions(+), 27 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 src/img/feneco.ico diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/preview-src/ui-model.yml b/preview-src/ui-model.yml index 9fa2e1a..47dbb4b 100644 --- a/preview-src/ui-model.yml +++ b/preview-src/ui-model.yml @@ -1,8 +1,10 @@ antoraVersion: '1.0.0' site: - url: http://localhost:5252 - title: Brand Docs + url: https://github.com/OpenEMS/openems + title: OpenEMS // Docs homeUrl: &home_url /xyz/5.2/index.html + keys: + website: https://github.com/OpenEMS/openems components: - name: abc title: Project ABC diff --git a/src/css/vars.css b/src/css/vars.css index 91c9c09..8b5de53 100644 --- a/src/css/vars.css +++ b/src/css/vars.css @@ -17,6 +17,7 @@ --color-jet-70: #222; --color-jet-80: #191919; --color-black: #000; + --color-primary: #f0c693; /* fonts */ --rem-base: 18; /* used to compute rem value from desired pixel value (e.g., calc(18 / var(--rem-base) * 1rem) = 18px) */ --body-font-size: 1.0625em; /* 17px */ @@ -36,7 +37,7 @@ --scrollbar-thumb-color: var(--color-gray-10); --scrollbar_hover-thumb-color: var(--color-gray-30); /* navbar */ - --navbar-background: var(--color-jet-80); + --navbar-background: var(--color-primary); --navbar-font-color: var(--color-white); --navbar_hover-background: var(--color-black); --navbar-button-background: var(--color-white); @@ -79,7 +80,7 @@ --doc-line-height: 1.6; --doc-margin: 0 auto; --doc-margin--desktop: 0 2rem; - --heading-font-color: var(--color-jet-80); + --heading-font-color: var(--color-primary); --heading-font-weight: normal; --alt-heading-font-weight: var(--body-font-weight-bold); --section-divider-color: var(--panel-border-color); diff --git a/src/img/feneco.ico b/src/img/feneco.ico new file mode 100644 index 0000000000000000000000000000000000000000..d19addfdae735c9e68ddbee32fb5c804e5f04ef7 GIT binary patch literal 105943 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 Ag#Z8m literal 0 HcmV?d00001 diff --git a/src/partials/footer.hbs b/src/partials/footer.hbs index 9d49017..f285830 100644 --- a/src/partials/footer.hbs +++ b/src/partials/footer.hbs @@ -1,2 +1 @@ -{{> footer-content}} {{> footer-scripts}} diff --git a/src/partials/header-content.hbs b/src/partials/header-content.hbs index f11bd60..eba525d 100644 --- a/src/partials/header-content.hbs +++ b/src/partials/header-content.hbs @@ -5,7 +5,7 @@ {{#if env.SITE_SEARCH_PROVIDER}} {{/if}} @@ -17,29 +17,13 @@ - + \ No newline at end of file From 943dbe46eb561551576426e65e774a94793ede45 Mon Sep 17 00:00:00 2001 From: Saeedniko Date: Thu, 1 Aug 2024 15:46:16 +0200 Subject: [PATCH 2/8] Add github icon --- src/css/main.css | 9 +++++++++ src/img/github.svg | 1 + 2 files changed, 10 insertions(+) create mode 100644 src/img/github.svg diff --git a/src/css/main.css b/src/css/main.css index 83a333c..9811e15 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -37,3 +37,12 @@ body.-toc aside.toc.sidebar { flex-basis: var(--toc-width--widescreen); } } + +.gitlink { + background: url(../img/github.svg) no-repeat 50% 45%; + background-size: 50%; + display: block; + height: 2.5rem; + padding: 0; + width: 2.5rem +} diff --git a/src/img/github.svg b/src/img/github.svg new file mode 100644 index 0000000..2f9e2d9 --- /dev/null +++ b/src/img/github.svg @@ -0,0 +1 @@ +GitHub icon \ No newline at end of file From 6c1e0813710816ab39c1620734cbf65b725529fd Mon Sep 17 00:00:00 2001 From: Saeedniko Date: Wed, 7 Aug 2024 09:36:00 +0200 Subject: [PATCH 3/8] WIP --- preview-src/ui-model.yml | 2 +- src/partials/toolbar.hbs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/preview-src/ui-model.yml b/preview-src/ui-model.yml index 47dbb4b..1e321b2 100644 --- a/preview-src/ui-model.yml +++ b/preview-src/ui-model.yml @@ -64,7 +64,7 @@ page: displayVersion: '5.2' module: ROOT relativeSrcPath: index.adoc - editUrl: http://example.com/project-xyz/blob/main/index.adoc + editUrl: https://github.com/OpenEMS/openems/blob/develop/doc/modules/ROOT/pages/introduction.adoc origin: private: false previous: diff --git a/src/partials/toolbar.hbs b/src/partials/toolbar.hbs index 797aa05..03fc2e3 100644 --- a/src/partials/toolbar.hbs +++ b/src/partials/toolbar.hbs @@ -4,6 +4,5 @@ {{/with}} {{> breadcrumbs}} -{{> page-versions}} {{> edit-this-page}} From 2d8c2eecd82b8468abd3a8abd0a43277f50416a1 Mon Sep 17 00:00:00 2001 From: Saeedniko Date: Wed, 7 Aug 2024 09:58:14 +0200 Subject: [PATCH 4/8] Add Github actions --- .github/workflows/build.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..470f2b9 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,29 @@ +name: Build openems.io-theme +on: + pull_request: + types: [opened, synchronize, reopened] + push: + branches: + - main + - develop + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: '20' + + - name: build-uibundle + run: npm ci && gulp lint && gulp bundle + + - name: Save build-artifacts + uses: actions/upload-artifact@v4 + with: + name: java-build-artifacts + path: | + build/ui-bundle.zip From 263a47d94acf63a4c53106f08583c02f8dc98a2d Mon Sep 17 00:00:00 2001 From: Saeedniko Date: Wed, 7 Aug 2024 10:00:57 +0200 Subject: [PATCH 5/8] Fix error --- src/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/css/main.css b/src/css/main.css index 9811e15..cc2a82c 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -44,5 +44,5 @@ body.-toc aside.toc.sidebar { display: block; height: 2.5rem; padding: 0; - width: 2.5rem + width: 2.5rem; } From 2cc9180ca9ee52feaf5df6561df09324aa0278a8 Mon Sep 17 00:00:00 2001 From: Saeedniko Date: Wed, 7 Aug 2024 10:06:42 +0200 Subject: [PATCH 6/8] Fix names --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 470f2b9..4a08c5a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,6 +24,5 @@ jobs: - name: Save build-artifacts uses: actions/upload-artifact@v4 with: - name: java-build-artifacts - path: | - build/ui-bundle.zip + compression-level: 0 + path: build/ui-bundle.zip From a0d259b24a7fe441c2de05738c2d1562fdfbfc44 Mon Sep 17 00:00:00 2001 From: "Kai J." Date: Thu, 8 Aug 2024 10:39:39 +0200 Subject: [PATCH 7/8] Add release action --- .github/workflows/build.yml | 11 ++++------- .github/workflows/release.yml | 30 ++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4a08c5a..d2698f8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,12 +1,9 @@ -name: Build openems.io-theme +name: Build OpenEMS.io Theme + on: pull_request: types: [opened, synchronize, reopened] - push: - branches: - - main - - develop - + jobs: build: runs-on: ubuntu-latest @@ -18,7 +15,7 @@ jobs: with: node-version: '20' - - name: build-uibundle + - name: Build ui-bundle run: npm ci && gulp lint && gulp bundle - name: Save build-artifacts diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..341942b --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,30 @@ +name: Prepare OpenEMS.io Theme Release + +on: + push: + branches: + - master + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: '20' + + - name: Build ui-bundle + run: | + npm ci + gulp lint + gulp bundle + + - name: Create draft Release + uses: softprops/action-gh-release@v2 + with: + draft: true + files: | + build/ui-bundle.zip From 59157e12ba8897a9615ffc04e6120ecbe674928c Mon Sep 17 00:00:00 2001 From: Saeedniko Date: Wed, 14 Aug 2024 09:44:57 +0200 Subject: [PATCH 8/8] Remove logo --- src/img/feneco.ico | Bin 105943 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/img/feneco.ico diff --git a/src/img/feneco.ico b/src/img/feneco.ico deleted file mode 100644 index d19addfdae735c9e68ddbee32fb5c804e5f04ef7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 105943 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 Ag#Z8m