mirror of
https://github.com/zen-browser/desktop.git
synced 2025-09-05 19:08:18 +00:00
Merge branch 'dev' into new-layout
Signed-off-by: mr. m <91018726+mr-cheff@users.noreply.github.com>
This commit is contained in:
@@ -101,7 +101,7 @@ To upgrade the browser to a newer version, use the embedded update functionality
|
||||
|
||||
## 👨💻 Development and Contributing
|
||||
|
||||
Some components used by @zen-browser as an attempt to make firefox forks a better place, and for other to enjoy the beauty of OSS. You can find them [here](https://github.com/zen-browser/components).
|
||||
Some components used by @zen-browser as an attempt to make firefox forks a better place, and for other to enjoy the beauty of OSS. You can find them [here](https://github.com/zen-browser/desktop/tree/dev/src/browser/base/zen-components).
|
||||
|
||||
#### `Run Locally`
|
||||
|
||||
|
@@ -121,7 +121,7 @@ pref('zen.view.sidebar-height-throttle', 200); // in ms
|
||||
pref('zen.view.sidebar-expanded.max-width', 400);
|
||||
|
||||
pref('zen.view.show-bottom-border', false);
|
||||
pref('zen.view.use-single-toolbar', true);
|
||||
pref('zen.view.use-single-toolbar', false);
|
||||
|
||||
#ifndef XP_MACOSX
|
||||
pref('zen.view.hide-window-controls', true);
|
||||
|
@@ -9,7 +9,7 @@ export var ZenCustomizableUI = new (class {
|
||||
'zen-sidebar-top-buttons',
|
||||
{
|
||||
type: this.TYPE_TOOLBAR,
|
||||
defaultPlacements: ['zen-sidepanel-button'],
|
||||
defaultPlacements: ['preferences-button', 'zen-sidepanel-button'],
|
||||
defaultCollapsed: null,
|
||||
},
|
||||
true
|
||||
|
@@ -196,6 +196,10 @@
|
||||
|
||||
gBrowser.pinTab(newTab);
|
||||
|
||||
if(newTab.getAttribute("zen-workspace-id") !== ZenWorkspaces.activeWorkspace && newTab.getAttribute("zen-essential") !== "true") {
|
||||
gBrowser.hideTab(newTab, undefined, true);
|
||||
}
|
||||
|
||||
newTab.initialize();
|
||||
}
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
# Important notes!
|
||||
|
||||
Inside browser.js, we hardcoded-ly detect the path name for `zen-welcome` so we can add special attributes to the welcom page. If this path name changes, the welcome page will not work properly.
|
||||
Inside browser.js, we hardcoded-ly detect the path name for `zen-welcome` so we can add special attributes to the welcome page. If this path name changes, the welcome page will not work properly.
|
||||
|
||||
Make sure to update the path name in browser.js if you change the path name of `zen-welcome`.
|
||||
|
||||
|
@@ -565,16 +565,23 @@
|
||||
/* tab sound icons */
|
||||
.tab-icon-overlay[soundplaying] {
|
||||
list-style-image: url('tab-audio-playing-small.svg') !important;
|
||||
background-image: none !important;
|
||||
fill: white !important;
|
||||
}
|
||||
|
||||
.tab-icon-overlay[muted] {
|
||||
list-style-image: url('tab-audio-muted-small.svg') !important;
|
||||
background-image: none !important;
|
||||
fill: white !important;
|
||||
}
|
||||
|
||||
.tab-icon-overlay[activemedia-blocked] {
|
||||
list-style-image: url('tab-audio-blocked-small.svg') !important;
|
||||
background-image: none !important;
|
||||
fill: white !important;
|
||||
}
|
||||
|
||||
|
||||
/* reload/stop animation */
|
||||
#stop-reload-button[animate]
|
||||
> #reload-button[displaystop]
|
||||
@@ -897,7 +904,7 @@ menuitem[contexttype='fullscreen'][label*='Exit'] {
|
||||
#context_pinSelectedTabs,
|
||||
#context_unpinSelectedTabs,
|
||||
.customize-context-moveToPanel,
|
||||
#context_zen-replace-pinned-url-with-current{
|
||||
#context_zen-replace-pinned-url-with-current {
|
||||
--menu-image: url('pin.svg');
|
||||
}
|
||||
|
||||
|
@@ -18,7 +18,7 @@
|
||||
"brandShortName": "Zen Browser",
|
||||
"brandFullName": "Zen Browser",
|
||||
"release": {
|
||||
"displayVersion": "1.0.1-a.19",
|
||||
"displayVersion": "1.0.1-a.20",
|
||||
"github": {
|
||||
"repo": "zen-browser/desktop"
|
||||
},
|
||||
@@ -38,7 +38,7 @@
|
||||
"brandShortName": "Zen Twilight",
|
||||
"brandFullName": "Zen Twilight",
|
||||
"release": {
|
||||
"displayVersion": "1.0.1-t.19",
|
||||
"displayVersion": "1.0.1-t.20",
|
||||
"github": {
|
||||
"repo": "zen-browser/desktop"
|
||||
},
|
||||
|
Reference in New Issue
Block a user