Skip to content

Commit 578ca15

Browse files
committed
Merge branch 'dev' of https://github.com/zen-browser/desktop into dev
2 parents 5f61efa + 92607e2 commit 578ca15

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/workflows/linux-release-build.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,6 @@ jobs:
117117
./mach --no-interactive bootstrap --application-choice browser
118118
cd ..
119119
120-
- name: Install Rust
121-
run: |
122-
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $(cat .rust-toolchain)
123-
source $HOME/.cargo/env
124-
125120
- name: Insert API Keys
126121
run: |
127122
mkdir -p ~/.zen-keys

.github/workflows/src/release-build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ if command -v apt-get &> /dev/null; then
88
sudo apt-get install -y xvfb libnvidia-egl-wayland1 mesa-utils libgl1-mesa-dri
99
fi
1010

11+
. $HOME/.cargo/env
12+
1113
ulimit -n 4096
1214

1315
if command -v Xvfb &> /dev/null; then

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"surfer": "surfer",
2727
"test": "python3 scripts/run_tests.py",
2828
"test:dbg": "python3 scripts/run_tests.py --jsdebugger --debug-on-failure",
29-
"ffprefs": "cd tools/ffprefs && cargo run --release --bin ffprefs -- ../../",
29+
"ffprefs": "cd tools/ffprefs && cargo run --bin ffprefs -- ../../",
3030
"lc": "surfer license-check",
3131
"lc:fix": "surfer license-check --fix"
3232
},

src/zen/common/styles/zen-popup.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99

1010
:root {
1111
--panel-subview-body-padding: 2px 0;
12+
--arrowpanel-menuitem-border-radius: 5px;
13+
--arrowpanel-menuitem-margin: var(--uc-arrowpanel-menuitem-margin-block)
14+
var(--uc-arrowpanel-menuitem-margin-inline);
1215
--arrowpanel-menuitem-padding-block: 8px;
1316
--arrowpanel-menuitem-padding-inline: 14px;
1417
--uc-arrowpanel-menuicon-margin-inline: 14px;

0 commit comments

Comments
 (0)