mirror of
https://github.com/zen-browser/desktop.git
synced 2026-03-06 00:37:03 +00:00
Merge branch 'dev' of https://github.com/zen-browser/desktop into dev
This commit is contained in:
2
.github/workflows/linux-release-build.yml
vendored
2
.github/workflows/linux-release-build.yml
vendored
@@ -106,7 +106,7 @@ jobs:
|
||||
env:
|
||||
SURFER_COMPAT: ${{ matrix.arch }}
|
||||
run: |
|
||||
. "$HOME/.cargo/env"
|
||||
. "$HOME/.cargo/env"
|
||||
npm run import
|
||||
|
||||
- name: Build language packs
|
||||
|
||||
4
.github/workflows/windows-release-build.yml
vendored
4
.github/workflows/windows-release-build.yml
vendored
@@ -165,7 +165,9 @@ jobs:
|
||||
if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
|
||||
env:
|
||||
SURFER_COMPAT: ${{ matrix.arch }}
|
||||
run: npm run import -- --verbose
|
||||
run: |
|
||||
. "$HOME/.cargo/env"
|
||||
npm run import -- --verbose
|
||||
|
||||
- name: Bootstrap
|
||||
if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
|
||||
index 4f960ae35aa69a1d1ce4ad368f5bae365229bbdf..3a17985b3376eb8a966cd85324d86d00d891bf0f 100644
|
||||
index 4f960ae35aa69a1d1ce4ad368f5bae365229bbdf..a60d16adee588a1ab0d06d7676bbe80f179e088d 100644
|
||||
--- a/browser/themes/windows/browser.css
|
||||
+++ b/browser/themes/windows/browser.css
|
||||
@@ -31,7 +31,6 @@
|
||||
@@ -10,12 +10,19 @@ index 4f960ae35aa69a1d1ce4ad368f5bae365229bbdf..3a17985b3376eb8a966cd85324d86d00
|
||||
}
|
||||
|
||||
/* Using a semitransparent background preserves the tinting from the backdrop.
|
||||
@@ -61,7 +60,7 @@
|
||||
@@ -60,14 +59,12 @@
|
||||
}
|
||||
|
||||
/* This is needed for Windows 10, see bug 1961257 */
|
||||
@media (-moz-windows-accent-color-in-titlebar) {
|
||||
-@media (-moz-windows-accent-color-in-titlebar) {
|
||||
- :root[customtitlebar][sizemode="normal"] #navigator-toolbox {
|
||||
+ :root[customtitlebar][sizemode="normal"] #browser {
|
||||
border-top: 0.5px solid ActiveBorder;
|
||||
&:-moz-window-inactive {
|
||||
border-top-color: InactiveBorder;
|
||||
}
|
||||
}
|
||||
-}
|
||||
|
||||
/* Titlebar */
|
||||
|
||||
|
||||
@@ -203,7 +203,7 @@
|
||||
},
|
||||
{
|
||||
duration: 0.35,
|
||||
delay: 0.1,
|
||||
delay: 0.08,
|
||||
}
|
||||
),
|
||||
]).then(() => {
|
||||
|
||||
@@ -129,7 +129,7 @@ var gZenUIManager = {
|
||||
},
|
||||
|
||||
updateTabsToolbar() {
|
||||
const kUrlbarHeight = 440;
|
||||
const kUrlbarHeight = 336;
|
||||
gURLBar.textbox.style.setProperty(
|
||||
'--zen-urlbar-top',
|
||||
`${window.innerHeight / 2 - Math.max(kUrlbarHeight, gURLBar.textbox.getBoundingClientRect().height) / 2}px`
|
||||
|
||||
@@ -204,21 +204,27 @@ body > #confetti {
|
||||
|
||||
#zen-update-animation-border {
|
||||
position: absolute;
|
||||
inset: 0;
|
||||
border: solid 2px #0000;
|
||||
border-radius: var(--zen-native-content-radius);
|
||||
background: radial-gradient(
|
||||
ellipse 100% 50% at center var(--background-top),
|
||||
rgba(255, 255, 255, 0.8) 80%,
|
||||
transparent
|
||||
)
|
||||
border-box;
|
||||
/* ensure gradient size is relative to border-box (not default padding-box) */
|
||||
--lyr: conic-gradient(white 0 0); /* any kind of gradient that's opaque everywhere */
|
||||
/* exclude padding-box (that is, mask out everything but the border area) */
|
||||
mask:
|
||||
var(--lyr) padding-box exclude,
|
||||
var(--lyr);
|
||||
content: '';
|
||||
pointer-events: none;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
#zen-update-animation-border::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
inset: 0;
|
||||
border-radius: inherit;
|
||||
padding: 2px; /* thickness of border */
|
||||
|
||||
background: radial-gradient(
|
||||
ellipse 100% 50% at center var(--background-top),
|
||||
rgba(255, 255, 255, 0.5) 80%,
|
||||
transparent
|
||||
);
|
||||
|
||||
/* Punch out the inside once (not animated) */
|
||||
mask:
|
||||
linear-gradient(#fff 0 0) content-box,
|
||||
linear-gradient(#fff 0 0);
|
||||
mask-composite: exclude;
|
||||
}
|
||||
|
||||
@@ -611,7 +611,9 @@ class nsZenKeyboardShortcutsLoader {
|
||||
|
||||
const correctDefaultShortcut = (shortcut) => {
|
||||
if (shortcut.getID() === 'key_savePage') {
|
||||
shortcut.setModifiers(nsKeyShortcutModifiers.fromObject({ accel: true, alt: true }));
|
||||
shortcut.setModifiers(
|
||||
nsKeyShortcutModifiers.fromObject({ accel: true, alt: true, shift: true })
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -194,8 +194,8 @@
|
||||
--zen-toolbox-min-width: 1px; /* Default minimum width (used when collapsed) */
|
||||
|
||||
@media (-moz-platform: windows) {
|
||||
--border-radius-medium: 8px;
|
||||
--tab-border-radius: 6px;
|
||||
--border-radius-medium: 6px;
|
||||
--tab-border-radius: 4px;
|
||||
}
|
||||
|
||||
@media (-moz-platform: macos) {
|
||||
|
||||
@@ -204,6 +204,12 @@
|
||||
left: -4px;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
@media (-moz-platform: windows) {
|
||||
& img {
|
||||
margin-bottom: -4px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.zen-current-workspace-indicator-name {
|
||||
@@ -215,11 +221,6 @@
|
||||
font-weight: 600;
|
||||
align-items: center;
|
||||
margin: 0;
|
||||
max-height: 16px;
|
||||
|
||||
@media (-moz-platform: windows) {
|
||||
margin-top: -3px;
|
||||
}
|
||||
}
|
||||
|
||||
.zen-workspaces-actions {
|
||||
|
||||
Reference in New Issue
Block a user