From 517a85a89b69327d9403e02784979395e17fb845 Mon Sep 17 00:00:00 2001
From: Conrad Chan <conradchan@box.com>
Date: Fri, 28 Aug 2020 11:25:08 -0700
Subject: [PATCH 1/3] feat(doc): Updated text selection color

---
 src/lib/viewers/doc/DocFindBar.scss | 25 ++++++++++---------------
 src/lib/viewers/doc/_docBase.scss   |  5 +++--
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/lib/viewers/doc/DocFindBar.scss b/src/lib/viewers/doc/DocFindBar.scss
index 645236891..7bec55a13 100644
--- a/src/lib/viewers/doc/DocFindBar.scss
+++ b/src/lib/viewers/doc/DocFindBar.scss
@@ -1,6 +1,5 @@
-$medium-aquamarine: #5aeda8 !default;
-$moon-yellow: #ffba1a !default;
-$blue: #00f !default;
+$pdfjs-highlight: #b400aa !default;
+$pdfjs-highlight-selected: #006400 !default;
 
 .bp-find-bar {
     $bdlGray10: #e8e8e8;
@@ -122,19 +121,15 @@ $blue: #00f !default;
     }
 }
 
-.textLayer {
-    opacity: 1;
+.bp-doc {
+    .textLayer {
+        .highlight {
+            display: inline-block;
+            background-color: fade-out($pdfjs-highlight, .8);
 
-    .highlight {
-        background-color: fade-out($moon-yellow, .5);
-        border-radius: 0;
-
-        &.selected {
-            background-color: fade-out($medium-aquamarine, .5);
+            &.selected {
+                background-color: fade-out($pdfjs-highlight-selected, .8);
+            }
         }
     }
-
-    ::selection {
-        background-color: fade-out($blue, .8);
-    }
 }
diff --git a/src/lib/viewers/doc/_docBase.scss b/src/lib/viewers/doc/_docBase.scss
index 52f0096a4..29456fc5d 100644
--- a/src/lib/viewers/doc/_docBase.scss
+++ b/src/lib/viewers/doc/_docBase.scss
@@ -252,14 +252,15 @@ $thumbnail-sidebar-width: 226px;
     .textLayer {
         top: 15px; // Match 15px padding top on page
         bottom: auto;
+        opacity: 1;
 
         // Only allow text divs to be selected
         > div {
             user-select: text;
         }
 
-        .highlight {
-            display: inline-block;
+        ::selection {
+            background-color: fade-out($box-blue, .9);
         }
     }
 

From 7ae6fa987eb14a8c3ea2105644760dbe44e5589c Mon Sep 17 00:00:00 2001
From: Conrad Chan <conradchan@box.com>
Date: Fri, 28 Aug 2020 15:39:47 -0700
Subject: [PATCH 2/3] chore: address pr comments

---
 src/lib/viewers/doc/_docBase.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/lib/viewers/doc/_docBase.scss b/src/lib/viewers/doc/_docBase.scss
index 29456fc5d..22e23c423 100644
--- a/src/lib/viewers/doc/_docBase.scss
+++ b/src/lib/viewers/doc/_docBase.scss
@@ -259,6 +259,10 @@ $thumbnail-sidebar-width: 226px;
             user-select: text;
         }
 
+        .highlight {
+            display: inline-block;
+        }
+
         ::selection {
             background-color: fade-out($box-blue, .9);
         }

From f67b72a34e6ecbbffeb64908cb513b7a6ae73465 Mon Sep 17 00:00:00 2001
From: Conrad Chan <conradchan@box.com>
Date: Fri, 28 Aug 2020 16:50:15 -0700
Subject: [PATCH 3/3] chore: move pdfjs overrides to docBase

---
 src/lib/viewers/doc/DocFindBar.scss | 16 ----------------
 src/lib/viewers/doc/_docBase.scss   |  7 +++++++
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/lib/viewers/doc/DocFindBar.scss b/src/lib/viewers/doc/DocFindBar.scss
index 7bec55a13..e37c2059a 100644
--- a/src/lib/viewers/doc/DocFindBar.scss
+++ b/src/lib/viewers/doc/DocFindBar.scss
@@ -1,6 +1,3 @@
-$pdfjs-highlight: #b400aa !default;
-$pdfjs-highlight-selected: #006400 !default;
-
 .bp-find-bar {
     $bdlGray10: #e8e8e8;
 
@@ -120,16 +117,3 @@ $pdfjs-highlight-selected: #006400 !default;
         display: flex;
     }
 }
-
-.bp-doc {
-    .textLayer {
-        .highlight {
-            display: inline-block;
-            background-color: fade-out($pdfjs-highlight, .8);
-
-            &.selected {
-                background-color: fade-out($pdfjs-highlight-selected, .8);
-            }
-        }
-    }
-}
diff --git a/src/lib/viewers/doc/_docBase.scss b/src/lib/viewers/doc/_docBase.scss
index 22e23c423..aa3914187 100644
--- a/src/lib/viewers/doc/_docBase.scss
+++ b/src/lib/viewers/doc/_docBase.scss
@@ -1,5 +1,7 @@
 @import '../../boxuiVariables';
 
+$pdfjs-highlight: #b400aa !default;
+$pdfjs-highlight-selected: #006400 !default;
 $thumbnail-border-radius: 3px;
 // Accounts for the 1px border on the right so the remaining width is actually 225
 $thumbnail-sidebar-width: 226px;
@@ -261,6 +263,11 @@ $thumbnail-sidebar-width: 226px;
 
         .highlight {
             display: inline-block;
+            background-color: fade-out($pdfjs-highlight, .8);
+
+            &.selected {
+                background-color: fade-out($pdfjs-highlight-selected, .8);
+            }
         }
 
         ::selection {