From 2bd8fbe32106dc8e6d4768d9cdb790c2475aff9a Mon Sep 17 00:00:00 2001 From: Craig Box Date: Fri, 27 Jan 2023 18:35:49 +1300 Subject: [PATCH] Media resources (#12531) * Remove media-resources page and redirect * Remove old SVGs and add a new, correct-shaped image for OpenGraph * This file was committed elsewhere. --- content/en/about/media-resources/index.md | 74 ----------------- content/zh/about/media-resources/index.md | 74 ----------------- layouts/_default/baseof.html | 6 +- layouts/index.redir | 9 ++- src/sass/_all.scss | 1 - src/sass/misc/_media-resources.scss | 81 ------------------- .../istio-bluelogo-nobackground-framed.svg | 1 - .../istio-bluelogo-nobackground-unframed.svg | 1 - .../istio-bluelogo-whitebackground-framed.svg | 1 - ...stio-bluelogo-whitebackground-unframed.svg | 1 - .../istio-whitelogo-bluebackground-framed.svg | 1 - ...stio-whitelogo-bluebackground-unframed.svg | 1 - .../istio-whitelogo-nobackground-framed.svg | 1 - .../istio-whitelogo-nobackground-unframed.svg | 1 - 14 files changed, 11 insertions(+), 242 deletions(-) delete mode 100644 content/en/about/media-resources/index.md delete mode 100644 content/zh/about/media-resources/index.md delete mode 100644 src/sass/misc/_media-resources.scss delete mode 100644 static/img/istio-bluelogo-nobackground-framed.svg delete mode 100644 static/img/istio-bluelogo-nobackground-unframed.svg delete mode 100644 static/img/istio-bluelogo-whitebackground-framed.svg delete mode 100644 static/img/istio-bluelogo-whitebackground-unframed.svg delete mode 100644 static/img/istio-whitelogo-bluebackground-framed.svg delete mode 100644 static/img/istio-whitelogo-bluebackground-unframed.svg delete mode 100644 static/img/istio-whitelogo-nobackground-framed.svg delete mode 100644 static/img/istio-whitelogo-nobackground-unframed.svg diff --git a/content/en/about/media-resources/index.md b/content/en/about/media-resources/index.md deleted file mode 100644 index 14920b5c45..0000000000 --- a/content/en/about/media-resources/index.md +++ /dev/null @@ -1,74 +0,0 @@ ---- -title: Media Resources -description: Official Istio resources for digital and printed materials. -weight: 90 ---- - -Here are a few assets in case you want to show off your support for Istio, integration to Istio, or want to link back to -us. Please feel free to borrow these: - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
White logo in minimal container, with and without Istio Blue background
White logo in square container, with and without Istio Blue background
Istio Blue logo in minimal container, with and without white background
Istio Blue logo in square container, with and without white background
If you're interested in sticking an Istio logo on some physical goods, check out this zip file with embroidering instructions.
- -Here's some advice about using these images: - -
-
-
-
-

Cool

-
-
-
-
    -
  • {{< checkmark_icon >}} Use the Istio logo to link to istio.io
    • -
  • {{< checkmark_icon >}} Use the Istio logo to advertise that your product has support for Istio
    • -
  • {{< checkmark_icon >}} Use the Istio logo in a blog post or news article about Istio
    • -
-
-
-
-
-
-

Not Cool

-
-
-
-
    -
  • {{< cancel_icon >}} Use the Istio logo for your application’s icon
    • -
  • {{< cancel_icon >}} Create a modified version of the Istio logo
    • -
  • {{< cancel_icon >}} Integrate the Istio logo into your logo
    • -
  • {{< cancel_icon >}} Change the Istio logo's colors or aspect ratio
    • -
-
-
-
-
diff --git a/content/zh/about/media-resources/index.md b/content/zh/about/media-resources/index.md deleted file mode 100644 index 77cc44f8dd..0000000000 --- a/content/zh/about/media-resources/index.md +++ /dev/null @@ -1,74 +0,0 @@ ---- -title: 媒体资源 -description: Istio 官方资源，用于数字和印刷的。 -weight: 90 -icon: istio-blue-logo ---- - -如果您想展示对 Istio 的支持、集成 Istio 或在页面上添加指向我们的链接，您可借用下面这些资源： - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
没有内边距的白色 logo，提供 Istio 蓝 背景色和透明背景色两种样式。
带有内边距的正方形白色 logo，提供 Istio 蓝 背景色和透明背景色两种样式。
没有内边距的 Istio 蓝 logo，提供白色背景和透明背景两种可选样式。
带有内边距的正方形 Istio 蓝 logo，提供白色背景和透明背景两种可选样式。
如果您有兴趣在一些实物上粘贴 Istio logo， 请检查 压缩文件 中关于装饰的说明。
- -以下是有关使用这些图像的一些建议： - -
-
-
-
-

正确

-
-
-
-
    -
  • {{< checkmark_icon >}} 使用 Istio logo 连接到 istio.io
    • -
  • {{< checkmark_icon >}} 使用 Istio logo 宣传您的产品支持 Istio
    • -
  • {{< checkmark_icon >}} 在有关 Istio 的博客文章或新闻文章中使用 Istio logo
    • -
-
-
-
-
-
-

错误

-
-
-
-
    -
  • {{< cancel_icon >}} 使用 Istio logo 作为您的应用程序图标
    • -
  • {{< cancel_icon >}} 创建 Istio logo 的修改版本
    • -
  • {{< cancel_icon >}} 集成 Istio logo 到您的 logo 中
    • -
  • {{< cancel_icon >}} 更改 Istio logo 的颜色或宽高比
    • -
-
-
-
-
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 1cc0264430..e574a23565 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -34,10 +34,10 @@ {{ if .Permalink }} {{ end }} - + - - + + diff --git a/layouts/index.redir b/layouts/index.redir index f7c9848beb..7d2533d93b 100644 --- a/layouts/index.redir +++ b/layouts/index.redir @@ -71,4 +71,11 @@ https://archive.istio.io/* https://istio.io/:splat 301! # /latest/faq/ /about/faq /latest/faq/* /about/faq/ /about/faq/* /about/faq/ -/latest/about/faq/* /about/faq/ \ No newline at end of file +/latest/about/faq/* /about/faq/ + +# media-resources page + +/about/media-resources https://github.com/cncf/artwork/tree/master/projects/istio +/latest/about/media-resources https://github.com/cncf/artwork/tree/master/projects/istio +/about/zh/media-resources https://github.com/cncf/artwork/tree/master/projects/istio +/latest/zh/about/media-resources https://github.com/cncf/artwork/tree/master/projects/istio \ No newline at end of file diff --git a/src/sass/_all.scss b/src/sass/_all.scss index bbac8a8a2a..c47082bc3e 100644 --- a/src/sass/_all.scss +++ b/src/sass/_all.scss @@ -37,7 +37,6 @@ @import "misc/involve-block"; @import "misc/landing"; @import "misc/logo-gallery"; -@import "misc/media-resources"; @import "misc/menu"; @import "misc/modal"; @import "misc/multi-block"; diff --git a/src/sass/misc/_media-resources.scss b/src/sass/misc/_media-resources.scss deleted file mode 100644 index bfbc58eb9b..0000000000 --- a/src/sass/misc/_media-resources.scss +++ /dev/null @@ -1,81 +0,0 @@ -.media-resources { - $panel-height: 11rem; - $title-size: 2rem; - - table, th, td { - border: 0; - } - - td { - line-height: 1.15em; - vertical-align: middle; - padding-top: 1em; - padding-bottom: 1em; - } - - td.logo { - width: 100px; - border: 0; - } - - td.desc { - border: 0; - } - - li { - list-style-type: none; - } - - .advice { - display: grid; - grid-template-columns: [panel] 1fr; - grid-gap: 2rem; - padding-top: 2rem; - - @media (min-width: $bp-lg) { - grid-template-columns: [panel] 1fr [panel] 1fr; - } - - .panel { - display: table; - border-radius: $border-radius; - border: 1px solid $mainBrandColor; - min-height: $panel-height; - width: 100%; - margin-bottom: 1rem; - - .title { - position: relative; - display: table-cell; - width: $title-size; - border-top-left-radius: $border-radius; - border-bottom-left-radius: $border-radius; - background-color: $mainBrandColor; - min-height: 100%; - - div { - position: absolute; - top: $panel-height; - width: $panel-height; - text-align: center; - transform: rotate(-90deg); - transform-origin: left top 0; - } - - p { - color: $textBrandColor; - font-size: $title-size; - margin: 0; - padding: 0; - line-height: $title-size; - } - } - - .body { - display: table-cell; - min-height: 100%; - padding: 1rem 0; - } - } - } -} diff --git a/static/img/istio-bluelogo-nobackground-framed.svg b/static/img/istio-bluelogo-nobackground-framed.svg deleted file mode 100644 index 6324255e4e..0000000000 --- a/static/img/istio-bluelogo-nobackground-framed.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/static/img/istio-bluelogo-nobackground-unframed.svg b/static/img/istio-bluelogo-nobackground-unframed.svg deleted file mode 100644 index dc50745db5..0000000000 --- a/static/img/istio-bluelogo-nobackground-unframed.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/static/img/istio-bluelogo-whitebackground-framed.svg b/static/img/istio-bluelogo-whitebackground-framed.svg deleted file mode 100644 index 8dfe5169c2..0000000000 --- a/static/img/istio-bluelogo-whitebackground-framed.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/static/img/istio-bluelogo-whitebackground-unframed.svg b/static/img/istio-bluelogo-whitebackground-unframed.svg deleted file mode 100644 index f428c04124..0000000000 --- a/static/img/istio-bluelogo-whitebackground-unframed.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/static/img/istio-whitelogo-bluebackground-framed.svg b/static/img/istio-whitelogo-bluebackground-framed.svg deleted file mode 100644 index 4106b8c220..0000000000 --- a/static/img/istio-whitelogo-bluebackground-framed.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/static/img/istio-whitelogo-bluebackground-unframed.svg b/static/img/istio-whitelogo-bluebackground-unframed.svg deleted file mode 100644 index d04d084c7c..0000000000 --- a/static/img/istio-whitelogo-bluebackground-unframed.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/static/img/istio-whitelogo-nobackground-framed.svg b/static/img/istio-whitelogo-nobackground-framed.svg deleted file mode 100644 index 136e2405bf..0000000000 --- a/static/img/istio-whitelogo-nobackground-framed.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/static/img/istio-whitelogo-nobackground-unframed.svg b/static/img/istio-whitelogo-nobackground-unframed.svg deleted file mode 100644 index ea8dc9bae8..0000000000 --- a/static/img/istio-whitelogo-nobackground-unframed.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file