This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git
The following commit(s) were added to refs/heads/master by this push: new 527b83e feat: added ASF logos 527b83e is described below commit 527b83e81c9964abf2e0208f968dceaab9f3d596 Author: juzhiyuan <jjzhiy...@gmail.com> AuthorDate: Mon Mar 30 11:43:24 2020 +0800 feat: added ASF logos --- assets/style.scss | 10 +++++++ config.yaml | 56 ++++-------------------------------- layouts/partials/footer.html | 20 +++++++++++++ layouts/partials/navbar.html | 2 +- static/images/logos/apache_logo.png | Bin 0 -> 28237 bytes 5 files changed, 37 insertions(+), 51 deletions(-) diff --git a/assets/style.scss b/assets/style.scss index 9adc62c..2576bda 100644 --- a/assets/style.scss +++ b/assets/style.scss @@ -14,4 +14,14 @@ .warning { font-weight: bold; +} + +.navbar.is-fresh .navbar-brand img { + width: 300px; + height: 122px; + max-height: 122px; +} + +.navbar.is-fresh .language-switcher { + margin-top: 0; } \ No newline at end of file diff --git a/config.yaml b/config.yaml index da66a65..f97b9f2 100644 --- a/config.yaml +++ b/config.yaml @@ -36,10 +36,8 @@ languages: navbar: - title: Home url: / - - title: Docs + - title: Documentation url: https://github.com/apache/incubator-apisix/tree/master/doc - - title: Downloads - url: /downloads - title: Get Involved sublinks: - title: Subscribe Guide @@ -70,6 +68,8 @@ languages: url: https://www.apache.org/foundation/sponsorship.html - title: Thanks url: https://www.apache.org/foundation/thanks.html + - title: Downloads + url: /downloads language: name: 中 link: /zh @@ -97,28 +97,6 @@ languages: column1: title: "Disclaimer" text: Apache APISIX (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indica [...] - column2: - title: "Documentation" - links: - - text: Overview - link: https://github.com/apache/incubator-apisix#apisix - - text: Quick start - link: https://github.com/apache/incubator-apisix#quickstart - - text: Developer guide - link: https://github.com/apache/incubator-apisix/blob/master/doc/architecture-design.md - column3: - title: "ASF" - links: - - text: Foundation - link: http://www.apache.org/ - - text: License - link: http://www.apache.org/licenses/ - - text: Events - link: https://apachecon.com/?ref=apisix.incubator.apache.org - - text: Sponsorship - link: http://www.apache.org/foundation/sponsorship.html - - text: Thanks - link: http://www.apache.org/foundation/thanks.html zh: params: hero: @@ -148,8 +126,6 @@ languages: url: /zh - title: 文档 url: https://github.com/apache/incubator-apisix/tree/master/doc - - title: 下载 - url: /zh/downloads - title: 参与 sublinks: - title: 订阅指南 @@ -180,6 +156,8 @@ languages: url: https://www.apache.org/foundation/sponsorship.html - title: 致谢 url: https://www.apache.org/foundation/thanks.html + - title: 下载 + url: /zh/downloads language: name: EN link: / @@ -207,28 +185,6 @@ languages: column1: title: "Disclaimer" text: Apache APISIX (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate [...] - column2: - title: "Documentation" - links: - - text: Overview - link: https://github.com/apache/incubator-apisix#apisix - - text: Quick start - link: https://github.com/apache/incubator-apisix#quickstart - - text: Developer guide - link: https://github.com/apache/incubator-apisix/blob/master/doc/architecture-design.md - column3: - title: "ASF" - links: - - text: Foundation - link: http://www.apache.org/ - - text: License - link: http://www.apache.org/licenses/ - - text: Events - link: https://apachecon.com/?ref=apisix.incubator.apache.org - - text: Sponsorship - link: http://www.apache.org/foundation/sponsorship.html - - text: Thanks - link: http://www.apache.org/foundation/thanks.html params: # Open graph allows easy social sharing. If you don't want it you can set it to false or just delete the variable @@ -237,7 +193,7 @@ params: description: navbarlogo: # Logo (from static/images/logos/___) - image: logos/apisix.svg + image: logos/apache_logo.png link: / font: name: "Open Sans" diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 7eabd0c..5964f9d 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -24,6 +24,26 @@ </div> </div> {{- end }} + <div class="column is-4"> + <div class="footer-column"> + <div class="footer-header"></div> + <div class="footer-description" style="text-align: center;"> + <img src="/images/logos/apisix.svg" alt="Apache APISIX" style="width: 200px;"> + </div> + <ul class="link-list"> + </ul> + </div> + </div> + <div class="column is-4" style="display: flex;align-items: center;"> + <div class="footer-column"> + <div class="footer-header"></div> + <div class="footer-description" style="text-align: center;"> + <a href="http://www.apache.org/" target="_blank"><img src="https://www.apache.org/foundation/press/kit/asf_logo_wide_small.png" alt="Apache APISIX" ></a> + </div> + <ul class="link-list"> + </ul> + </div> + </div> </div> <div class="divider"></div> <div class="copyright"> diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html index 29da1e0..4734bd7 100644 --- a/layouts/partials/navbar.html +++ b/layouts/partials/navbar.html @@ -79,8 +79,8 @@ </a> {{- end }} {{- end }} + <a class="language-switcher" href="{{ $language.link }}">{{ $language.name }}</a> </div> - <a class="language-switcher" href="{{ $language.link }}">{{ $language.name }}</a> </div> </div> </nav> diff --git a/static/images/logos/apache_logo.png b/static/images/logos/apache_logo.png new file mode 100644 index 0000000..9a47ae0 Binary files /dev/null and b/static/images/logos/apache_logo.png differ