Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 0 insertions, 36 deletions

diff --git a/browser/themes/shared/tab-selected.svg b/browser/themes/shared/tab-selected.svg
deleted file mode 100644
index ca66d8116..000000000
--- a/browser/themes/shared/tab-selected.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" width="30px" height="31px" preserveAspectRatio="none">
-  <defs>
-    <style>
-%filter substitution
-%ifdef XP_MACOSX
-%include ../osx/shared.inc
-%elif defined(MOZ_WIDGET_GTK)
-%include ../linux/linuxShared.inc
-%else
-%include ../windows/windowsShared.inc
-%endif
-      #tab-background-fill {
-        background-color: @fgTabBackgroundColor@;
-        background-image: @fgTabTexture@;
-        background-repeat: no-repeat;
-        height: 100%;
-        width: 100%;
-      }
-%ifdef XP_WIN
-      @media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
-             (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
-        #tab-background-fill {
-          background-color: @customToolbarColor@;
-        }
-      }
-%endif
-    </style>
-%include ../../base/content/tab-shape.inc.svg
-  </defs>
-  <foreignObject width="30" height="31" clip-path="url(#tab-curve-clip-path-@TAB_SIDE@)">
-    <div id="tab-background-fill" xmlns="http://www.w3.org/1999/xhtml"></div>
-  </foreignObject>
-</svg>