From 206304b5d7b0e50761615d37e1bb4c51153bcc1a Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Tue, 18 Feb 2025 09:49:02 +0000
Subject: [PATCH] Reformat other :not sections

---
 res/css/_common.pcss | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/res/css/_common.pcss b/res/css/_common.pcss
index 75180013f6..e3449f4bce 100644
--- a/res/css/_common.pcss
+++ b/res/css/_common.pcss
@@ -636,8 +636,12 @@ legend {
     button:not(
         .mx_Dialog_nonDialogButton,
         [class|="maplibregl"],
+<<<<<<< HEAD
         .mx_AccessibleButton,
         .mx_UserProfileSettings button,
+=======
+        .mx_AccessibleButton .mx_UserProfileSettings button,
+>>>>>>> 5ed4e100ca (Reformat other :not sections)
         .mx_ThemeChoicePanel_CustomTheme button,
         .mx_UnpinAllDialog button,
         .mx_ShareDialog button,
@@ -654,8 +658,12 @@ legend {
 .mx_Dialog_buttons
     button:not(
         .mx_Dialog_nonDialogButton,
+<<<<<<< HEAD
         .mx_AccessibleButton,
         .mx_UserProfileSettings button,
+=======
+        .mx_AccessibleButton .mx_UserProfileSettings button,
+>>>>>>> 5ed4e100ca (Reformat other :not sections)
         .mx_ThemeChoicePanel_CustomTheme button,
         .mx_UnpinAllDialog button,
         .mx_ShareDialog button,
@@ -673,8 +681,12 @@ legend {
 .mx_Dialog_buttons
     button.danger:not(
         .mx_Dialog_nonDialogButton,
+<<<<<<< HEAD
         .mx_AccessibleButton,
         .mx_UserProfileSettings button,
+=======
+        .mx_AccessibleButton .mx_UserProfileSettings button,
+>>>>>>> 5ed4e100ca (Reformat other :not sections)
         .mx_ThemeChoicePanel_CustomTheme button,
         .mx_UnpinAllDialog button,
         .mx_ShareDialog button,
@@ -696,8 +708,12 @@ legend {
     button:not(
         .mx_Dialog_nonDialogButton,
         [class|="maplibregl"],
+<<<<<<< HEAD
         .mx_AccessibleButton,
         .mx_UserProfileSettings button,
+=======
+        .mx_AccessibleButton .mx_UserProfileSettings button,
+>>>>>>> 5ed4e100ca (Reformat other :not sections)
         .mx_ThemeChoicePanel_CustomTheme button,
         .mx_UnpinAllDialog button,
         .mx_ShareDialog button,