From e5b233e14eb1fa35f573d06329112529f05e350c Mon Sep 17 00:00:00 2001
From: nizune <9-nizune@users.noreply.gitlab.insrt.uk>
Date: Mon, 5 Jul 2021 21:06:08 +0200
Subject: [PATCH] Fix: changed outlines to box-shadow
---
src/components/common/messaging/MessageBox.tsx | 6 +++++-
src/components/ui/ComboBox.tsx | 6 +++---
src/components/ui/InputBox.tsx | 4 +++-
src/components/ui/TextArea.module.scss | 2 +-
src/context/intermediate/popovers/UserProfile.tsx | 6 +++---
src/pages/settings/panes/Panes.module.scss | 2 +-
src/pages/settings/server/Panes.module.scss | 4 ++++
7 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/src/components/common/messaging/MessageBox.tsx b/src/components/common/messaging/MessageBox.tsx
index fe323b1..8a00fbe 100644
--- a/src/components/common/messaging/MessageBox.tsx
+++ b/src/components/common/messaging/MessageBox.tsx
@@ -61,7 +61,7 @@ export type UploadState =
const Base = styled.div`
display: flex;
- padding: 0 12px;
+ /*padding: 0 12px;*/
background: var(--message-box);
textarea {
@@ -87,6 +87,10 @@ const Blocked = styled.div`
const Action = styled.div`
display: grid;
place-items: center;
+
+ > div {
+ padding: 10px 12px;
+ }
`;
// ! FIXME: add to app config and load from app config
diff --git a/src/components/ui/ComboBox.tsx b/src/components/ui/ComboBox.tsx
index a02c1f4..5d5c796 100644
--- a/src/components/ui/ComboBox.tsx
+++ b/src/components/ui/ComboBox.tsx
@@ -1,7 +1,7 @@
import styled from "styled-components";
export default styled.select`
- padding: 8px;
+ padding: 10px;
border-radius: 6px;
font-family: inherit;
color: var(--secondary-foreground);
@@ -10,11 +10,11 @@ export default styled.select`
border: none;
outline: 2px solid transparent;
transition: outline-color 0.2s ease-in-out;
- transition: box-shadow 0.3s;
+ transition: box-shadow .2s ease-in-out;
cursor: pointer;
width: 100%;
&:focus {
- box-shadow: 0 0 0 2pt var(--accent);
+ box-shadow: 0 0 0 1.5pt var(--accent);
}
`;
diff --git a/src/components/ui/InputBox.tsx b/src/components/ui/InputBox.tsx
index a791edd..70e9cd9 100644
--- a/src/components/ui/InputBox.tsx
+++ b/src/components/ui/InputBox.tsx
@@ -8,6 +8,7 @@ export default styled.input<Props>`
z-index: 1;
padding: 8px 16px;
border-radius: 6px;
+ font-size: 1rem;
font-family: inherit;
color: var(--foreground);
@@ -17,13 +18,14 @@ export default styled.input<Props>`
border: none;
outline: 2px solid transparent;
transition: outline-color 0.2s ease-in-out;
+ transition: box-shadow .2s ease-in-out;
&:hover {
background: var(--secondary-background);
}
&:focus {
- outline: 2px solid var(--accent);
+ box-shadow: 0 0 0 1.5pt var(--accent);
}
${(props) =>
diff --git a/src/components/ui/TextArea.module.scss b/src/components/ui/TextArea.module.scss
index 7e009fd..b6e1ab0 100644
--- a/src/components/ui/TextArea.module.scss
+++ b/src/components/ui/TextArea.module.scss
@@ -1,5 +1,5 @@
.container {
- font-size: 0.875rem;
+ font-size: .875rem;
line-height: 20px;
position: relative;
}
diff --git a/src/context/intermediate/popovers/UserProfile.tsx b/src/context/intermediate/popovers/UserProfile.tsx
index 653a6ee..191b963 100644
--- a/src/context/intermediate/popovers/UserProfile.tsx
+++ b/src/context/intermediate/popovers/UserProfile.tsx
@@ -2,9 +2,9 @@ import {
Envelope,
Edit,
UserPlus,
- Shield,
- Money,
-} from "@styled-icons/boxicons-regular";
+ Shield
+} from "@styled-icons/boxicons-solid";
+import { Money } from "@styled-icons/boxicons-regular";
import { Link, useHistory } from "react-router-dom";
import { Users } from "revolt.js/dist/api/objects";
import { UserPermission } from "revolt.js/dist/api/permissions";
diff --git a/src/pages/settings/panes/Panes.module.scss b/src/pages/settings/panes/Panes.module.scss
index 2b40d27..34108c1 100644
--- a/src/pages/settings/panes/Panes.module.scss
+++ b/src/pages/settings/panes/Panes.module.scss
@@ -312,7 +312,7 @@
}
.label {
- margin: 0 0 6px 0;
+ margin-bottom: 8px;
color: var(--primary-text);
font-size: 12px;
font-weight: 600;
diff --git a/src/pages/settings/server/Panes.module.scss b/src/pages/settings/server/Panes.module.scss
index 8c1a209..93ca2cc 100644
--- a/src/pages/settings/server/Panes.module.scss
+++ b/src/pages/settings/server/Panes.module.scss
@@ -6,6 +6,10 @@
.name {
flex-grow: 1;
+ h3 {
+ margin-top: 0;
+ }
+
input {
width: 100%;
}
--
GitLab