From d92417e04ba756c076f57c1b5a739bcfd182fe1e Mon Sep 17 00:00:00 2001 From: Flynn Date: Thu, 27 Jun 2024 15:30:45 -0400 Subject: [PATCH] Reapply @karr9's PR #1791 work (#1796) * styles and code are added to highlight an ambassador Signed-off-by: Karina Rodriguez * A new property was added to highlight an ambassador Signed-off-by: Karina Rodriguez --------- Signed-off-by: Karina Rodriguez Co-authored-by: Karina Rodriguez Co-authored-by: Flynn (cherry picked from commit 55bc952490e75b7ca4272c72343063b3b2b14776) Co-authored-by: Karina <93212792+karr9@users.noreply.github.com> --- linkerd.io/assets/scss/styles.scss | 21 ++++++ .../content/community/ambassadors/_index.md | 24 +++++-- .../community/ambassadors/ambassadors.html | 69 ++++++++++++++----- .../images/ambassadors/github-icon-navy.svg | 3 + .../images/ambassadors/linkedin-icon-navy.svg | 8 +++ .../images/ambassadors/twitter-icon-navy.svg | 8 +++ .../assets/bulma/sass/grid/columns.sass | 1 + 7 files changed, 110 insertions(+), 24 deletions(-) create mode 100644 linkerd.io/static/images/ambassadors/github-icon-navy.svg create mode 100644 linkerd.io/static/images/ambassadors/linkedin-icon-navy.svg create mode 100644 linkerd.io/static/images/ambassadors/twitter-icon-navy.svg diff --git a/linkerd.io/assets/scss/styles.scss b/linkerd.io/assets/scss/styles.scss index ed407fdb0a..15f5d7e9b4 100644 --- a/linkerd.io/assets/scss/styles.scss +++ b/linkerd.io/assets/scss/styles.scss @@ -289,6 +289,27 @@ .community-card { height: 100%; + position: relative; + &.highlight { + background-color: #EAF3FA; + } +} +.emeritus{ + position: absolute; + right: 1rem; + padding: 0 0.8rem; + top: 1rem; + width: auto; + background-color: #64f9bf; + border-radius: 25px; + font-size: 0.9rem; + @media (max-width: 912px) { + right: 0; + top: 0; + padding: 0 0.7rem; + font-size: 0.7rem; + border-radius: 0px; + } } .adopters-case-studies__quote { diff --git a/linkerd.io/content/community/ambassadors/_index.md b/linkerd.io/content/community/ambassadors/_index.md index 2de693b737..029eddba0a 100644 --- a/linkerd.io/content/community/ambassadors/_index.md +++ b/linkerd.io/content/community/ambassadors/_index.md @@ -17,12 +17,14 @@ ambassadors: job_title: Field Engineer image: /images/ambassadors/profile/charles-pretzer.png flag: ๐Ÿ‡บ๐Ÿ‡ธ + highlight: false github: https://github.com/cpretzer linkedin: https://www.linkedin.com/in/charlespretzer/ - name: Chris Campbell job_title: Cloud Software Engineer image: /images/ambassadors/profile/chris-campbell.png flag: ๐Ÿ‡บ๐Ÿ‡ธ + highlight: false github: https://github.com/campbel twitter: https://twitter.com/ChrsCmpbl linkedin: https://www.linkedin.com/in/chris-campbell-28410839/ @@ -30,6 +32,7 @@ ambassadors: job_title: Director of Cloud Technologies image: /images/ambassadors/profile/christian-huning.png flag: ๐Ÿ‡ฉ๐Ÿ‡ช + highlight: false github: https://github.com/christianhuening twitter: https://twitter.com/chrishuen linkedin: https://www.linkedin.com/in/christian-h%C3%BCning-964191a3/ @@ -37,12 +40,14 @@ ambassadors: job_title: Junior DevOps Engineer image: /images/ambassadors/profile/dominik-taskai.jpg flag: ๐Ÿ‡ญ๐Ÿ‡บ + highlight: false github: https://github.com/dtaskai linkedin: https://www.linkedin.com/in/dtaskai/ - name: Eli Goldberg job_title: Platform Team Lead image: /images/ambassadors/profile/eli-goldberg.jpeg flag: ๐Ÿ‡ฎ๐Ÿ‡ฑ + highlight: false github: https://github.com/Eli-Goldberg twitter: https://twitter.com/EliG0ldberg linkedin: https://www.linkedin.com/in/eli-go/ @@ -50,26 +55,22 @@ ambassadors: job_title: Developer image: /images/ambassadors/profile/fredrik-klingenberg.png flag: ๐Ÿ‡ณ๐Ÿ‡ด + highlight: false github: https://github.com/fredrkl twitter: https://twitter.com/fredrkl linkedin: https://www.linkedin.com/in/fredrikklingenberg/ - - name: Kasper Nissen - job_title: Lead Platform Architect - image: /images/ambassadors/profile/kasper-nissen.png - flag: ๐Ÿ‡ฉ๐Ÿ‡ฐ - github: https://github.com/kaspernissen - twitter: https://twitter.com/phennex - linkedin: https://www.linkedin.com/in/kaspernissen/ - name: Marรญa Teresa Rojas job_title: SRE image: /images/ambassadors/profile/maria-rojas.png flag: ๐Ÿ‡ต๐Ÿ‡น + highlight: false github: https://github.com/mtrojas linkedin: https://www.linkedin.com/in/mtrojas/ - name: Sergio Mรฉndez job_title: DevOps Engineer image: /images/ambassadors/profile/sergio-mendez.png flag: ๐Ÿ‡ฌ๐Ÿ‡น + highlight: false github: https://github.com/sergioarmgpl twitter: https://twitter.com/sergioarmgpl linkedin: https://www.linkedin.com/in/sergioarmgpl/ @@ -77,5 +78,14 @@ ambassadors: job_title: Founder & CEO image: '/images/ambassadors/profile/steve-gray.png' flag: ๐Ÿ‡ฆ๐Ÿ‡บ + highlight: false linkedin: https://www.linkedin.com/in/eventualconsistency/ + - name: Kasper Nissen + job_title: Lead Platform Architect + image: /images/ambassadors/profile/kasper-nissen.png + flag: ๐Ÿ‡ฉ๐Ÿ‡ฐ + highlight: true + github: https://github.com/kaspernissen + twitter: https://twitter.com/phennex + linkedin: https://www.linkedin.com/in/kaspernissen/ --- diff --git a/linkerd.io/layouts/partials/community/ambassadors/ambassadors.html b/linkerd.io/layouts/partials/community/ambassadors/ambassadors.html index b2c489ef9c..5bb7ae89bc 100644 --- a/linkerd.io/layouts/partials/community/ambassadors/ambassadors.html +++ b/linkerd.io/layouts/partials/community/ambassadors/ambassadors.html @@ -3,6 +3,39 @@
{{ range . }}
+ + {{ if .highlight }} +
+
+ {{ .name }} +
+
+

{{ .name }} {{ .flag }}

+

{{ .job_title }}

+ +
+ {{ with .github }} + + github icon + + {{ end }} + {{ with .twitter }} + + twitter icon + + {{ end }} + {{ with .linkedin }} + + linkedin icon + + {{ end }} +
+
+ +
Emeritus
+ +
+ {{ else }}
{{ .name }} @@ -10,25 +43,27 @@

{{ .name }} {{ .flag }}

{{ .job_title }}

-
- {{ with .github }} - - github icon - - {{ end }} - {{ with .twitter }} - - twitter icon - - {{ end }} - {{ with .linkedin }} - - linkedin icon - - {{ end }} -
+ +
+ {{ with .github }} + + github icon + + {{ end }} + {{ with .twitter }} + + twitter icon + + {{ end }} + {{ with .linkedin }} + + linkedin icon + + {{ end }} +
+ {{ end }}
{{ end }}
diff --git a/linkerd.io/static/images/ambassadors/github-icon-navy.svg b/linkerd.io/static/images/ambassadors/github-icon-navy.svg new file mode 100644 index 0000000000..8d60b2f866 --- /dev/null +++ b/linkerd.io/static/images/ambassadors/github-icon-navy.svg @@ -0,0 +1,3 @@ + + + diff --git a/linkerd.io/static/images/ambassadors/linkedin-icon-navy.svg b/linkerd.io/static/images/ambassadors/linkedin-icon-navy.svg new file mode 100644 index 0000000000..60acdf19c9 --- /dev/null +++ b/linkerd.io/static/images/ambassadors/linkedin-icon-navy.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/linkerd.io/static/images/ambassadors/twitter-icon-navy.svg b/linkerd.io/static/images/ambassadors/twitter-icon-navy.svg new file mode 100644 index 0000000000..cf67465203 --- /dev/null +++ b/linkerd.io/static/images/ambassadors/twitter-icon-navy.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/linkerd.io/themes/buoyant/assets/bulma/sass/grid/columns.sass b/linkerd.io/themes/buoyant/assets/bulma/sass/grid/columns.sass index 632f0785db..63dbb5ec78 100644 --- a/linkerd.io/themes/buoyant/assets/bulma/sass/grid/columns.sass +++ b/linkerd.io/themes/buoyant/assets/bulma/sass/grid/columns.sass @@ -503,3 +503,4 @@ $column-gap: 0.75rem !default +fullhd &.is-#{$i}-fullhd --columnGap: #{$i * 0.25rem} +