Merge pull request #3971 from raspberrypi/develop

Roll out latest changes to production
raspberrypi · Dec 12, 2024 · 51b3a97 · 51b3a97
2 parents cb192a1 + 75f17e9
commit 51b3a97
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/documentation/asciidoc/computers/raspberry-pi/boot-nvme.adoc b/documentation/asciidoc/computers/raspberry-pi/boot-nvme.adoc
@@ -1,6 +1,6 @@
 == NVMe SSD boot
 
-NVMe (Non-Volatile Memory express) is a standard for external storage access over a PCIe bus. You can connect NVMe drives via the PCIe slot on a IO Boards since Compute Module 4 and or Raspberry Pi 5 using an M.2 HAT+. With some additional configuration, you can boot from an NVMe drive.
+NVMe (Non-Volatile Memory express) is a standard for external storage access over a PCIe bus. You can connect NVMe drives via the PCIe slot on Compute Module 4 IO Board, the M.2 slot on Compute Module 5 IO Board, and Raspberry Pi 5 using an M.2 HAT+. With some additional configuration, you can boot from an NVMe drive.
 
 === Prerequisites
 

diff --git a/documentation/asciidoc/computers/raspberry-pi/introduction.adoc b/documentation/asciidoc/computers/raspberry-pi/introduction.adoc
@@ -158,7 +158,7 @@ a|
 * 2.4/5GHz dual-band 802.11ac Wi-Fi (120Mb/s)
 * Bluetooth 5, Bluetooth Low Energy (BLE)
 * microSD card slot
-* USB-C power (5V, 3A (15W))
+* USB-C power (5V 3A (15W))
 ^.^a|
 .Raspberry Pi 5
 image::images/5.jpg[alt="Raspberry Pi 5"]
@@ -206,7 +206,7 @@ a|
 * 2.4/5GHz dual-band 802.11ac Wi-Fi (120Mb/s)
 * Bluetooth 5, Bluetooth Low Energy (BLE)
 * microSD card slot
-* USB-C power (5V, 3A (15W))
+* USB-C power (5V 3A (15W))
 ^.^a|
 .Raspberry Pi 500
 image::images/500.png[alt="Raspberry Pi 500"]

diff --git a/jekyll-assets/scripts/theme.js b/jekyll-assets/scripts/theme.js
@@ -6,11 +6,11 @@ function toggleTheme() {
   var theme = localStorage.getItem('theme');
   // if the theme has never been set, or is light, set the theme to the dark symbol in local storage to change it
   if (localStorage.getItem('theme') !== null && theme == '🌝' ) {
-    if (document.cookie.indexOf("cookiebanner_accepted") != -1) {
+    if (cookiePermission != -1) {
       localStorage.setItem('theme', '🌚');
     }
   } else {
-    if (document.cookie.indexOf("cookiebanner_accepted") != -1) {
+    if (cookiePermission != -1) {
       // otherwise, the theme is currently set to dark, so set the theme to the light symbol in local storage to change it
       localStorage.setItem('theme', '🌝');
     }
@@ -25,17 +25,14 @@ function toggleTheme() {
 // from the site's perspective, we default to a dark theme, but toggle it to a light theme on load if the user doesn't ask for dark.
 // why do this? To prevent an annoying light 'flash' for dark theme users. light theme users don't really notice or care if there's a dark anti-flash.
 function initTheme() {
-  var cookiePermission = document.cookie.indexOf("cookiebanner_accepted");
-  if (document.cookie.indexOf("cookiebanner_accepted") != -1) {
-    // fetch the theme from local storage (if it exists)
-    var theme = localStorage.getItem('theme');
-    // if the theme has been set to light (null check to short circuit if not set)
-    if(theme !== null && theme === '🌝'
-      // if we can use matchMedia and the browser supports the dark color scheme
-      || (window.matchMedia && !window.matchMedia('(prefers-color-scheme: dark)').matches)
-      && theme !== '🌚') {
-        // toggles the theme from the default dark mode to the light version (which actually _shows_ by default to many users)
-        document.body.classList.toggle('light');
-    }
+  // fetch the theme from local storage (if it exists)
+  var theme = localStorage.getItem('theme');
+  // if the theme has been set to light (null check to short circuit if not set)
+  if(theme !== null && theme === '🌝'
+    // if we can use matchMedia and the browser supports the dark color scheme
+    || (window.matchMedia && !window.matchMedia('(prefers-color-scheme: dark)').matches)
+    && theme !== '🌚') {
+      // toggles the theme from the default dark mode to the light version (which actually _shows_ by default to many users)
+      document.body.classList.toggle('light');
   }
 }