Skip to content

Commit

Permalink
Merge pull request #46495 from Princesso/merged-main-dev-1.31
Browse files Browse the repository at this point in the history
Merge main branch into dev 1.31
  • Loading branch information
k8s-ci-robot authored May 23, 2024
2 parents 5957f6f + e941a6a commit ccaaebf
Show file tree
Hide file tree
Showing 1,481 changed files with 38,124 additions and 8,056 deletions.
35 changes: 21 additions & 14 deletions OWNERS_ALIASES
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,19 @@ aliases:
- sftim
sig-docs-website-owners: # Admins for overall website
- divya-mohan0209
- katcosgrove
- natalisucks
- reylejano
- salaxander
- sftim
- tengqm
- drewhagen # RT 1.30 Docs Lead
- katcosgrove # RT 1.30 Lead
sig-docs-localization-owners: # Admins for localization content
- a-mccarthy
- divya-mohan0209
- natalisucks
- nate-double-u
- reylejano
- salaxander
- sftim
- seokho-son
- tengqm
Expand All @@ -31,9 +32,21 @@ aliases:
- natalisucks
- nate-double-u
- reylejano
- salaxander
- sftim
- seokho-son
- tengqm
sig-docs-bn-owners: # Admins for Bengali content
- asem-hamid
- Imtiaz1234
- mitul3737
- rajibmitra
sig-docs-bn-reviews: # PR reviews for Bengali content
- asem-hamid
- Imtiaz1234
- mitul3737
- rajibmitra
- sajibAdhi
sig-docs-de-owners: # Admins for German content
- bene2k1
- rlenferink
Expand All @@ -44,47 +57,43 @@ aliases:
- celestehorgan
- dipesh-rawat
- divya-mohan0209
- katcosgrove
- natalisucks
- nate-double-u
- reylejano
- salaxander
- sftim
- tengqm
sig-docs-en-reviews: # PR reviews for English content
- celestehorgan
- dipesh-rawat
- divya-mohan0209
- katcosgrove
- kbhawkey
- mengjiao-liu
- mickeyboxell
- natalisucks
- nate-double-u
- reylejano
- salaxander
- sftim
- shannonxtreme
- tengqm
- windsonsea
sig-docs-es-owners: # Admins for Spanish content
- 92nqb
- electrocucaracha
- krol3
- raelga
- ramrodo
sig-docs-es-reviews: # PR reviews for Spanish content
- 92nqb
- electrocucaracha
- jossemarGT
- krol3
- raelga
- ramrodo
sig-docs-fr-owners: # Admins for French content
- awkif
- feloy
- perriea
- rekcah78
- remyleone
sig-docs-fr-reviews: # PR reviews for French content
- awkif
- feloy
- perriea
- rekcah78
- remyleone
Expand Down Expand Up @@ -121,6 +130,7 @@ aliases:
- atoato88
- bells17
- kakts
- Okabe-Junya
- t-inu
sig-docs-ko-owners: # Admins for Korean content
- gochist
Expand All @@ -140,6 +150,7 @@ aliases:
- divya-mohan0209
- natalisucks
- reylejano
- salaxander
- sftim
- tengqm
sig-docs-zh-owners: # Admins for Chinese content
Expand Down Expand Up @@ -173,18 +184,14 @@ aliases:
sig-docs-pt-owners: # Admins for Portuguese content
- devlware
- edsoncelio
- femrtnz
- jcjesus
- stormqueen1990
- yagonobre
sig-docs-pt-reviews: # PR reviews for Portugese content
- devlware
- edsoncelio
- femrtnz
- jcjesus
- mrerlison
- stormqueen1990
- yagonobre
sig-docs-vi-owners: # Admins for Vietnamese content
- huynguyennovem
- truongnh1992
Expand Down
210 changes: 210 additions & 0 deletions README-bn.md

Large diffs are not rendered by default.

108 changes: 67 additions & 41 deletions README-ja.md

Large diffs are not rendered by default.

15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -192,13 +192,14 @@ If you need help at any point when contributing, the [New Contributor Ambassador

| Language | Language |
| -------------------------- | -------------------------- |
| [Chinese](README-zh.md) | [Korean](README-ko.md) |
| [French](README-fr.md) | [Polish](README-pl.md) |
| [German](README-de.md) | [Portuguese](README-pt.md) |
| [Hindi](README-hi.md) | [Russian](README-ru.md) |
| [Indonesian](README-id.md) | [Spanish](README-es.md) |
| [Italian](README-it.md) | [Ukrainian](README-uk.md) |
| [Japanese](README-ja.md) | [Vietnamese](README-vi.md) |
| [Bengali](README-bn.md) | [Korean](README-ko.md) |
| [Chinese](README-zh.md) | [Polish](README-pl.md) |
| [French](README-fr.md) | [Portuguese](README-pt.md) |
| [German](README-de.md) | [Russian](README-ru.md) |
| [Hindi](README-hi.md) | [Spanish](README-es.md) |
| [Indonesian](README-id.md) | [Ukrainian](README-uk.md) |
| [Italian](README-it.md) | [Vietnamese](README-vi.md) |
| [Japanese](README-ja.md) | |

## Code of conduct

Expand Down
2 changes: 2 additions & 0 deletions SECURITY_CONTACTS
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ tengqm
onlydole
kbhawkey
natalisucks
salaxander
katcosgrove
File renamed without changes
File renamed without changes
15 changes: 10 additions & 5 deletions assets/scss/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ footer {
font-size: 1rem;
border: 0px;

}

.button:hover {
background-color: darken($blue, 10%);
&:hover {
background-color: darken($blue, 10%);
color: white;
}
}

#cellophane {
Expand All @@ -104,6 +104,11 @@ main {
text-decoration: none;
font-size: 1rem;
border: 0px;

&:hover {
background-color: darken($blue, 10%);
color: white;
}
}
}

Expand Down Expand Up @@ -554,7 +559,7 @@ section#cncf {

#desktopKCButton:hover{
background-color: #ffffff;
color: #3371e3;
color: #326ce5;
transition: 150ms;
}

Expand Down
117 changes: 109 additions & 8 deletions assets/scss/_custom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ body.td-404 main .error-details {
height: 44px;
background-repeat: no-repeat;
background-size: contain;
background-image: url("/images/favicon.png");
background-image: url("/images/logo-header.png");
}

#hamburger {
Expand Down Expand Up @@ -497,14 +497,33 @@ body {
border-left-width: calc(max(0.5em, 4px));
border-top-left-radius: calc(max(0.5em, 4px));
border-bottom-left-radius: calc(max(0.5em, 4px));
padding-top: 0.75rem;
}
.alert.callout.caution {
.alert.alert-caution {
border-left-color: #f0ad4e;
}
.alert.callout.note {
.alert.alert-info {
border-left-color: #428bca;
h4, h4.alert-heading {
color: #000;
display: block;
float: left;
font-size: 1rem;
padding: 0;
padding-right: 0.5rem;
margin: 0;
line-height: 1.5;
font-weight: bolder;
}
}
.alert.alert-caution {
border-left-color: #f0ad4e;
h4, h4.alert-heading {
font-size: 1em;
font-weight: bold;
}
}
.alert.callout.warning {
.alert.alert-warning {
border-left-color: #d9534f;
}
.alert.third-party-content {
Expand Down Expand Up @@ -728,7 +747,7 @@ body.cid-partners {
line-height: 40px;
color: #ffffff;
font-size: 16px;
background-color: #3371e3;
background-color: #326ce5;
text-decoration: none;
}

Expand Down Expand Up @@ -850,6 +869,44 @@ body.cid-community > #deprecation-warning > .deprecation-warning > * {
background-color: inherit;
}

body.cid-code-of-conduct main {
max-width: calc(min(90vw, 100em));
padding-top: 3rem;
padding-left: 0.5em;
padding-right: 0.5em;
margin-left: auto;
margin-right: auto;

#cncf-code-of-conduct {
margin-top: 4rem;
margin-bottom: 4rem;
padding-left: 4rem;

> h2, h3, h4, h5 {
color: #0662EE;
}

> h2:first-child {
margin-top: 0.25em;
margin-bottom: 1em;
}
}

> hr {
margin-top: 4rem;
margin-bottom: 4rem;
}

> hr:last-of-type ~ * {
text-align: center;
font-size: 1.15rem;
}

> *:last-child {
margin-bottom: 4rem;
}
}

#caseStudies body > #deprecation-warning > .deprecation-warning, body.cid-casestudies > #deprecation-warning > .deprecation-warning {
color: inherit;
background: inherit;
Expand Down Expand Up @@ -1296,10 +1353,11 @@ div.alert > em.javascript-required {
flex-grow: 1;
overflow-x: hidden;
width: auto;
}

.search-bar:focus-within {
border: 2.5px solid rgba(47, 135, 223, 0.7);
&:focus-within {
outline: 1.5px solid rgba(47, 135, 223, 0.7);
border: 1px solid rgba(47, 135, 223, 0.7);
}
}

.search-bar i.search-icon {
Expand All @@ -1313,3 +1371,46 @@ div.alert > em.javascript-required {
outline: none;
padding: .5em 0 .5em 0;
}

/* CSS for 'figure' full-screen display */

/* Define styles for full-screen overlay */
.figure-fullscreen-overlay {
position: fixed;
inset: 0;
z-index: 9999;
background-color: rgba(255, 255, 255, 0.95); /* White background with some transparency */
display: flex;
justify-content: center;
align-items: center;
padding: calc(5% + 20px);
box-sizing: border-box;
}

/* CSS class to scale the image when zoomed */
.figure-zoomed {
transform: scale(1.2);
}

/* Define styles for full-screen image */
.figure-fullscreen-img {
max-width: 100%;
max-height: 100%;
object-fit: contain; /* Maintain aspect ratio and fit within the container */
}

/* Define styles for close button */
.figure-close-button {
position: absolute;
top: 1%;
right: 2%;
cursor: pointer;
font-size: calc(5vw + 10px);
color: #333;
}

.code-sample > .copy-code-icon {
cursor: pointer;
text-align: right;
padding: 0.2rem;
}
2 changes: 1 addition & 1 deletion assets/scss/_skin.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$blue: #3371e3;
$blue: #326ce5;
$light-grey: #f7f7f7;
$dark-grey: #303030;
$medium-grey: #4c4c4c;
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/_variables_project.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Add styles or override variables from the theme here. */
@import "tablet";
@import "desktop";

$primary: #3371e3;
$primary: #326ce5;

// tooltip
$tooltip-bg: #555;
Expand Down
14 changes: 14 additions & 0 deletions content/bn/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# See the OWNERS docs at https://go.k8s.io/owners

# This is the localization project for Bengali.
# Teams and members are visible at https://github.com/orgs/kubernetes/teams.

reviewers:
- sig-docs-bn-reviews

approvers:
- sig-docs-bn-owners

labels:
- area/localization
- language/bn
1 change: 1 addition & 0 deletions content/bn/_common-resources/images/blocks.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit ccaaebf

Please sign in to comment.