Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
},
"javascript.updateImportsOnFileMove.enabled": "always",
"files.exclude": {
"**/node_modules": true
"**/node_modules": true,
"**/.gluon": true
},
"[html]": {
"editor.formatOnSave": false
Expand Down
4 changes: 2 additions & 2 deletions gluon.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"id": "uBlock0@raymondhill.net",
"repo": "gorhill/uBlock",
"version": "1.44.4",
"fileGlob": "uBlock0_*.firefox.xpi"
"fileGlob": "uBlock0_*.firefox(.signed)?.xpi"
},
"tabliss": {
"platform": "amo",
Expand Down Expand Up @@ -99,4 +99,4 @@
"licenseType": "MPL-2.0"
},
"updateHostname": "updates.pulsebrowser.app"
}
}
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"package": "gluon package",
"ff-version": "gluon ff-version",
"licenseCheck": "gluon license-check",
"gluon": "gluon"
"gluon": "gluon",
"reset": "gluon reset"
}
}
14 changes: 14 additions & 0 deletions src/browser/base/content/browser-menubar-inc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index f3134d5a9a01b7965eede5695def5afef4a66d6b..626fba18a7e9341731f6b71a98197695d63d7c6c 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -153,6 +153,9 @@
type="checkbox"
class="sync-ui-item"
oncommand="SidebarUI.toggle('viewTabsSidebar');" data-l10n-id="menu-view-synced-tabs-sidebar"/>
+ <menuitem id="menu_downloadsSidebar"
+ type="checkbox"
+ oncommand="SidebarUI.toggle('viewDownloadsSidebar');" data-l10n-id="navbar-downloads"/>
</menupopup>
</menu>
<menuseparator/>
28 changes: 19 additions & 9 deletions src/browser/base/content/browser-sidebar-js.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/browser/base/content/browser-sidebar.js b/browser/base/content/browser-sidebar.js
index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafcf1d66f5a 100644
index f09e37fc42f7754f7f3687884ead25124c1b2076..e1833bbfd8a8ed7da767349f886d554f3dd795f3 100644
--- a/browser/base/content/browser-sidebar.js
+++ b/browser/base/content/browser-sidebar.js
@@ -11,6 +11,10 @@ var SidebarUI = {
Expand Down Expand Up @@ -37,11 +37,21 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafc
}),
],
[
@@ -47,8 +54,27 @@ var SidebarUI = {
@@ -47,8 +54,37 @@ var SidebarUI = {
elementId: "sidebar-switcher-tabs",
url: "chrome://browser/content/syncedtabs/sidebar.xhtml",
menuId: "menu_tabsSidebar",
+ iconurl: "chrome://browser/skin/tab.svg",
+ }),
+ ],
+ [
+ "viewDownloadsSidebar",
+ makeSidebar({
+ elementId: "sidebar-switcher-downloads",
+ title: "Downloads",
+ url: "about:downloads",
+ menuId: "menu_downloadsSidebar",
+ iconurl: "chrome://browser/skin/downloads/downloads.svg"
}),
],
+ [
Expand All @@ -65,7 +75,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafc
]));
},

@@ -61,6 +87,8 @@ var SidebarUI = {
@@ -61,6 +97,8 @@ var SidebarUI = {
return (this._browser = document.getElementById("sidebar"));
},
POSITION_START_PREF: "sidebar.position_start",
Expand All @@ -74,7 +84,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafc
DEFAULT_SIDEBAR_ID: "viewBookmarksSidebar",

// lastOpenedId is set in show() but unlike currentID it's not cleared out on hide
@@ -78,6 +106,8 @@ var SidebarUI = {
@@ -78,6 +116,8 @@ var SidebarUI = {
},
_splitter: null,
_icon: null,
Expand All @@ -83,7 +93,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafc
_reversePositionButton: null,
_switcherPanel: null,
_switcherTarget: null,
@@ -110,10 +140,40 @@ var SidebarUI = {
@@ -110,10 +150,40 @@ var SidebarUI = {
this._switcherTarget = document.getElementById("sidebar-switcher-target");
this._switcherArrow = document.getElementById("sidebar-switcher-arrow");

Expand Down Expand Up @@ -124,7 +134,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafc
this._inited = true;

Services.obs.addObserver(this, "intl:app-locales-changed");
@@ -159,17 +219,26 @@ var SidebarUI = {
@@ -159,17 +229,26 @@ var SidebarUI = {
/**
* The handler for Services.obs.addObserver.
**/
Expand Down Expand Up @@ -155,7 +165,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafc
}
}
},
@@ -573,6 +642,10 @@ var SidebarUI = {
@@ -573,6 +652,10 @@ var SidebarUI = {
this._box.setAttribute("sidebarcommand", commandID);
this.lastOpenedId = commandID;

Expand All @@ -166,7 +176,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafc
let { url, title, sourceL10nEl } = this.sidebars.get(commandID);
this.title = title;
// Keep the title element in sync with any l10n changes.
@@ -618,6 +691,26 @@ var SidebarUI = {
@@ -618,6 +701,26 @@ var SidebarUI = {

this.selectMenuItem("");

Expand All @@ -193,7 +203,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafc
// Replace the document currently displayed in the sidebar with about:blank
// so that we can free memory by unloading the page. We need to explicitly
// create a new content viewer because the old one doesn't get destroyed
@@ -641,25 +734,112 @@ var SidebarUI = {
@@ -641,25 +744,112 @@ var SidebarUI = {
* none if the argument is an empty string.
*/
selectMenuItem(commandID) {
Expand Down
33 changes: 33 additions & 0 deletions src/browser/themes/pulse/content/downloads.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/* 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/. */

/* ========================================================================== */
/* about:downloads */

#contentAreaDownloadsView {
background: var(--tab-selected-bgcolor, var(--toolbar-bgcolor));
}

#downloadsListBox {
border: none;
border-radius: 0;
background: none;
}

#downloadsListBox > richlistitem {
border-radius: 4px;
transition: background-color 0.2s ease-in-out;

margin-bottom: 8px;
}

#downloadsListBox > richlistitem:not([selected]):hover {
background-color: var(--in-content-box-background);
}

@media (prefers-reduced-motion) {
#downloadsListBox > richlistitem {
transition: none;
}
}
3 changes: 2 additions & 1 deletion src/browser/themes/pulse/jar.inc.mn
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@
# be specified once. As a result, the source file paths are relative
# to the location of the actual manifest.

* skin/classic/browser/sidebar_tabs.css (../pulse/sidebar_tabs.css)
* skin/classic/browser/pulse/sidebar_tabs.css (../pulse/sidebar_tabs.css)
skin/classic/browser/pulse/downloads.css (../pulse/content/downloads.css)
skin/classic/browser/addons/shared.css (../pulse/addons/shared.css)
2 changes: 1 addition & 1 deletion src/browser/themes/pulse/sidebar_tabs.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

/* ========================================================================== */
/* SIDE BAR STYLES */
/* SIDEBAR TABS STYLES */

:root {
--sidebar-inside-padding: 8px;
Expand Down
12 changes: 12 additions & 0 deletions src/browser/themes/shared/downloads/allDownloadsView-inc-css.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/browser/themes/shared/downloads/allDownloadsView.inc.css b/browser/themes/shared/downloads/allDownloadsView.inc.css
index 204e6a95a17a58789c5992983196542104f6cf84..43f7cae36b9b60d27d2442efe3f48f7cbea8bcaa 100644
--- a/browser/themes/shared/downloads/allDownloadsView.inc.css
+++ b/browser/themes/shared/downloads/allDownloadsView.inc.css
@@ -4,6 +4,7 @@

@import "chrome://browser/skin/downloads/progressmeter.css";
@import "chrome://browser/skin/downloads/download-blockedStates.css";
+@import "chrome://browser/skin/pulse/downloads.css";

/*** View and outer controls ***/