mirror of
https://github.com/revoltchat/revite.git
synced 2025-02-22 00:00:56 -05:00
Merge branch 'master' of https://github.com/revoltchat/revite
This commit is contained in:
commit
d6a541f380
5 changed files with 20 additions and 3 deletions
7
.github/pull_request_template.md
vendored
Normal file
7
.github/pull_request_template.md
vendored
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
## Please make sure to check the following tasks before opening and submitting a PR
|
||||||
|
|
||||||
|
* [ ] I understand and have followed the [contribution guide](https://github.com/revoltchat/revolt/discussions/282)
|
||||||
|
* [ ] I have tested my changes locally and they are working as intended
|
||||||
|
* [ ] These changes do not have any notable side effects on other Revolt projects
|
||||||
|
* [ ] (optional) I have opened a pull request on [the translation repository](https://github.com/revoltchat/translations)
|
||||||
|
* [ ] I have included screenshots to demonstrate my changes
|
|
@ -97,6 +97,7 @@
|
||||||
code {
|
code {
|
||||||
color: white;
|
color: white;
|
||||||
font-size: 90%;
|
font-size: 90%;
|
||||||
|
padding-right: 1em;
|
||||||
background: var(--block);
|
background: var(--block);
|
||||||
border-radius: var(--border-radius);
|
border-radius: var(--border-radius);
|
||||||
font-family: var(--monospace-font), monospace;
|
font-family: var(--monospace-font), monospace;
|
||||||
|
|
|
@ -21,6 +21,7 @@ export function FormLogin() {
|
||||||
if (browser) {
|
if (browser) {
|
||||||
let { name } = browser;
|
let { name } = browser;
|
||||||
const { os } = browser;
|
const { os } = browser;
|
||||||
|
let isiPad;
|
||||||
if (window.isNative) {
|
if (window.isNative) {
|
||||||
friendly_name = `Revolt Desktop on ${os}`;
|
friendly_name = `Revolt Desktop on ${os}`;
|
||||||
} else {
|
} else {
|
||||||
|
@ -28,8 +29,12 @@ export function FormLogin() {
|
||||||
name = "safari";
|
name = "safari";
|
||||||
} else if (name === "fxios") {
|
} else if (name === "fxios") {
|
||||||
name = "firefox";
|
name = "firefox";
|
||||||
|
} else if (name === "crios") {
|
||||||
|
name = "chrome";
|
||||||
}
|
}
|
||||||
friendly_name = `${name} on ${os}`;
|
if (os === "Mac OS" && navigator.maxTouchPoints > 0)
|
||||||
|
isiPad = true;
|
||||||
|
friendly_name = `${name} on ${isiPad ? "iPadOS" : os}`;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
friendly_name = "Unknown Device";
|
friendly_name = "Unknown Device";
|
||||||
|
|
|
@ -92,7 +92,7 @@ export function Sessions() {
|
||||||
return <Android size={14} />;
|
return <Android size={14} />;
|
||||||
case /mac.*os/i.test(name):
|
case /mac.*os/i.test(name):
|
||||||
return <Macos size={14} />;
|
return <Macos size={14} />;
|
||||||
case /ios/i.test(name):
|
case /i(Pad)os/i.test(name):
|
||||||
return <Apple size={14} />;
|
return <Apple size={14} />;
|
||||||
case /windows/i.test(name):
|
case /windows/i.test(name):
|
||||||
return <Windows size={14} />;
|
return <Windows size={14} />;
|
||||||
|
|
|
@ -106,7 +106,11 @@ export const Members = ({ server }: Props) => {
|
||||||
const members = useMemo(
|
const members = useMemo(
|
||||||
() =>
|
() =>
|
||||||
query
|
query
|
||||||
? data?.filter((x) => x.user?.username.includes(query))
|
? data?.filter((x) =>
|
||||||
|
x.user?.username
|
||||||
|
.toLowerCase()
|
||||||
|
.includes(query.toLowerCase()),
|
||||||
|
)
|
||||||
: data,
|
: data,
|
||||||
[data, query],
|
[data, query],
|
||||||
);
|
);
|
||||||
|
|
Loading…
Add table
Reference in a new issue