From e3302a43776a2309e763984fab9920deb51960e6 Mon Sep 17 00:00:00 2001
From: Adrien Maston <adrien@37signals.com>
Date: Wed, 17 Dec 2025 17:47:28 +0100
Subject: [PATCH 1/3] Use the correct css layers for Android and iOS

---
 app/assets/stylesheets/android.css | 2 +-
 app/assets/stylesheets/ios.css     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/android.css b/app/assets/stylesheets/android.css
index 4707c2cd0..aab43d79b 100644
--- a/app/assets/stylesheets/android.css
+++ b/app/assets/stylesheets/android.css
@@ -1,4 +1,4 @@
-@layer native {
+@layer android {
   [data-platform~=android] {
     .hide-on-android {
       display: none;
diff --git a/app/assets/stylesheets/ios.css b/app/assets/stylesheets/ios.css
index 93c67022d..c5dfc50be 100644
--- a/app/assets/stylesheets/ios.css
+++ b/app/assets/stylesheets/ios.css
@@ -1,4 +1,4 @@
-@layer native {
+@layer ios {
   [data-platform~=ios] {
     .hide-on-ios {
       display: none;

From 190d310108acb0a1f9552e32db0cf6fd4d568733 Mon Sep 17 00:00:00 2001
From: Adrien Maston <adrien@37signals.com>
Date: Wed, 17 Dec 2025 18:58:43 +0100
Subject: [PATCH 2/3] Change how show-on-native works

---
 app/assets/stylesheets/native.css    | 4 ----
 app/assets/stylesheets/utilities.css | 4 +++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/native.css b/app/assets/stylesheets/native.css
index f97174954..f7b059c0c 100644
--- a/app/assets/stylesheets/native.css
+++ b/app/assets/stylesheets/native.css
@@ -9,9 +9,5 @@
     .hide-on-native {
       display: none;
     }
-
-    .show-on-native {
-      display: unset;
-    }
   }
 }
diff --git a/app/assets/stylesheets/utilities.css b/app/assets/stylesheets/utilities.css
index 22e72a9eb..e252d8981 100644
--- a/app/assets/stylesheets/utilities.css
+++ b/app/assets/stylesheets/utilities.css
@@ -270,7 +270,9 @@
   }
 
   .show-on-native {
-    display: none;
+    body:not([data-platform~=native]) & {
+      display: none;
+    }
   }
 
   .hide-scrollbar {

From 389b817bb4ffaa9af282b471b81f46c7be95231f Mon Sep 17 00:00:00 2001
From: Adrien Maston <adrien@37signals.com>
Date: Thu, 18 Dec 2025 08:31:15 +0100
Subject: [PATCH 3/3] Replace android and ios css layers with platform layer

---
 app/assets/stylesheets/_global.css | 2 +-
 app/assets/stylesheets/android.css | 2 +-
 app/assets/stylesheets/ios.css     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/_global.css b/app/assets/stylesheets/_global.css
index 05c92341a..30e5da88a 100644
--- a/app/assets/stylesheets/_global.css
+++ b/app/assets/stylesheets/_global.css
@@ -1,4 +1,4 @@
-@layer reset, base, components, modules, utilities, native, android, ios;
+@layer reset, base, components, modules, utilities, native, platform;
 
 :root {
   /* Spacing */
diff --git a/app/assets/stylesheets/android.css b/app/assets/stylesheets/android.css
index aab43d79b..f30158e8e 100644
--- a/app/assets/stylesheets/android.css
+++ b/app/assets/stylesheets/android.css
@@ -1,4 +1,4 @@
-@layer android {
+@layer platform {
   [data-platform~=android] {
     .hide-on-android {
       display: none;
diff --git a/app/assets/stylesheets/ios.css b/app/assets/stylesheets/ios.css
index c5dfc50be..3a05e5956 100644
--- a/app/assets/stylesheets/ios.css
+++ b/app/assets/stylesheets/ios.css
@@ -1,4 +1,4 @@
-@layer ios {
+@layer platform {
   [data-platform~=ios] {
     .hide-on-ios {
       display: none;