resolve conflicts

knative · Jul 8, 2024 · 93f888d · 93f888d
2 parents f2204e4 + bfde83f
commit 93f888d
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 28 deletions.
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
@@ -49,6 +49,9 @@ aliases:
   - lkingland
   - salaboy
   knative-admin:
+  - Cali0707
+  - Leo6Leo
+  - ReToCode
   - aliok
   - cardil
   - davidhadas
@@ -63,8 +66,14 @@ aliases:
   - nainaz
   - psschwei
   - salaboy
+  - skonto
   - upodroid
-  knative-release-leads: []
+  knative-release-leads:
+  - Cali0707
+  - Leo6Leo
+  - ReToCode
+  - dsimansk
+  - skonto
   knative-robots:
   - knative-automation
   - knative-prow-releaser-robot

diff --git a/code-samples/eventing/bookstore-sample-app/solution/node-server/package-lock.json b/code-samples/eventing/bookstore-sample-app/solution/node-server/package-lock.json
diff --git a/code-samples/serving/cloudevents/cloudevents-nodejs/package-lock.json b/code-samples/serving/cloudevents/cloudevents-nodejs/package-lock.json
diff --git a/docs/stylesheets/extra.css b/docs/stylesheets/extra.css
@@ -1,8 +1,8 @@
 :root {
   --md-primary-fg-color: #f3f1f2;
-  --md-primary-fg-color--dark: #0865AD;
-  --md-primary-fg-color--light: #6695CA;
-  --nav-item-color: #4d4d4d;
+  --md-primary-fg-color--dark: #0D4984;
+  --md-primary-fg-color--light: #6593C8;
+  --nav-item-color: #494848;
 }
 
 .md-clipboard {

diff --git a/overrides/assets/stylesheets/home.css b/overrides/assets/stylesheets/home.css
@@ -94,12 +94,15 @@ body {
   font-size: large;
   padding: 0.525em 1em;
   min-width: fit-content;
+  border-radius:0.7rem;
+  margin-left: 0.5rem;
 }
 
 .home-container .md-button,
 .need-to-know-more-container .md-button {
   background-color: var(--md-primary-fg-color--light);
   border-color: var(--md-primary-fg-color--light);
+  border-radius: 0.7rem;
 }
 
 .home-container .md-button--primary {
@@ -114,7 +117,7 @@ h2.secondary-headline, h3.trusted-by {
 }
 
 .home-container h1 {
-  color: var(--md-primary-fg-color--dark);
+  color: black;
   margin-top: 1em;
   margin-bottom: 0;
 }
@@ -224,6 +227,7 @@ h2.secondary-headline, h3.trusted-by {
   font-weight: 600;
   margin: 0 auto 2rem;
   max-width: 75%;
+  color:var(--nav-item-color);
 }
 
 .why-serverless-container .md-typeset h1,
@@ -273,7 +277,7 @@ h2.secondary-headline, h3.trusted-by {
 
 /* knative components container css */
 .knative-components-container h1 {
-  color: #7dc47e;
+  color: white;
 }
 
 .knative-components-container .text-table .normal-text {
@@ -308,7 +312,7 @@ h2.secondary-headline, h3.trusted-by {
 }
 
 .trying-it-all-container .md-typeset h2 {
-  color: var(--md-primary-fg-color--dark);
+  color: black;
   line-height: 1;
   margin-bottom: 1rem;
 }
@@ -337,6 +341,7 @@ h2.secondary-headline, h3.trusted-by {
   background-color: var(--md-primary-fg-color--dark);
   color: white;
   margin-top: 1em;
+  border-radius: 0.7rem;
 }
 
 .trying-it-all-container .md-button.call-to-action:hover {
@@ -468,8 +473,8 @@ h2.secondary-headline, h3.trusted-by {
 
 .cncf-notice-container h3 {
   font-weight: bold;
-  color: var(--md-default-fg-color--light);
-  margin-top: 1rem;
+  color: var(--nav-item-color);
+  margin-top: 0;
 }
 
 .md-typeset img.cncf-logo {

diff --git a/overrides/home.html b/overrides/home.html
@@ -11,7 +11,7 @@ <h1 class="main-headline">
             solution to build Serverless and Event Driven Applications
           </h1>
           <p style="display: block">
-            <a href="{{ 'getting-started/' | url }}" class="md-button white md-button--primary">Try the tutorial</a>
+            <a href="{{ 'getting-started/tutorial' | url }}" class="md-button white md-button--primary">Try the tutorial</a>
             <a href="{{ 'install/' | url }}" class="md-button white">Install Knative on your cluster</a>
           </p>
           <div class="trusted-by-container">
@@ -415,4 +415,4 @@ <h2>Follow us</h2>
 <!-- Application footer -->
 {% block footer %}
 {% include "partials/footer.html" %}
-{% endblock %}
+{% endblock %}