From b62eeb35e794419bfc4911178029c6fcec0972e8 Mon Sep 17 00:00:00 2001
From: nizune <9-nizune@users.noreply.gitlab.insrt.uk>
Date: Tue, 6 Jul 2021 17:42:32 +0200
Subject: [PATCH] Fix: Small fixes to Sessions tab
---
external/lang | 2 +-
.../common/messaging/MessageBox.tsx | 10 ++++----
src/components/ui/ColourSwatches.tsx | 2 +-
src/pages/settings/Settings.module.scss | 1 +
src/pages/settings/panes/Panes.module.scss | 25 +++++++++++++++++++
src/pages/settings/panes/Sessions.tsx | 4 +--
6 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/external/lang b/external/lang
index ce5e32d..1d2b4d0 160000
--- a/external/lang
+++ b/external/lang
@@ -1 +1 @@
-Subproject commit ce5e32d444a35a691ac6b0abfbc722945e7cdf46
+Subproject commit 1d2b4d0147ef4bd0613c44c702233f7af888d6c0
diff --git a/src/components/common/messaging/MessageBox.tsx b/src/components/common/messaging/MessageBox.tsx
index e3a11e2..065203b 100644
--- a/src/components/common/messaging/MessageBox.tsx
+++ b/src/components/common/messaging/MessageBox.tsx
@@ -129,11 +129,11 @@ export default function MessageBox({ channel }: Props) {
<Base>
<Blocked>
<Action>
- <PermissionTooltip
- permission="SendMessages"
- placement="top">
- <ShieldX size={22} />
- </PermissionTooltip>
+ <PermissionTooltip
+ permission="SendMessages"
+ placement="top">
+ <ShieldX size={22} />
+ </PermissionTooltip>
</Action>
<div className="text">
<Text id="app.main.channel.misc.no_sending" />
diff --git a/src/components/ui/ColourSwatches.tsx b/src/components/ui/ColourSwatches.tsx
index 62df251..a081c56 100644
--- a/src/components/ui/ColourSwatches.tsx
+++ b/src/components/ui/ColourSwatches.tsx
@@ -117,7 +117,7 @@ export default function ColourSwatches({ value, onChange }: Props) {
type="small"
key={i}
onClick={() => onChange(swatch)}>
- {swatch === value && <Check size={18} />}
+ {swatch === value && <Check size={22} />}
</Swatch>
))}
</div>
diff --git a/src/pages/settings/Settings.module.scss b/src/pages/settings/Settings.module.scss
index a28237e..6a8b310 100644
--- a/src/pages/settings/Settings.module.scss
+++ b/src/pages/settings/Settings.module.scss
@@ -75,6 +75,7 @@
.container {
width: 218px;
padding: 60px 8px;
+ height: fit-content;
}
.divider {
diff --git a/src/pages/settings/panes/Panes.module.scss b/src/pages/settings/panes/Panes.module.scss
index 0ff9cce..c7d38ef 100644
--- a/src/pages/settings/panes/Panes.module.scss
+++ b/src/pages/settings/panes/Panes.module.scss
@@ -69,6 +69,10 @@
font-weight: 600;
color: var(--foreground);
text-transform: uppercase;
+
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ overflow: hidden;
}
a {
@@ -329,6 +333,26 @@
.name {
font-weight: 600;
+ border-bottom: 2px solid transparent;
+ }
+
+ input {
+ background: transparent;
+ border: 0;
+ font-family: inherit;
+ font-size: 1rem;
+ padding: 0;
+ outline: 0;
+ border-radius: 0;
+ color: inherit;
+
+ &:focus {
+ border-bottom: 2px solid var(--accent);
+ }
+
+ &[data-active="true"] {
+ border-bottom: 2px solid inherit;
+ }
}
.icon {
@@ -361,6 +385,7 @@
.name {
text-transform: capitalize;
+ text-overflow: ellipsis;
}
.time {
diff --git a/src/pages/settings/panes/Sessions.tsx b/src/pages/settings/panes/Sessions.tsx
index e543da1..a64b16e 100644
--- a/src/pages/settings/panes/Sessions.tsx
+++ b/src/pages/settings/panes/Sessions.tsx
@@ -133,9 +133,7 @@ export function Sessions() {
<div>{getSystemIcon(session)}</div>
</div>
<div className={styles.info}>
- <span className={styles.name}>
- {session.friendly_name}
- </span>
+ <input type="text" className={styles.name} value={session.friendly_name} autocomplete="off" />
<span className={styles.time}>
<Text
id="app.settings.pages.sessions.created"
--
GitLab