Issue 3127 - Merge conflicts, base 42.0.1

mobile/android/base/resources/values/colors.xml

Index: mobile/android/base/resources/values/colors.xml
diff --git a/mobile/android/base/resources/values/colors.xml b/mobile/android/base/resources/values/colors.xml
index 9cc767dce18d3213d020bde1fbcbaad52446f0f7..f56111def3eee14b6bcf3f8793bd23f41fa5c3cf 100644
--- a/mobile/android/base/resources/values/colors.xml
+++ b/mobile/android/base/resources/values/colors.xml
@@ -5,7 +5,8 @@
 
 <resources>
   <!-- Fennec color palette (bug 1127517) -->
-  <color name="fennec_ui_orange">#FF9500</color>
+  <!-- Adblock Browser uses blue as orange -->
+  <color name="fennec_ui_orange">#009CD0</color>
   <color name="affirmative_green">#6FBE4A</color>
   <color name="rejection_red">#D23228</color>
   <color name="action_orange">#E66000</color>
@@ -16,18 +17,21 @@
 
   <color name="placeholder_active_grey">#222222</color>
   <color name="placeholder_grey">#777777</color>
-  <color name="private_toolbar_grey">#292C29</color>
-  <color name="text_and_tabs_tray_grey">#363B40</color>
-  <color name="tabs_tray_grey_pressed">#45494E</color>
+  <color name="private_toolbar_grey">#F8F8F8</color>
+  <color name="text_and_tabs_tray_grey">#F8F8F8</color>
+  <color name="tabs_tray_grey_pressed">#F8F8F8</color>
   <color name="toolbar_icon_grey">#5F6368</color>
 
   <color name="tabs_tray_icon_grey">#AFB1B3</color>
   <color name="disabled_grey">#BFBFBF</color>
-  <color name="toolbar_grey_pressed">#D7D7DC</color>
+  <color name="toolbar_grey_pressed">#F8F8F8</color>
   <color name="toolbar_menu_dark_grey">#E1E1E6</color>
-  <color name="toolbar_grey">#EBEBF0</color>
+  <color name="toolbar_grey">#F8F8F8</color>
   <color name="about_page_header_grey">#F5F5F5</color>
 
+  <!-- ABB custom colors -->
+  <color name="abb_thumbnail_row_text">#3B3B3B</color>
+
   <color name="url_bar_shadow_private">#7878A5</color>
 
   <!-- Restricted profiles palette -->
@@ -56,13 +60,13 @@
   <color name="new_tablet_highlight_focused">#C0C9D0</color>
 
   <!-- highlight on shaped button: 20% white over text_and_tabs_tray_grey -->
-  <color name="highlight_shaped">#FF696D71</color>
+  <color name="highlight_shaped">#FFF8F8F8</color>
 
   <!-- highlight-focused on shaped button: 10% white over text_and_tabs_tray_grey -->
   <color name="highlight_shaped_focused">#FF565B60</color>
 
   <!-- highlight on private nav button: 20% white over private_toolbar_grey -->
-  <color name="highlight_nav_pb">#FF545654</color>
+  <color name="highlight_nav_pb">#FFF8F8F8</color>
 
   <color name="dark_transparent_overlay">#99000000</color>