From 9196cad3546439d352b0c8c49392c16240b11024 Mon Sep 17 00:00:00 2001 From: Sahaj Zalavadia Date: Wed, 27 Mar 2024 15:19:12 -0400 Subject: [PATCH 1/2] update styling and added template sync workflow --- .github/workflows/template-sync.yml | 29 ++++ .templatesyncignore | 2 + src/css/custom.css | 261 +++++++--------------------- 3 files changed, 93 insertions(+), 199 deletions(-) create mode 100644 .github/workflows/template-sync.yml create mode 100644 .templatesyncignore diff --git a/.github/workflows/template-sync.yml b/.github/workflows/template-sync.yml new file mode 100644 index 00000000..49da542a --- /dev/null +++ b/.github/workflows/template-sync.yml @@ -0,0 +1,29 @@ +on: + # cronjob trigger + schedule: + - cron: "0 0 * * 1" + # manual trigger + workflow_dispatch: +jobs: + repo-sync: + runs-on: ubuntu-latest + # https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs + permissions: + contents: write + pull-requests: write + + steps: + # To use this repository's private action, you must check out the repository + - name: Checkout + uses: actions/checkout@v4 + # https://github.com/actions/checkout#usage + # uncomment if you use submodules within the source repository + # with: + # submodules: true + + - name: actions-template-sync + uses: AndreasAugustin/actions-template-sync@v2 + with: + source_repo_path: ibm-client-engineering/solution-template + upstream_branch: main # defaults to main + pr_labels: template_sync # defaults to template_sync \ No newline at end of file diff --git a/.templatesyncignore b/.templatesyncignore new file mode 100644 index 00000000..549665e7 --- /dev/null +++ b/.templatesyncignore @@ -0,0 +1,2 @@ +:!src/css/custom.css +* \ No newline at end of file diff --git a/src/css/custom.css b/src/css/custom.css index 40b7d8af..e7cf0c96 100644 --- a/src/css/custom.css +++ b/src/css/custom.css @@ -1,257 +1,120 @@ @import url('https://fonts.googleapis.com/css2?family=IBM+Plex+Sans&display=swap'); -@import url('https://fonts.googleapis.com/css2?family=IBM+Plex+Mono&display=swap'); @import url('./external-link.css'); :root { - --ifm-font-family-base: 'IBM Plex Sans', 'Helvetica Neue', Arial, sans-serif; - --ifm-font-size-base: 16.5px; - --ifm-font-family-monospace: 'IBM Plex Mono', 'Menlo', 'DejaVu Sans Mono', - 'Bitstream Vera Sans Mono', Courier, monospace; + --ifm-font-family-base: 'IBM Plex Sans', 'Helvetica Neue', Arial, sans-serif; + --ifm-font-size-base: 16.5px; } -.code-block-error-line { - background-color: #ff000020; - display: block; - margin: 0 calc(-1 * var(--ifm-pre-padding)); - padding: 0 var(--ifm-pre-padding); - border-left: 3px solid #ff000080; -} .markdown>h1 { - font-weight: 300; + font-weight: 300; } .markdown>h2 { - font-weight: 300; + font-weight: 300; } + .markdown>h3 { - font-weight: 300; + font-weight: 300; } + .markdown>h4 { - font-weight: 300; + font-weight: 300; } .markdown h1:first-child { - font-weight: 300; -} - - -.navbar__brand { - color: #fff; -} - -.menu__list-item-collapsible { - border-radius: 0rem; -} - -.breadcrumbs__link { - border-radius: 0; -} - -.menu__list-item-collapsible { - font-weight: 1000; -} -.menu__list-item:not(:first-child) { - font-weight: 1000; -} - -/* Table of contents */ -.table-of-contents { - padding-top: 0; - padding-bottom: 0; -} - -.table-of-contents::before { - content: "In this Section:"; - font-weight: var(--ifm-font-weight-bold); - margin-left: var(--ifm-toc-padding-horizontal); -} - -div[class^="tocCollapsible"] .table-of-contents::before { - content: none; -} - -.table-of-contents__left-border { - border: none; + font-weight: 300; } -.table-of-contents__link { - text-decoration: none; -} -.table-of-contents__link:hover, -.table-of-contents__link:hover code, -.table-of-contents__link--active, -.table-of-contents__link--active code { - color: #fdf2f2; - text-decoration: none; -} -.table-of-contents__link--active { - background: #393939; - padding-left: 0.3rem; - position: relative; +.navbar { + background-color: black } -.table-of-contents__link--active::before { - content: ""; - display: block; - position: absolute; - top: 0; - left: calc(var(--ifm-toc-padding-horizontal) * -0.8); - width: 0.3rem; - height: 1.5rem; - /* border-radius: 0.09375rem; */ - background-color: #0e62fe; +.navbar__title { + color: white; + font-weight: bold } -div[class^="tocCollapsible"] { - background-color: var(--ifm-background-color); +.navbar__link { + color: white } -html[data-theme="dark"] div[class^="tocCollapsible"] { - background-color: #333; +.container { + max-width: 90%; } -div[class^="tocCollapsibleContent"] { - margin: 0 0.8rem; +.menu__link--active, +.menu__link--active:hover { + font-weight: bold; + color: #000000 } -div[class^="tocCollapsibleContent"]>ul { - padding: 0.25rem 0; +.breadcrumbs__item--active .breadcrumbs__link { + background: rgb(244 244 244); + color: black; } -div[class^="tocCollapsibleContent"] ul li { - line-height: 1.5rem; - margin: 0.25rem 0; +.breadcrumbs__link:hover { + color: #000000 } -.menu__link--active:not(.menu__link--sublist) { - border-left: .3rem solid #0e62fe; +.pagination-nav__link { + color: black; } -.table-of-contents__left-border { - border-left: 1px solid var(--ifm-toc-border-color); - } - -.table-of-contents { - font-size: 0.9rem; - margin-bottom: 0; - padding: var(--ifm-toc-padding-vertical) 0; +.footer { + background: #000000; + padding-bottom: 0%; } -@media (min-width: 1440px) { - .container { - max-width: var(--ifm-container-width); - } +.footer__link-item { + color: white } -.title_node_modules-\@docusaurus-theme-classic-lib-theme-BlogPostItem-Header-Title-styles-module { - font-size: 2.5rem; +.footer__title { + color: white } -:root { - --ifm-h1-font-size: 2.625rem; - --ifm-h2-font-size: 2.25rem; - --ifm-h3-font-size: 1.75rem; - --ifm-h4-font-size: 1.25rem; - --ifm-navbar-height: 50px; - --ifm-link-color: #0f5cf4; - --ifm-navbar-padding-horizontal: 20px; - --ifm-navbar-padding-vertical: 1px; - --ifm-color-primary: #000205; - --ifm-color-primary-dark: #35578f; - --ifm-color-primary-darker: #2e466f; - --ifm-menu-color: #000205; - /* --ifm-menu-color-background-active: #e8e8e8; */ - --ifm-color-primary-darkest: #202e78; - --ifm-color-primary-light: #5e8ce5; - --ifm-color-primary-lighter: #7fa5f8; - --ifm-color-primary-lightest: #b3cdf8; - --ifm-card-background-color: #0e62fe; - --ifm-background-color: #f4f4f4; - --ifm-footer-link-color: #f4f4f4; - --ifm-color-emphasis-800: #f4f4f4; - --ifm-color-emphasis-800: #f4f4f4; - --ifm-background-surface-color: #262626; - --ifm-code-font-size: 95%; - --ifm-navbar-link-color: #ffffff; - --ifm-navbar-link-hover-color: #fff; - --ifm-button-color: #ffffff; - --ifm-toc-border-color: #e0e0e0; - --ifm-footer-background-color: #262626; - - --ifm-menu-link-padding-vertical: 0.4rem; - /* --ifm-menu-link-padding-horizontal: 2rem; */ - --ifm-pagination-nav-border-radius: 0rem; - --ifm-alert-border-radius: 0rem; - --ifm-alert-background-color: #82b1ff; - --ifm-tip-background-color: #dafbe4; - --ifm-alert-border-color: #82b1ff; - --ifm-card-border-radius: 0; - - --color-section-number: #e8e8e8; - --color-section-number-toc: #e8e8e8; +.footer__logo { + margin-top: 0%; } -.docusaurus-highlight-code-line { - background-color: rgb(72, 77, 91); - display: block; - margin: 0 calc(-1 * var(--ifm-pre-padding)); - padding: 0 var(--ifm-pre-padding); +.table-of-contents::before { + content: "In this Section:"; + font-size: 15px; + font-weight: var(--ifm-font-weight-bold); + margin-left: var(--ifm-toc-padding-horizontal); } -article { - max-width: 1000px; - margin-left: auto; - margin-right: auto; -} -html[data-theme='light'] { - --ifm-footer-title-color: #f4f4f4 +.table-of-contents__link { + font-size: 15px; + padding: 0.2rem; + padding-left: 0.4rem; } -html[data-theme='dark'] { - --ifm-background-color: #161616; - --ifm-background-surface-color: #262626; - --ifm-color-primary: #f0f3f6; - --ifm-button-color: #262626; - --ifm-menu-color: #f0f3f6; +.table-of-contents__link:hover { + color: #000000; + background: #f2f2f2; + position: relative; } -.clean-btn { - color: white; +.table-of-contents__link--active { + color: #000000; + font-weight: var(--ifm-font-weight-bold); + background: #f2f2f2; + position: relative; } .header-github-link:hover { - opacity: 0.6; + opacity: 0.6; } .header-github-link:before { - content: ''; - width: 24px; - height: 24px; - display: flex; - background: url("data:image/svg+xml,%3Csvg viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill='white' d='M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12'/%3E%3C/svg%3E") no-repeat; - } - -.menu__list-item:not(:first-child) { - font-weight: 400; -} - -.menu__link, -.menu__caret { - border-radius: 0rem; -} - -:root { - --doc-sidebar-width: 256px !important; -} - -.pagination-nav__link { - border: 0px solid var(--ifm-color-emphasis-700); - display: block; - height: 100%; - line-height: var(--ifm-heading-line-height); - padding: var(--ifm-global-spacing); - transition: border-color var(--ifm-transition-fast) var(--ifm-transition-timing-default); - background-color:var(--ifm-button-color); + content: ''; + width: 24px; + height: 24px; + display: flex; + background: url("data:image/svg+xml,%3Csvg viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill='white' d='M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12'/%3E%3C/svg%3E") no-repeat; } \ No newline at end of file From e6ed78203c259c242523b5c2a393aab8132c8cda Mon Sep 17 00:00:00 2001 From: Sahaj Zalavadia Date: Wed, 27 Mar 2024 15:35:25 -0400 Subject: [PATCH 2/2] add new kroki --- docusaurus.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docusaurus.config.js b/docusaurus.config.js index 8ae9ce9c..3aba6037 100644 --- a/docusaurus.config.js +++ b/docusaurus.config.js @@ -73,7 +73,7 @@ async function createconfig() { /** @type {import("@docusaurus/preset-classic").Options} */ ({ docs: { - remarkPlugins: [[remarkKroki, { server: "https://kroki.io/", output: "inline-svg" }]], + remarkPlugins: [[remarkKroki, {alias: ['plantuml'], target: 'mdx3', output: "inline-svg"}]], routeBasePath: "/", sidebarPath: require.resolve("./sidebars.js"), // Please change this to your repo.