Skip to content

Commit 196c319

Browse files
authored
Merge branch 'kubernetes:main' into docs_version_fr
2 parents f54a351 + 33d2b99 commit 196c319

File tree

1,298 files changed

+33998
-5529
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,298 files changed

+33998
-5529
lines changed

OWNERS_ALIASES

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,19 @@ aliases:
1010
- sftim
1111
sig-docs-website-owners: # Admins for overall website
1212
- divya-mohan0209
13+
- katcosgrove
1314
- natalisucks
1415
- reylejano
16+
- salaxander
1517
- sftim
1618
- tengqm
17-
- drewhagen # RT 1.30 Docs Lead
18-
- katcosgrove # RT 1.30 Lead
1919
sig-docs-localization-owners: # Admins for localization content
2020
- a-mccarthy
2121
- divya-mohan0209
2222
- natalisucks
2323
- nate-double-u
2424
- reylejano
25+
- salaxander
2526
- sftim
2627
- seokho-son
2728
- tengqm
@@ -31,9 +32,20 @@ aliases:
3132
- natalisucks
3233
- nate-double-u
3334
- reylejano
35+
- salaxander
3436
- sftim
3537
- seokho-son
3638
- tengqm
39+
sig-docs-bn-owners: # Admins for Bengali content
40+
- asem-hamid
41+
- Imtiaz1234
42+
- mitul3737
43+
- rajibmitra
44+
sig-docs-bn-reviews: # PR reviews for Bengali content
45+
- asem-hamid
46+
- Imtiaz1234
47+
- mitul3737
48+
- rajibmitra
3749
sig-docs-de-owners: # Admins for German content
3850
- bene2k1
3951
- rlenferink
@@ -44,47 +56,43 @@ aliases:
4456
- celestehorgan
4557
- dipesh-rawat
4658
- divya-mohan0209
59+
- katcosgrove
4760
- natalisucks
4861
- nate-double-u
4962
- reylejano
63+
- salaxander
5064
- sftim
5165
- tengqm
5266
sig-docs-en-reviews: # PR reviews for English content
5367
- celestehorgan
5468
- dipesh-rawat
5569
- divya-mohan0209
70+
- katcosgrove
5671
- kbhawkey
5772
- mengjiao-liu
5873
- mickeyboxell
5974
- natalisucks
6075
- nate-double-u
6176
- reylejano
77+
- salaxander
6278
- sftim
6379
- shannonxtreme
6480
- tengqm
6581
- windsonsea
6682
sig-docs-es-owners: # Admins for Spanish content
67-
- 92nqb
6883
- electrocucaracha
6984
- krol3
70-
- raelga
7185
- ramrodo
7286
sig-docs-es-reviews: # PR reviews for Spanish content
73-
- 92nqb
7487
- electrocucaracha
7588
- jossemarGT
7689
- krol3
77-
- raelga
7890
- ramrodo
7991
sig-docs-fr-owners: # Admins for French content
80-
- awkif
81-
- feloy
8292
- perriea
8393
- rekcah78
8494
- remyleone
8595
sig-docs-fr-reviews: # PR reviews for French content
86-
- awkif
87-
- feloy
8896
- perriea
8997
- rekcah78
9098
- remyleone
@@ -121,6 +129,7 @@ aliases:
121129
- atoato88
122130
- bells17
123131
- kakts
132+
- Okabe-Junya
124133
- t-inu
125134
sig-docs-ko-owners: # Admins for Korean content
126135
- gochist
@@ -140,6 +149,7 @@ aliases:
140149
- divya-mohan0209
141150
- natalisucks
142151
- reylejano
152+
- salaxander
143153
- sftim
144154
- tengqm
145155
sig-docs-zh-owners: # Admins for Chinese content
@@ -173,18 +183,14 @@ aliases:
173183
sig-docs-pt-owners: # Admins for Portuguese content
174184
- devlware
175185
- edsoncelio
176-
- femrtnz
177186
- jcjesus
178187
- stormqueen1990
179-
- yagonobre
180188
sig-docs-pt-reviews: # PR reviews for Portugese content
181189
- devlware
182190
- edsoncelio
183-
- femrtnz
184191
- jcjesus
185192
- mrerlison
186193
- stormqueen1990
187-
- yagonobre
188194
sig-docs-vi-owners: # Admins for Vietnamese content
189195
- huynguyennovem
190196
- truongnh1992

README-bn.md

Lines changed: 210 additions & 0 deletions
Large diffs are not rendered by default.

README-ja.md

Lines changed: 67 additions & 41 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -192,13 +192,14 @@ If you need help at any point when contributing, the [New Contributor Ambassador
192192

193193
| Language | Language |
194194
| -------------------------- | -------------------------- |
195-
| [Chinese](README-zh.md) | [Korean](README-ko.md) |
196-
| [French](README-fr.md) | [Polish](README-pl.md) |
197-
| [German](README-de.md) | [Portuguese](README-pt.md) |
198-
| [Hindi](README-hi.md) | [Russian](README-ru.md) |
199-
| [Indonesian](README-id.md) | [Spanish](README-es.md) |
200-
| [Italian](README-it.md) | [Ukrainian](README-uk.md) |
201-
| [Japanese](README-ja.md) | [Vietnamese](README-vi.md) |
195+
| [Bengali](README-bn.md) | [Korean](README-ko.md) |
196+
| [Chinese](README-zh.md) | [Polish](README-pl.md) |
197+
| [French](README-fr.md) | [Portuguese](README-pt.md) |
198+
| [German](README-de.md) | [Russian](README-ru.md) |
199+
| [Hindi](README-hi.md) | [Spanish](README-es.md) |
200+
| [Indonesian](README-id.md) | [Ukrainian](README-uk.md) |
201+
| [Italian](README-it.md) | [Vietnamese](README-vi.md) |
202+
| [Japanese](README-ja.md) | |
202203

203204
## Code of conduct
204205

SECURITY_CONTACTS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@ tengqm
1717
onlydole
1818
kbhawkey
1919
natalisucks
20+
salaxander
21+
katcosgrove

assets/scss/_base.scss

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ footer {
7777
font-size: 1rem;
7878
border: 0px;
7979

80-
}
81-
82-
.button:hover {
83-
background-color: darken($blue, 10%);
80+
&:hover {
81+
background-color: darken($blue, 10%);
82+
color: white;
83+
}
8484
}
8585

8686
#cellophane {
@@ -104,6 +104,11 @@ main {
104104
text-decoration: none;
105105
font-size: 1rem;
106106
border: 0px;
107+
108+
&:hover {
109+
background-color: darken($blue, 10%);
110+
color: white;
111+
}
107112
}
108113
}
109114

@@ -554,7 +559,7 @@ section#cncf {
554559

555560
#desktopKCButton:hover{
556561
background-color: #ffffff;
557-
color: #3371e3;
562+
color: #326ce5;
558563
transition: 150ms;
559564
}
560565

assets/scss/_custom.scss

Lines changed: 73 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,36 @@ body {
514514
h1:first-of-type + .alert.callout {
515515
margin-top: 1.5em;
516516
}
517+
518+
div.feature-state-notice {
519+
background-color: #daeaf9;
520+
border-radius: 0.75rem;
521+
padding: 1rem;
522+
margin-bottom: 1em;
523+
524+
font-size: 1.2em;
525+
526+
> .feature-state-name::before {
527+
content: '';
528+
color: #326ce5; // Kubernetes blue
529+
}
530+
> .feature-state-name {
531+
display: inline-block;
532+
font-size: 0.95em;
533+
font-weight: bold;
534+
color: #000;
535+
background-color: #daeaf9;
536+
}
537+
538+
code {
539+
color: #000;
540+
font-size: 1em;
541+
background-color: #daeaf9;
542+
}
543+
544+
margin-right: 2em;
545+
max-width: 80%;
546+
}
517547
}
518548

519549
// Special color for third party content disclaimers
@@ -698,7 +728,7 @@ body.cid-partners {
698728
line-height: 40px;
699729
color: #ffffff;
700730
font-size: 16px;
701-
background-color: #3371e3;
731+
background-color: #326ce5;
702732
text-decoration: none;
703733
}
704734

@@ -820,6 +850,44 @@ body.cid-community > #deprecation-warning > .deprecation-warning > * {
820850
background-color: inherit;
821851
}
822852

853+
body.cid-code-of-conduct main {
854+
max-width: calc(min(90vw, 100em));
855+
padding-top: 3rem;
856+
padding-left: 0.5em;
857+
padding-right: 0.5em;
858+
margin-left: auto;
859+
margin-right: auto;
860+
861+
#cncf-code-of-conduct {
862+
margin-top: 4rem;
863+
margin-bottom: 4rem;
864+
padding-left: 4rem;
865+
866+
> h2, h3, h4, h5 {
867+
color: #0662EE;
868+
}
869+
870+
> h2:first-child {
871+
margin-top: 0.25em;
872+
margin-bottom: 1em;
873+
}
874+
}
875+
876+
> hr {
877+
margin-top: 4rem;
878+
margin-bottom: 4rem;
879+
}
880+
881+
> hr:last-of-type ~ * {
882+
text-align: center;
883+
font-size: 1.15rem;
884+
}
885+
886+
> *:last-child {
887+
margin-bottom: 4rem;
888+
}
889+
}
890+
823891
#caseStudies body > #deprecation-warning > .deprecation-warning, body.cid-casestudies > #deprecation-warning > .deprecation-warning {
824892
color: inherit;
825893
background: inherit;
@@ -1266,10 +1334,11 @@ div.alert > em.javascript-required {
12661334
flex-grow: 1;
12671335
overflow-x: hidden;
12681336
width: auto;
1269-
}
12701337

1271-
.search-bar:focus-within {
1272-
border: 2.5px solid rgba(47, 135, 223, 0.7);
1338+
&:focus-within {
1339+
outline: 1.5px solid rgba(47, 135, 223, 0.7);
1340+
border: 1px solid rgba(47, 135, 223, 0.7);
1341+
}
12731342
}
12741343

12751344
.search-bar i.search-icon {

assets/scss/_skin.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$blue: #3371e3;
1+
$blue: #326ce5;
22
$light-grey: #f7f7f7;
33
$dark-grey: #303030;
44
$medium-grey: #4c4c4c;

assets/scss/_variables_project.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Add styles or override variables from the theme here. */
1212
@import "tablet";
1313
@import "desktop";
1414

15-
$primary: #3371e3;
15+
$primary: #326ce5;
1616

1717
// tooltip
1818
$tooltip-bg: #555;

content/bn/OWNERS

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# See the OWNERS docs at https://go.k8s.io/owners
2+
3+
# This is the localization project for Bengali.
4+
# Teams and members are visible at https://github.com/orgs/kubernetes/teams.
5+
6+
reviewers:
7+
- sig-docs-bn-reviews
8+
9+
approvers:
10+
- sig-docs-bn-owners
11+
12+
labels:
13+
- language/bn

0 commit comments

Comments
 (0)