Merge branch 'nightly' of https://github.com/dothq/browser-ff into ni…

…ghtly
dothq · Mar 17, 2021 · fbb4054 · fbb4054
2 parents f1c422d + 8de5b81
commit fbb4054
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/patches/browser-themes-shared-icons-bookmark-star-on-tray-svg.patch b/patches/browser-themes-shared-icons-bookmark-star-on-tray-svg.patch
@@ -3,11 +3,11 @@ index 3668174c6fde7c54b6ab3b29c87387dfb35826d3..9ef3ed8824b6530823975535434341ab
 --- a/browser/themes/shared/icons/bookmark-star-on-tray.svg
 +++ b/browser/themes/shared/icons/bookmark-star-on-tray.svg
 @@ -1,6 +1,4 @@
--<!-- 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" width="16" height="16" viewBox="0 0 16 16">
--  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M14 16H2a1 1 0 0 1-1-1v-2a1 1 0 0 1 2 0v1h10v-1a1 1 0 0 1 2 0v2a1 1 0 0 1-1 1zM13.961 4.282a.9.9 0 0 0-.723-.609l-3.063-.445L8.805.456a.934.934 0 0 0-1.605 0L5.83 3.228l-3.063.445A.893.893 0 0 0 2.27 5.2l2.217 2.156-.523 3.044a.894.894 0 0 0 1.3.942L8 9.907l2.74 1.439a.888.888 0 0 0 .416.1.9.9 0 0 0 .526-.172.893.893 0 0 0 .355-.874l-.522-3.047 2.22-2.153a.893.893 0 0 0 .226-.918zm-4.367 2.45l.376 2.189L8 7.888 6.035 8.921l.376-2.189-1.592-1.55 2.2-.319L8 2.872l.983 1.991 2.2.319z"/>
+-<!-- 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" width="16" height="16" viewBox="0 0 16 16">
+-  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M14 16H2a1 1 0 0 1-1-1v-2a1 1 0 0 1 2 0v1h10v-1a1 1 0 0 1 2 0v2a1 1 0 0 1-1 1zM13.961 4.282a.9.9 0 0 0-.723-.609l-3.063-.445L8.805.456a.934.934 0 0 0-1.605 0L5.83 3.228l-3.063.445A.893.893 0 0 0 2.27 5.2l2.217 2.156-.523 3.044a.894.894 0 0 0 1.3.942L8 9.907l2.74 1.439a.888.888 0 0 0 .416.1.9.9 0 0 0 .526-.172.893.893 0 0 0 .355-.874l-.522-3.047 2.22-2.153a.893.893 0 0 0 .226-.918zm-4.367 2.45l.376 2.189L8 7.888 6.035 8.921l.376-2.189-1.592-1.55 2.2-.319L8 2.872l.983 1.991 2.2.319z"/>
 -</svg>
 \ No newline at end of file
 +<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">

diff --git a/patches/browser-themes-shared-icons-restore-session-svg.patch b/patches/browser-themes-shared-icons-restore-session-svg.patch
@@ -3,12 +3,12 @@ index 3852101fcbbec93f002f1c5cdae3c018f9172d57..6b5ad3d5f933b0680fdf7758bf38119f
 --- a/browser/themes/shared/icons/restore-session.svg
 +++ b/browser/themes/shared/icons/restore-session.svg
 @@ -1,6 +1,10 @@
--<!-- 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" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity">
--  <path d="M13 0H3a3 3 0 0 0-3 3v8a3 3 0 0 0 3 3h4l-.3.4a1 1 0 1 0 1.6 1.2l1.5-2a1 1 0 0 0 0-1.2l-1.5-2a1 1 0 0 0-1.6 1.2l.3.4H3a1 1 0 0 1-1-1V5h12v6a1 1 0 0 1-1 1 1 1 0 0 0 0 2 3 3 0 0 0 3-3V3a3 3 0 0 0-3-3zM2 4V3a1 1 0 0 1 1-1h10a1 1 0 0 1 1 1v1z"/>
--</svg>
+-<!-- 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" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity">
+-  <path d="M13 0H3a3 3 0 0 0-3 3v8a3 3 0 0 0 3 3h4l-.3.4a1 1 0 1 0 1.6 1.2l1.5-2a1 1 0 0 0 0-1.2l-1.5-2a1 1 0 0 0-1.6 1.2l.3.4H3a1 1 0 0 1-1-1V5h12v6a1 1 0 0 1-1 1 1 1 0 0 0 0 2 3 3 0 0 0 3-3V3a3 3 0 0 0-3-3zM2 4V3a1 1 0 0 1 1-1h10a1 1 0 0 1 1 1v1z"/>
+-</svg>
 +<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
 +<g clip-path="url(#clip0)">
 +<path fill="context-fill" fill-opacity="context-fill-opacity" fill-rule="evenodd" clip-rule="evenodd" d="M2 6V11C2 11.5523 2.44772 12 3 12H8.77267L8.21967 11.3967C7.92678 11.0772 7.92678 10.5592 8.21967 10.2396C8.51256 9.92012 8.98744 9.92012 9.28033 10.2396L11.2803 12.4215C11.421 12.5749 11.5 12.783 11.5 13C11.5 13.217 11.421 13.4251 11.2803 13.5785L9.28033 15.7604C8.98744 16.0799 8.51256 16.0799 8.21967 15.7604C7.92678 15.4408 7.92678 14.9228 8.21967 14.6033L8.77267 14H3C1.34315 14 0 12.6569 0 11V3C0 1.34315 1.34315 0 3 0H13C14.6569 0 16 1.34315 16 3V7C16 7.55228 15.5523 8 15 8C14.4477 8 14 7.55228 14 7V6H2ZM13 2H3C2.44772 2 2 2.44772 2 3V4H14V3C14 2.44772 13.5523 2 13 2Z" />

diff --git a/patches/browser-themes-shared-reader-readerMode-svg.patch b/patches/browser-themes-shared-reader-readerMode-svg.patch
@@ -3,12 +3,12 @@ index 0eb317a1b63eb5ec86f6b0b9f574f9ce98a35ae4..9c68e2bdb6cc415b08cf76c96b30121c
 --- a/browser/themes/shared/reader/readerMode.svg
 +++ b/browser/themes/shared/reader/readerMode.svg
 @@ -1,6 +1,6 @@
--<!-- 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" width="16" height="16">
--  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M13 0H3a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm0 13a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V3a1 1 0 0 1 1-1h8a1 1 0 0 1 1 1zm-2.5-9h-5a.5.5 0 0 0 0 1h5a.5.5 0 0 0 0-1zm0 2h-5a.5.5 0 0 0 0 1h5a.5.5 0 1 0 0-1zm0 2h-5a.5.5 0 0 0 0 1h5a.5.5 0 1 0 0-1zm-3 2h-2a.5.5 0 0 0 0 1h2a.5.5 0 1 0 0-1z"/>
--</svg>
+-<!-- 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" width="16" height="16">
+-  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M13 0H3a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm0 13a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V3a1 1 0 0 1 1-1h8a1 1 0 0 1 1 1zm-2.5-9h-5a.5.5 0 0 0 0 1h5a.5.5 0 0 0 0-1zm0 2h-5a.5.5 0 0 0 0 1h5a.5.5 0 1 0 0-1zm0 2h-5a.5.5 0 0 0 0 1h5a.5.5 0 1 0 0-1zm-3 2h-2a.5.5 0 0 0 0 1h2a.5.5 0 1 0 0-1z"/>
+-</svg>
 +<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
 +<path fill="context-fill" fill-opacity="context-fill-opacity" fill-rule="evenodd" clip-rule="evenodd" d="M12 2H4C3.44772 2 3 2.44772 3 3V13C3 13.5523 3.44772 14 4 14H12C12.5523 14 13 13.5523 13 13V3C13 2.44772 12.5523 2 12 2ZM4 0C2.34315 0 1 1.34315 1 3V13C1 14.6569 2.34315 16 4 16H12C13.6569 16 15 14.6569 15 13V3C15 1.34315 13.6569 0 12 0H4Z" />
 +<path fill="context-fill" fill-opacity="context-fill-opacity" d="M5 11C5 10.4477 5.44772 10 6 10H7C7.55228 10 8 10.4477 8 11C8 11.5523 7.55228 12 7 12H6C5.44772 12 5 11.5523 5 11Z" />