From 611e7e835fa5dd1f8d782514782676f07635d0eb Mon Sep 17 00:00:00 2001
From: Jakob <72307968+jakob30061@users.noreply.github.com>
Date: Fri, 4 Aug 2023 13:03:00 +0200
Subject: [PATCH 1/3] Fix missing CSS variable for gitea 1.20 (#3)

gitea 1.20 did some changes to the navbar and header-wrapper.
This commit restores the default look of this theme for gitea 1.20

See: https://github.com/go-gitea/gitea/pull/25111

Reviewed-on: https://projects.blender.org/infrastructure/gitea-custom/pulls/3
---
 public/css/theme-bthree-dark.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/css/theme-bthree-dark.css b/public/css/theme-bthree-dark.css
index fdefc51..8b23800 100644
--- a/public/css/theme-bthree-dark.css
+++ b/public/css/theme-bthree-dark.css
@@ -168,6 +168,9 @@
 
   /* Navbar. */
   --color-navbar: hsl(213, 10%, 18%);
+  --color-nav-bg: hsl(213, 10%, 18%);
+  --color-nav-hover-bg: hsla(213, 18%, 90%, .05);
+  --color-header-wrapper: hsl(213, 10%, 18%);
   --color-navbar-transparent: hsla(213, 10%, 14%, 0);
   --color-header-bar: hsl(213, 10%, 18%);
 
-- 
2.30.2


From f2717d098bed7670c232fdafee5a608ce02842b3 Mon Sep 17 00:00:00 2001
From: Pablo Vazquez <pablo@blender.org>
Date: Fri, 4 Aug 2023 17:01:30 +0200
Subject: [PATCH 2/3] Navbar: style fixes for gitea 1.20

---
 public/css/theme-bthree-dark.css     | 24 ------------------------
 templates/custom/body_inner_pre.tmpl | 18 +++++++++++++++++-
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/public/css/theme-bthree-dark.css b/public/css/theme-bthree-dark.css
index 8b23800..b0fd819 100644
--- a/public/css/theme-bthree-dark.css
+++ b/public/css/theme-bthree-dark.css
@@ -296,34 +296,10 @@
   color: var(--color-label-text);
 }
 
-.following.bar #navbar {
-  min-height: 45px;
-}
-
-/* Align items (notifications, dropdown toggle) to the right. */
-.following.bar #navbar .brand {
-  justify-content: flex-end !important;
-}
-
 .ui.tabular.menu {
   border-color: var(--color-border);
 }
 
-/* Navbar logo. */
-.item.brand a {
-  opacity: .8;
-  transition: opacity var(--transition-speed) ease-in-out;
-}
-
-.item.brand a:hover {
-  opacity: 1;
-}
-
-.item.brand svg {
-  height: 21px;
-  color: #fff;
-}
-
 .ui.breadcrumb a {
   color: var(--color-text);
 }
diff --git a/templates/custom/body_inner_pre.tmpl b/templates/custom/body_inner_pre.tmpl
index 8e93b58..f4484d6 100644
--- a/templates/custom/body_inner_pre.tmpl
+++ b/templates/custom/body_inner_pre.tmpl
@@ -455,7 +455,7 @@
 </style>
 
 <style>
-  /* Custom styling for code.blender.org */
+  /* Custom styling for projects.blender.org */
   /* Make sure to start every line with ".nav-global"
    * so changes affect the developer navbar only. */
 
@@ -467,6 +467,22 @@
       max-width: 1170px;
     }
   }
+
+  /* Override Gitea's default navbar height. */
+  #navbar {
+    min-height: 46px;
+  }
+
+  /* Hide the site logo. */
+  #navbar .item:first-child {
+    display: none;
+  }
+
+  /* Fix alignment of text in dropdown items. */
+  .ui.dropdown>.text {
+    position: relative;
+    top: -2px;
+  }
 </style>
 
 <div class="nav-global">
-- 
2.30.2


From 20f9f505e3c0875c329c62de485962b7d0f0526c Mon Sep 17 00:00:00 2001
From: Dalai Felinto <dalai@blender.org>
Date: Thu, 24 Aug 2023 16:06:39 +0200
Subject: [PATCH 3/3] Bump release cycle to 4.0 bcon2

---
 templates/blender_components/card_releases.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/blender_components/card_releases.tmpl b/templates/blender_components/card_releases.tmpl
index c3f22ab..7fb6038 100644
--- a/templates/blender_components/card_releases.tmpl
+++ b/templates/blender_components/card_releases.tmpl
@@ -7,7 +7,7 @@
       <ul>
         <li>
           <a href="{{AppSubUrl}}/blender/blender/milestone/7">Blender 4.0</a>
-          — <strong>Bcon1</strong>: New features and changes
+          — <strong>Bcon2</strong>: Improve and stabilize
         </li>
         <li>
           <a href="{{AppSubUrl}}/blender/blender/milestone/5">Blender 3.6 LTS</a>
-- 
2.30.2