From bf6e77a93af6d5d3d2a0ce2cf7a62b639dd11fd7 Mon Sep 17 00:00:00 2001
From: Hadi Charara <hadi.charara@protonmail.com>
Date: Sat, 1 Oct 2022 17:20:44 -0400
Subject: [PATCH] Fixed merge bugs

---
 src/assets/css/librarybrowser.scss    | 12 +++++++-----
 src/components/alphaPicker/style.scss |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/assets/css/librarybrowser.scss b/src/assets/css/librarybrowser.scss
index d304735c93..4452e09b96 100644
--- a/src/assets/css/librarybrowser.scss
+++ b/src/assets/css/librarybrowser.scss
@@ -801,14 +801,16 @@
         display: block;
     }
 
-    .layout-desktop &,
-    .layout-tv & {
-        [dir="ltr"] & {
+    [dir="ltr"] & {
+        .layout-desktop &,
+        .layout-tv & {
             padding-left: 32.45vw;
-
         }
+    }
 
-        [dir="rtl"] & {
+    [dir="rtl"] & {
+        .layout-desktop &,
+        .layout-tv & {
             padding-right: 32.45vw;
         }
     }
diff --git a/src/components/alphaPicker/style.scss b/src/components/alphaPicker/style.scss
index 4144e75210..a764937165 100644
--- a/src/components/alphaPicker/style.scss
+++ b/src/components/alphaPicker/style.scss
@@ -117,7 +117,7 @@
 
     [dir="rtl"] & {
         left: 0.4em;
-        left: max(env(safe-area-inset-right), 0.4em)
+        left: max(env(safe-area-inset-left), 0.4em)
     }
 }
 
@@ -130,7 +130,7 @@
 
         [dir="rtl"] & {
             left: 1em;
-            left: max(env(safe-area-inset-right), 1em);
+            left: max(env(safe-area-inset-left), 1em);
         }
     }
 }