From 848b1307add77e0affbfec056f56a90b57f8bc09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Wed, 13 Jul 2022 00:58:16 +0200 Subject: [PATCH] Revert "add v100 about dialog" This reverts commit 1720a5e79bc2bc20b37960f4014a65ba5f5c5292. --- assets/patches.txt | 1 - patches/aboutLogos.patch | 17 ------ themes/browser/base/content/aboutDialog.css | 30 +--------- themes/browser/base/content/aboutDialog.js | 52 ------------------ themes/browser/base/content/aboutDialog.xhtml | 12 +--- themes/browser/base/content/aboutLogos/0.png | Bin 31030 -> 0 bytes themes/browser/base/content/aboutLogos/1.png | Bin 320913 -> 0 bytes themes/browser/base/content/aboutLogos/2.png | Bin 19804 -> 0 bytes themes/browser/base/content/aboutLogos/3.png | Bin 108203 -> 0 bytes themes/browser/base/content/aboutLogos/4.png | Bin 97950 -> 0 bytes themes/browser/base/content/aboutLogos/5.png | Bin 16991 -> 0 bytes themes/browser/base/content/aboutLogos/6.png | Bin 150542 -> 0 bytes .../base/content/aboutLogos/original.svg | 25 --------- 13 files changed, 6 insertions(+), 131 deletions(-) delete mode 100644 patches/aboutLogos.patch delete mode 100644 themes/browser/base/content/aboutLogos/0.png delete mode 100644 themes/browser/base/content/aboutLogos/1.png delete mode 100644 themes/browser/base/content/aboutLogos/2.png delete mode 100644 themes/browser/base/content/aboutLogos/3.png delete mode 100644 themes/browser/base/content/aboutLogos/4.png delete mode 100644 themes/browser/base/content/aboutLogos/5.png delete mode 100644 themes/browser/base/content/aboutLogos/6.png delete mode 100644 themes/browser/base/content/aboutLogos/original.svg diff --git a/assets/patches.txt b/assets/patches.txt index bb101f6..44aad6e 100644 --- a/assets/patches.txt +++ b/assets/patches.txt @@ -1,4 +1,3 @@ -patches/aboutLogos.patch patches/allow-ubo-private-mode.patch patches/bootstrap-without-vcs.patch patches/context-menu.patch diff --git a/patches/aboutLogos.patch b/patches/aboutLogos.patch deleted file mode 100644 index 6584e40..0000000 --- a/patches/aboutLogos.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/browser/base/jar.mn -+++ b/browser/base/jar.mn -@@ -97,6 +97,14 @@ browser.jar: - #endif - content/browser/webrtcIndicator.xhtml (content/webrtcIndicator.xhtml) - content/browser/webrtcIndicator.js (content/webrtcIndicator.js) -+ content/browser/aboutLogos/0.png (content/aboutLogos/0.png) -+ content/browser/aboutLogos/1.png (content/aboutLogos/1.png) -+ content/browser/aboutLogos/2.png (content/aboutLogos/2.png) -+ content/browser/aboutLogos/3.png (content/aboutLogos/3.png) -+ content/browser/aboutLogos/4.png (content/aboutLogos/4.png) -+ content/browser/aboutLogos/5.png (content/aboutLogos/5.png) -+ content/browser/aboutLogos/6.png (content/aboutLogos/6.png) -+ content/browser/aboutLogos/original.svg (content/aboutLogos/original.svg) - # the following files are browser-specific overrides - * content/browser/license.html (/toolkit/content/license.html) - % override chrome://global/content/license.html chrome://browser/content/license.html diff --git a/themes/browser/base/content/aboutDialog.css b/themes/browser/base/content/aboutDialog.css index 44b3ac4..d1138cd 100644 --- a/themes/browser/base/content/aboutDialog.css +++ b/themes/browser/base/content/aboutDialog.css @@ -17,38 +17,14 @@ } #left { - flex-shrink: 0.5; - margin: 25px; - display: flex; - flex-direction: column; - align-items: center; - font-size: 10px; - position: relative; -} - -#logoA, #logoB { width: 150px; + flex-shrink: 0.5; height: 150px; - margin-bottom: 10px; + margin: 25px; + background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNTYiIGhlaWdodD0iMjU2IiB2aWV3Qm94PSIwIDAgNjcuNzMzIDY3LjczMyI+PGcgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTQyLjEwNyAtMTUzLjg5OCkiPjxjaXJjbGUgY3g9Ijc1Ljk3MyIgY3k9IjE4Ny43NjUiIHI9IjMzLjg2NyIgZmlsbD0iIzAwYWNmZiIvPjxwYXRoIGQ9Ik03Mi41NDQgMjE0LjY3N2MtNC43NDQtLjYwOS05LjI4Mi0yLjUtMTMuMjQyLTUuNTE4LTEuMjkyLS45ODUtMy43MTUtMy40MjQtNC43NzMtNC44MDQtMi45NjMtMy44NjUtNC44MDUtOC4yNS01LjQxMi0xMi44ODctLjI2LTEuOTg0LS4yNi01LjYzMy4wMDMtNy40NDcgMS4zMDgtOS4wNjggNy4wMTQtMTYuODQ2IDE1LjIwOS0yMC43MyAzLjgxMS0xLjgwNiA3LjMtMi41NyAxMS43My0yLjU3IDcuMTY2IDAgMTMuNTI3IDIuNTY3IDE4LjY4MSA3LjU0IDIuNDgzIDIuMzk2IDQuMTQ4IDQuNjY4IDUuNTc0IDcuNjA3IDEuOTI5IDMuOTc1IDIuNzEgNy40MzMgMi43MSAxMS45OTUgMCA2LjAwNi0xLjczNSAxMS4yNDQtNS4zMzcgMTYuMTE3LTEuMDcgMS40NDgtMy4xNjIgMy42NDctNC41NSA0Ljc4NS0zLjgwNiAzLjEyLTguNjU4IDUuMjMyLTEzLjQ3MyA1Ljg2My0xLjY2My4yMTgtNS41OTMuMjQ1LTcuMTIuMDV6bTEwLjA0MS00Ljg2NWMyLjg5OC0uOTE0IDUuMjYtMi4xNDIgNy41NC0zLjkyIDEuMjEzLS45NDYgMy4zMDktMy4wNjIgNC4xODgtNC4yMjcgMi4zODMtMy4xNjIgNC4wMDQtNy4xMjIgNC40ODItMTAuOTQ2LjIzLTEuODQyLjA5Ni01LjczOC0uMjU1LTcuNDMtLjkzLTQuNDgtMi45MzItOC4yNjUtNi4wODYtMTEuNTAzLTEuOTY2LTIuMDItMy43NTctMy4zNS02LjA2LTQuNTA1LTMuNDk1LTEuNzUyLTYuNDktMi40Ni0xMC40MjQtMi40NjQtNC4xNjQtLjAwNC03LjgxNS45NS0xMS40MjkgMi45ODctMy4yOSAxLjg1NS02LjY5IDUuMjYtOC41NTMgOC41NjMtMS4zNzIgMi40MzMtMi4zNzYgNS4zMi0yLjc2NyA3Ljk2LS4yNTcgMS43My0uMjYyIDUuMTY0LS4wMSA2LjgyLjUwNCAzLjMxNiAxLjc2IDYuNTkyIDMuNTg0IDkuMzQuOTk1IDEuNS45NjQgMS40ODQgMS44NDIuOTgxIDEuNTctLjg5OCAxLjk4LTEuMzMzIDIuODM2LTMuMDEgMS0xLjk2IDIuMDctMy42NzMgMy4wMzctNC44NjMgMS4xMTYtMS4zNzMgMS4yNy0xLjYxOCAxLjgzLTIuOTE1LjI4LS42NTIuNzg2LTEuNjEgMS4xMjItMi4xM2wuNjExLS45NDItLjc5LS43NzdjLTEuMDUtMS4wMzItMS45MjMtMi4yMDEtMi4wODctMi43OTYtLjE2OC0uNjA4LjAzLS45NDcuODE4LTEuNDAyLjc5OC0uNDYxIDEuMzY4LS41OTMgMy41LS44MTIgMS4wMzctLjEwNyAyLjE2My0uMzAyIDIuNTE4LS40MzcuMzUzLS4xMzQgMS40MDgtLjcwOCAyLjM0NC0xLjI3NiAyLjcwMy0xLjYzOSAyLjkzMi0xLjcyMyA0LjU1Mi0xLjY4OCAxLjM2OS4wMyAxLjM3MS4wMjkgMi4xODMtLjQ2MiAxLjctMS4wMjggNC4xNDMtMi44ODMgNy4zNTctNS41ODcuNjE2LS41MTkgMS4yMS0uOTI2IDEuMzItLjkwNS40NTQuMDg4IDEuMjg5IDIuMTM3IDEuNDE2IDMuNDc2LjA3Ny44MTItLjA4IDEuNjE1LS41NjIgMi44NzMtLjEzMi4zNDMtLjE5Mi42Ny0uMTM1LjcyNy4xMzguMTM3LjYxLS40NTMuNjEtLjc2MyAwLS4zOTQuMjYyLS40MzkuNjE3LS4xMDYuMjU4LjI0Mi40ODEuMzEyIDEgLjMxMi41NjcgMCAuNzA4LjA1Mi45My4zNDguMzc1LjUuNDYzIDEuODY2LjE3NSAyLjczMi0uMjguODQyLTEuMTI1IDEuODEzLTEuODkyIDIuMTczLS42ODYuMzIzLTIuMDc1IDEuNjgtMi43MjYgMi42NjJhMzEuNjQgMzEuNjQgMCAwMC0xLjAzNyAxLjc0MmMtLjMyMS41ODItLjg2IDEuNDYxLTEuMTk4IDEuOTU0LS42NjQuOTctMS4yMzMgMi4zMjMtMS43ODIgNC4yMzgtLjMyMyAxLjEyNi0uMzUgMS40MTktLjM2MyAzLjkyOC0uMDE2IDMuMDMyLS4xNzMgMy43NzYtLjk5MyA0LjcxLS45MzEgMS4wNi0xLjg2MiAzLjM5MS0xLjk0IDQuODYtLjA1LjkyOC0uMTkyIDEuODMyLS4zOTUgMi41MDItLjA5LjI5NS4wNzcuMjkxIDEuMDcyLS4wMjJ6IiBmaWxsPSIjZmZmIi8+PHBhdGggZD0iTTc3LjA2MiAxODEuNjU0bDEuMjIyLTEuNTY1IDEuOTY2LS4yNzUtMS4yMjIgMS41NjR6IiBmaWxsPSIjMDBhY2ZmIi8+PC9nPjwvc3ZnPg=="); background-size: contain; background-repeat: no-repeat; background-position: center; - transition: opacity 0.5s ease; -} - -#logoA { - position: absolute; - margin-bottom: -150px; -} - -#logoCreatorA, #logoCreatorB { - height: 10px; - transition: opacity 0.5s ease; -} - -#logoCreatorA { - position: absolute; - bottom: 0; } #right { diff --git a/themes/browser/base/content/aboutDialog.js b/themes/browser/base/content/aboutDialog.js index 56b5466..9b59bfc 100644 --- a/themes/browser/base/content/aboutDialog.js +++ b/themes/browser/base/content/aboutDialog.js @@ -99,58 +99,6 @@ async function init(aEvent) { }) } - const logos = [ - { - creator: "/u/NO8X71", - url: "https://old.reddit.com/r/LibreWolf/comments/u91scw/revised_alternate_icons_with_a_night_version/" - }, - { - creator: "/u/Lythrox", - url: "https://old.reddit.com/r/LibreWolf/comments/ub65m6/librewolf_netscape_tribute/" - }, - { - creator: "/u/rere_dnaw", - url: "https://old.reddit.com/r/LibreWolf/comments/rh28rq/new_logo_ideas/" - }, - { - creator: "/u/chunkyhairball", - url: "https://old.reddit.com/r/LibreWolf/comments/qk5jiv/i_like_cute_icons_so_ima_leave_this_here/" - }, - { - creator: "/u/diiscotheque", - url: "https://old.reddit.com/r/LibreWolf/comments/tb4i52/icon_update_2/" - }, - { - creator: "/u/Huginstog", - url: "https://old.reddit.com/r/LibreWolf/comments/u5yi3d/fluffier_cuddlier_but_still_free_wild/" - }, - { - creator: "/u/diiscotheque", - url: "https://old.reddit.com/r/LibreWolf/comments/t9c84n/icon_update/" - }, - ] - - let i = Math.floor(Math.random() * 6); - - function newLogo() { - i += 1; - i = i % logos.length; - const a = i % 2 === 0 ? "A" : "B"; - const b = i % 2 === 1 ? "A" : "B"; - document.getElementById("logo" + a).style.backgroundImage = `url("chrome://browser/content/aboutLogos/${i}.png")`; - document.getElementById("logo" + a).style.opacity = 1; - document.getElementById("logo" + b).style.opacity = 0; - document.getElementById("logoCreator" + a).innerHTML = logos[i].creator - document.getElementById("logoCreator" + a).href = logos[i].url; - document.getElementById("logoCreator" + a).style.opacity = 1; - document.getElementById("logoCreator" + b).style.opacity = 0; - document.getElementById("logoCreator" + a).style.pointerEvents = "all"; - document.getElementById("logoCreator" + b).style.pointerEvents = "none"; - } - - newLogo(); - setInterval(newLogo, 7000); - window.sizeToContent(); if (AppConstants.platform == "macosx") { diff --git a/themes/browser/base/content/aboutDialog.xhtml b/themes/browser/base/content/aboutDialog.xhtml index 9ec4388..3c448c9 100644 --- a/themes/browser/base/content/aboutDialog.xhtml +++ b/themes/browser/base/content/aboutDialog.xhtml @@ -34,18 +34,12 @@