devproje/project-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'Vencord:main' into zoom-parity

Browse source
This commit is contained in:
Kaydax 2024-10-22 21:20:23 +01:00 committed by GitHub
commit 43f92c9864
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/meta.yml vendored
View file

@ -33,6 +33,6 @@ jobs:
git add meta/dev.vencord.Vesktop.metainfo.xml git add meta/dev.vencord.Vesktop.metainfo.xml
git commit -m "Insert release changes for ${{ github.event.release.tag_name }}" git commit -m "Insert release changes for ${{ github.event.release.tag_name }}"
git push origin ci/meta-update git push origin ci/meta-update
gh pr create -B main -H ci/meta-update -t "Metainfo for ${{ github.event.release.tag_name }}" -b "This PR updates the metainfo for release ${{ github.event.release.tag_name }}. @lewisakura @Vendicated" gh pr create -B main -H ci/meta-update -t "Metainfo for ${{ github.event.release.tag_name }}" -b "This PR updates the metainfo for release ${{ github.event.release.tag_name }}."
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

6
src/renderer/components/screenSharePicker.css
View file

@ -33,15 +33,16 @@
.vcd-screen-picker-grid label { .vcd-screen-picker-grid label {
overflow: hidden; overflow: hidden;
padding: 4px 0px; padding: 8px;
cursor: pointer; cursor: pointer;
display: grid;
justify-items: center;
} }
.vcd-screen-picker-grid label:hover { .vcd-screen-picker-grid label:hover {
outline: 2px solid var(--brand-500); outline: 2px solid var(--brand-500);
} }
.vcd-screen-picker-grid div { .vcd-screen-picker-grid div {
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -101,7 +102,6 @@
.vcd-screen-picker-quality { .vcd-screen-picker-quality {
display: flex; display: flex;
gap: 1em; gap: 1em;
margin-bottom: 0.5em; margin-bottom: 0.5em;
} }

2
src/renderer/components/settings/Settings.tsx
View file

@ -105,7 +105,7 @@ const SettingsOptions: Record<string, Array<BooleanSetting | SettingsComponent>>
} }
], ],
Notifications: [NotificationBadgeToggle], Notifications: [NotificationBadgeToggle],
Miscelleanous: [ Miscellaneous: [
{ {
key: "arRPC", key: "arRPC",
title: "Rich Presence", title: "Rich Presence",