From 621adff9fcad7e3385c68659c61e23a11b9f560c Mon Sep 17 00:00:00 2001
From: alistair3149 <alistair31494322@gmail.com>
Date: Tue, 28 May 2024 02:12:50 -0400
Subject: [PATCH] =?UTF-8?q?fix(core):=20=F0=9F=90=9B=20incorrect=20classes?=
 =?UTF-8?q?=20and=20styles=20for=20page=20action=20cards?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Pagetools.less                  | 18 ++++--------------
 templates/PageTools.mustache                   |  2 +-
 templates/PageTools__languages.mustache        |  2 +-
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/resources/skins.citizen.styles/components/Pagetools.less b/resources/skins.citizen.styles/components/Pagetools.less
index 81ea1107..ce566d1b 100644
--- a/resources/skins.citizen.styles/components/Pagetools.less
+++ b/resources/skins.citizen.styles/components/Pagetools.less
@@ -33,7 +33,7 @@
 		}
 	}
 
-	&__card {
+	.citizen-menu__card {
 		position: absolute;
 		top: 100%;
 		right: ~'calc( var( --space-xs ) * -1 )'; // counteract margin
@@ -206,15 +206,6 @@
 	}
 }
 
-// Checkbox hack
-#citizen-languages {
-	&__checkbox:checked {
-		~ .page-actions__card {
-			.citizen-card-show();
-		}
-	}
-}
-
 // To avoid more menu from overflow in narrow screen
 @media ( max-width: @max-width-breakpoint-tablet ) {
 	.page-actions {
@@ -240,7 +231,7 @@
 			transition-property: opacity, transform;
 		}
 
-		:not( .page-actions__card ) .mw-list-item {
+		:not( .citizen-menu__card ) .mw-list-item {
 			--size-icon: 1rem;
 		}
 
@@ -252,10 +243,9 @@
 			position: unset;
 		}
 
-		&__card {
+		.citizen-menu__card {
 			top: unset;
 			bottom: 100%;
-			.citizen-card-hide( bottom right );
 		}
 	}
 }
@@ -269,7 +259,7 @@
 			}
 		}
 
-		&__card {
+		.citizen-menu__card {
 			// Expand the width on narrow screens might overflow the page
 			white-space: nowrap;
 		}
diff --git a/templates/PageTools.mustache b/templates/PageTools.mustache
index c8b873f4..d9b0eef8 100644
--- a/templates/PageTools.mustache
+++ b/templates/PageTools.mustache
@@ -29,7 +29,7 @@
 			<span class="citizen-ui-icon mw-ui-icon-wikimedia-ellipsis"></span>
 			<span>{{msg-citizen-actions-more-toggle}}</span>
 		</label>
-		<aside id="page-actions-more__card" class="page-actions__card citizen-menu__card citizen-menu-checkbox-target">
+		<aside id="page-actions-more__card" class="citizen-menu__card citizen-menu-checkbox-target">
 			{{#pagetools-visible}}
 				{{#data-portlets.data-actions}}{{>Menu}}{{/data-portlets.data-actions}}
 			{{/pagetools-visible}}
diff --git a/templates/PageTools__languages.mustache b/templates/PageTools__languages.mustache
index cf646f02..747f7af0 100644
--- a/templates/PageTools__languages.mustache
+++ b/templates/PageTools__languages.mustache
@@ -21,7 +21,7 @@
 		<span class="citizen-ui-icon mw-ui-icon-wikimedia-language"></span>
 		<span>{{msg-citizen-languages-toggle}}</span>
 	</label>
-	<aside id="citizen-languages__card" class="page-actions__card citizen-menu-checkbox-target">
+	<aside id="citizen-languages__card" class="citizen-menu__card citizen-menu-checkbox-target">
 		{{#data-portlets.data-languages}}{{>Menu}}{{/data-portlets.data-languages}}
 		{{#data-portlets.data-variants}}{{>Menu}}{{/data-portlets.data-variants}}
 	</aside>