From ef68be35d487821dc1082304543f7e0e12c23aca Mon Sep 17 00:00:00 2001
From: Bhagyarsh Dhumal <bhagyarsh@gmail.com>
Date: Sat, 16 Dec 2023 22:56:35 +0530
Subject: [PATCH 1/2] Fixed #1435 -- hamburger tab key focus issue fixed

---
 djangoproject/scss/_dark-mode.scss           | 1 -
 djangoproject/scss/_style.scss               | 6 ++++--
 djangoproject/templates/includes/header.html | 8 +++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/djangoproject/scss/_dark-mode.scss b/djangoproject/scss/_dark-mode.scss
index 8ce0b24e4..9b48f131d 100644
--- a/djangoproject/scss/_dark-mode.scss
+++ b/djangoproject/scss/_dark-mode.scss
@@ -349,7 +349,6 @@ html[data-theme="light"] .theme-toggle .theme-label-when-light {
     line-height: 45px;
     text-align: center;
     margin: 4px 10px;
-    float: right;
 
     @include respond-min(768px) {
         display: none;
diff --git a/djangoproject/scss/_style.scss b/djangoproject/scss/_style.scss
index 08621d897..70ac5ad72 100644
--- a/djangoproject/scss/_style.scss
+++ b/djangoproject/scss/_style.scss
@@ -445,7 +445,10 @@ blockquote {
         }
     }
 }
-
+.right-action-icons{
+    float: right;
+    display: flex;
+}
 .container--flex {
     display: flex;
     align-items: center;
@@ -529,7 +532,6 @@ blockquote {
         color: var(--menu);
         cursor: pointer;
         display: block;
-        float: right;
         height: 45px;
         line-height: 48px;
         margin: 4px 10px;
diff --git a/djangoproject/templates/includes/header.html b/djangoproject/templates/includes/header.html
index 7a5cf5206..9c5a4064b 100644
--- a/djangoproject/templates/includes/header.html
+++ b/djangoproject/templates/includes/header.html
@@ -2,13 +2,15 @@
   <div class="container">
     <a class="logo" href="{% url 'homepage' %}">Django</a>
     <p class="meta">The web framework for perfectionists with deadlines.</p>
+    <div class="right-action-icons">
+    <div class="mobile-toggle">
+      {% include "includes/toggle_theme.html" %}
+    </div>
     <button class="menu-button">
       <i class="icon icon-reorder"></i>
       <span class="visuallyhidden">Menu</span>
     </button>
-    <div class="mobile-toggle">
-      {% include "includes/toggle_theme.html" %}
-    </div>
+  </div>
     <div role="navigation">
       <ul>
         <li{% if 'start' in request.path %} class="active"{% endif %}>

From 54ebc8df583ff1774fe74e7fc4e453caecfbf8b9 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Sat, 16 Dec 2023 17:35:07 +0000
Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 djangoproject/templates/includes/header.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/djangoproject/templates/includes/header.html b/djangoproject/templates/includes/header.html
index 9c5a4064b..3ab1f7e5b 100644
--- a/djangoproject/templates/includes/header.html
+++ b/djangoproject/templates/includes/header.html
@@ -3,14 +3,14 @@
     <a class="logo" href="{% url 'homepage' %}">Django</a>
     <p class="meta">The web framework for perfectionists with deadlines.</p>
     <div class="right-action-icons">
-    <div class="mobile-toggle">
-      {% include "includes/toggle_theme.html" %}
+      <div class="mobile-toggle">
+        {% include "includes/toggle_theme.html" %}
+      </div>
+      <button class="menu-button">
+        <i class="icon icon-reorder"></i>
+        <span class="visuallyhidden">Menu</span>
+      </button>
     </div>
-    <button class="menu-button">
-      <i class="icon icon-reorder"></i>
-      <span class="visuallyhidden">Menu</span>
-    </button>
-  </div>
     <div role="navigation">
       <ul>
         <li{% if 'start' in request.path %} class="active"{% endif %}>