From e956d9ac174e7358cd33e71661f077f88887fa5d Mon Sep 17 00:00:00 2001 From: nizune <9-nizune@users.noreply.gitlab.insrt.uk> Date: Thu, 8 Jul 2021 01:14:23 +0200 Subject: [PATCH] Small fixes --- external/lang | 2 +- src/context/Theme.tsx | 4 ++-- src/lib/ContextMenus.tsx | 2 +- src/pages/settings/panes/Panes.module.scss | 6 +++++- src/pages/settings/panes/Sessions.tsx | 8 +++----- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/external/lang b/external/lang index 2a0b524..39359e7 160000 --- a/external/lang +++ b/external/lang @@ -1 +1 @@ -Subproject commit 2a0b524d892349cb956ee49af873fc87999e2206 +Subproject commit 39359e76b961fa7ee9f83a0cabdc811ccecdb600 diff --git a/src/context/Theme.tsx b/src/context/Theme.tsx index c947d85..3dcd10a 100644 --- a/src/context/Theme.tsx +++ b/src/context/Theme.tsx @@ -234,7 +234,7 @@ export const PRESETS: Record<string, Theme> = { mention: "rgba(251, 255, 0, 0.40)", success: "#65E572", warning: "#FAA352", - error: "#F06464", + error: "#ED4245", hover: "rgba(0, 0, 0, 0.2)", "scrollbar-thumb": "#CA525A", "scrollbar-track": "transparent", @@ -261,7 +261,7 @@ export const PRESETS: Record<string, Theme> = { mention: "rgba(251, 255, 0, 0.06)", success: "#65E572", warning: "#FAA352", - error: "#F06464", + error: "#ED4245", hover: "rgba(0, 0, 0, 0.1)", "scrollbar-thumb": "#CA525A", "scrollbar-track": "transparent", diff --git a/src/lib/ContextMenus.tsx b/src/lib/ContextMenus.tsx index c0fac9f..9646772 100644 --- a/src/lib/ContextMenus.tsx +++ b/src/lib/ContextMenus.tsx @@ -882,7 +882,7 @@ function ContextMenus(props: Props) { </div> <IconButton> <MenuItem data={{ action: "open_settings" }}> - <Cog size={18} /> + <Cog size={22} /> </MenuItem> </IconButton> </div> diff --git a/src/pages/settings/panes/Panes.module.scss b/src/pages/settings/panes/Panes.module.scss index 1839bc8..dc614c1 100644 --- a/src/pages/settings/panes/Panes.module.scss +++ b/src/pages/settings/panes/Panes.module.scss @@ -332,7 +332,7 @@ } .entry { - margin: 8px 0; + margin: 10px 0; padding: 16px; display: flex; border-radius: 6px; @@ -419,6 +419,10 @@ } } } + + > button { + margin-top: 20px; + } } .languages { diff --git a/src/pages/settings/panes/Sessions.tsx b/src/pages/settings/panes/Sessions.tsx index 81dae3c..88c8138 100644 --- a/src/pages/settings/panes/Sessions.tsx +++ b/src/pages/settings/panes/Sessions.tsx @@ -150,12 +150,8 @@ export function Sessions() { }} /> </span> - - </div> </div> - - {deviceId !== session.id && ( <Button onClick={async () => { @@ -179,10 +175,12 @@ export function Sessions() { <Text id="app.settings.pages.logOut" /> </Button> )} - </div> </div> ))} + <Button error> + <Text id="app.settings.pages.sessions.logout" /> + </Button> <Tip> <span> <Text id="app.settings.tips.sessions.a" /> -- GitLab