Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[zh]merge main into dev-zh #1024

Merged
merged 20 commits into from
Jul 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
8e7dfee
[en] Add term: 'Event-Driven Architecture' (#976)
jihoon-seo Jun 23, 2022
919b82f
Some design and search improvements (#930)
cjyabraham Jun 23, 2022
e461e69
[en] Certificates (#921)
iamNoah1 Jun 24, 2022
e54d891
Add .hugo_build.lock file to gitignore (#998)
jihoon-seo Jun 27, 2022
ea40142
complete Slack link (#1000)
Petrie Jun 27, 2022
4f333a5
Add French Localization Team Approvers (#975)
seokho-son Jul 1, 2022
c3de087
Merge `dev-pt` into `main` (#1010)
edsoncelio Jul 1, 2022
971043e
Update settings for maintainers (#1023)
seokho-son Jul 4, 2022
f158fd1
expands and refines o11y definition (#1004)
mhausenblas Jul 7, 2022
1d6e12a
tweak to config to get search working on PR instances (#1050)
cjyabraham Jul 8, 2022
c04837c
[en] Modify `load-balancer.md` (#1008)
sarkartanmay393 Jul 8, 2022
801443f
revert change to see if this fixes sitemap urls
cjyabraham Jul 11, 2022
ce33738
Merge branch 'main' of https://github.com/cncf/glossary into main
cjyabraham Jul 11, 2022
181070f
chore(deps): bump rojopolis/spellcheck-github-actions
dependabot[bot] Jul 11, 2022
7ea8204
Merge pull request #1062 from cncf/dependabot/github_actions/rojopoli…
seokho-son Jul 11, 2022
489ff6a
fix old links to favicons in docsy
cjyabraham Jul 13, 2022
7834638
Merge branch 'main' of https://github.com/cncf/glossary into main
cjyabraham Jul 13, 2022
edded5b
add some guidelines for localization teams (#1075)
iamNoah1 Jul 14, 2022
cd65beb
remove adrianna from all files (#1066)
iamNoah1 Jul 14, 2022
9c1274d
Updating custom theme for Glossary site (#1081)
thetwopct Jul 19, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 33 additions & 7 deletions .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,14 @@ collaborators:
- username: seokho-son
permission: admin

# English approvers (approver for all files in repository)
- username: jihoon-seo
permission: push
permission: maintain

- username: iamNoah1
permission: push
permission: maintain

# English approvers (approver for all files in repository)



# Localization approvers
Expand Down Expand Up @@ -77,9 +79,6 @@ collaborators:
- username: DaveVentura
permission: push

- username: Petria3s
permission: push

# l10n it approvers
- username: fsbaraglia
permission: push
Expand Down Expand Up @@ -143,6 +142,16 @@ collaborators:
- username: Submarinee
permission: push

# l10n fr approvers
- username: huats
permission: push

- username: fydrah
permission: push

- username: Krast76
permission: push

branches:

# Default branch of this repository for configurations and English contents
Expand Down Expand Up @@ -235,7 +244,6 @@ branches:
users:
- iamNoah1
- DaveVentura
- Petria3s
teams: []
enforce_admins: null
required_linear_history: null
Expand Down Expand Up @@ -333,3 +341,21 @@ branches:
teams: []
enforce_admins: null
required_linear_history: null

# l10n branch for fr contents only
- name: dev-fr
protection:
required_pull_request_reviews:
required_approving_review_count: 2
require_code_owner_reviews: true
required_status_checks: null
restrictions:
apps: []
# fr approvers
users:
- huats
- fydrah
- Krast76
teams: []
enforce_admins: null
required_linear_history: null
2 changes: 1 addition & 1 deletion .github/workflows/es-spellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: GitHub Spellcheck Action
uses: rojopolis/spellcheck-github-actions@0.24.0
uses: rojopolis/spellcheck-github-actions@0.25.0
with:
config_path: content/es/.spellcheck.yml
2 changes: 1 addition & 1 deletion .github/workflows/spellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ jobs:
- uses: actions/checkout@v3

- name: GitHub Spellcheck Action
uses: rojopolis/spellcheck-github-actions@0.24.0
uses: rojopolis/spellcheck-github-actions@0.25.0
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
public/
resources/
node_modules/
.hugo_build.lock
5 changes: 4 additions & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
/content/hi/ @Garima-Negi @sayantani11 @anubha-v-ardhan @jayesh-srivastava

# Approvers for German contents
/content/de/ @iamNoah1 @DaveVentura @Petria3s
/content/de/ @iamNoah1 @DaveVentura @CathPag

# Approvers for Italian contents
/content/it/ @fsbaraglia @meryem-ldn @annalisag-spark @sistella
Expand All @@ -38,3 +38,6 @@

# Approvers for Chinese contents
/content/zh-cn/ @hanyuancheung @Jacob953 @Rocksnake @Submarinee

# Approvers for French contents
/content/fr/ @huats @fydrah @Krast76
13 changes: 11 additions & 2 deletions LOCALIZATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ we'd love to start localizing it into different languages.

- [Initiate a new localization team](#initiating-a-new-localization-team)
- [Join an existing localization team](#join-an-existing-localization-team)
- [Localization team guidelines](#localization-team-guidelines)

Contributions to improving the following localization guides and localization policies are also welcome.

Expand Down Expand Up @@ -132,6 +133,14 @@ Once the PR is merged, the localized content will go live on its website 🎉

To join an existing team, hop on the #glossary-localizations and #glossary-localization-[language name] channels on the CNCF Slack. Introduce yourself, let the team know you want to contribute, and the team will take it from there.

If the team seems inactive (no response after several days), reach out to @Seokho Son, @Catherine Paganini, and @jmo on the #glossary-localizations channel.
If the team seems inactive (no response after several days), reach out to @Seokho Son, @Catherine Paganini, @jmo, @Jihoon Seo or @Noah Ispas on the #glossary-localizations channel.

Note, that every localization team may have their own process of working on localizing terms. However, one thing is common for all localization teams and important to keep in mind: Contributions have to be based on the `dev-xx` branch and PRs need to target `dev-xx`.
---

# Localization team guidelines
Every localization team may have its own process of working on localizing terms. However, here are some guidelines that are common for all localization teams:

1. Only terms with the status `Completed` in the English version are ready to be localized.
2. All contributions related to localization have to be based on the `dev-xx` branch, and PRs need to target `dev-xx`.
3. Localization teams need to get changes from the `main` branch in their `dev-xx` branch from time to time. Therefore a PR should be opened where the `main` branch is merged into `dev-xx`. The glossary maintainers will then choose the rebase method to complete the PR and keep the history linear.
4. A localized term does not have to match the English version completely. Also, the localized and English versions of terms can coexist independently throughout updates. Localization teams can decide to which degree localized terms have to match their English version and how to handle updates on the English term.
16 changes: 16 additions & 0 deletions assets/scss/_archive.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.article-teaser {
h3 {
margin-top: 34px;
a {
color: $black;
}
}
}

.articles-of-tag hr {
background: linear-gradient(180deg, #c4c4c4, hsla(0, 0%, 77%, 0));
border-bottom: 0;
height: 10px;
opacity: 0.15;
width: 100%;
}
37 changes: 37 additions & 0 deletions assets/scss/_buttons.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// buttons.
.button-reset {
background: none;
border: none;
box-sizing: border-box;
cursor: pointer;
display: block;
margin-left: 0;
margin-right: 0;
padding: 0;
width: unset;
}

.cncf-button {
color: $white;
background-color: $black;
border: 0;
border-radius: 3px;
box-shadow: none;
box-sizing: border-box;
cursor: pointer;
font-size: 16px;
font-weight: 700;
letter-spacing: 0.02em;
line-height: 105%;
margin: 0;
max-width: 100%;
padding: 12px 40px;
text-align: center;
text-decoration: none;
text-transform: uppercase;
transition: all 0.25s ease-out;
word-break: break-word;
&:hover {
background-color: $gray-700;
}
}
39 changes: 39 additions & 0 deletions assets/scss/_categories.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
// Category.
.category {
margin-top: 0;
margin-right: 0;
margin-bottom: 1.875rem;
@media (min-width: 768px) {
margin-bottom: 3.125rem;
}
margin-right: 12px;
color: $gray-700;
font-weight: 700;
letter-spacing: 0.2em;
}

// Category labels.
i.technology,
i.property,
i.concept {
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
display: inline-block;
font-style: normal;
font-variant: normal;
text-rendering: auto;
line-height: 1;
font-family: 'Font Awesome 5 Free';
font-weight: 900;
padding-right: 0.5em;
color: $gray-700;
}
i.technology:before {
content: '\f7d9';
}
i.property:before {
content: '\f1ad';
}
i.concept:before {
content: '\f0eb';
}
57 changes: 57 additions & 0 deletions assets/scss/_footer.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
// footer.
footer {
min-height: unset;
background-color: $black;
color: #eee;
padding: 4rem 0 3rem;
a {
color: $primary;
font-weight: 600;
&:hover {
color: $primary;
text-decoration: none;
}
}
.brand img {
height: 40px;
}
small a {
color: #eee;
}
}

// social links.
.social-links {
text-align: center;
@media (min-width: 992px) {
text-align: right;
}
a {
padding: 10px;
display: block;
}
svg {
fill: $white;
color: $white;
height: 25px;
max-width: 30px;
&:hover {
color: $link-color;
fill: $link-color;
}
}
}

.horizontal-rule {
background-color: $white;
height: 1px;
width: 100%;
margin: 1rem 0;
}

.copyright {
text-align: center;
@media (min-width: 992px) {
text-align: left;
}
}
92 changes: 92 additions & 0 deletions assets/scss/_hamburger.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
/**
* Hamburger Menu
* Based on https://github.com/jonsuh/hamburgers
*
*/

// Setup variables for the hamburger.
$hamburger-active-layer-color: $black;
$hamburger-layer-color: $black;
$hamburger-padding-x: 12px;
$hamburger-padding-y: 0px;
$hamburger-layer-width: 28px;
$hamburger-layer-height: 4px;
$hamburger-layer-spacing: 4px;
$hamburger-hover-opacity: 1;
$hamburger-active-hover-opacity: 1;

// Output the hamburger CSS
.hamburger {
padding: $hamburger-padding-y $hamburger-padding-x;
cursor: pointer;

transition-property: opacity, filter;
transition-duration: 0.15s;
transition-timing-function: linear;

// Normalize the <button>
font: inherit;
color: inherit;
text-transform: none;
background-color: transparent;
border: 0;
margin: 0;
overflow: visible;

margin-left: 20px;

&:hover {
opacity: $hamburger-hover-opacity;
}

// Hide Hamburger on Desktop up.
@media (min-width: 768px) {
display: none;
}
}

.hamburger-box {
width: $hamburger-layer-width;
height: $hamburger-layer-height * 3 + $hamburger-layer-spacing * 2;
display: inline-block;
position: relative;
perspective: $hamburger-layer-width * 2;
}

.hamburger-inner {
display: block;
top: 50%;
margin-top: calc($hamburger-layer-height / -2);
transition: transform 0.15s cubic-bezier(0.645, 0.045, 0.355, 1),
background-color 0s 0.1s cubic-bezier(0.645, 0.045, 0.355, 1);

&,
&::before,
&::after {
width: $hamburger-layer-width;
height: 3px;
background-color: $hamburger-layer-color;
position: absolute;
transition-property: transform;
transition-duration: 0.15s;
transition-timing-function: ease;
}

&::before,
&::after {
content: '';
display: block;
transition: transform 0s 0.1s cubic-bezier(0.645, 0.045, 0.355, 1);
}

&::before {
top: ($hamburger-layer-spacing + $hamburger-layer-height) * -1;
}

&::after {
bottom: ($hamburger-layer-spacing + $hamburger-layer-height) * -1;
}
@media (prefers-reduced-motion: reduce) {
transition: none !important;
}
}
Loading