diff --git a/src/components/common/messaging/MessageBox.tsx b/src/components/common/messaging/MessageBox.tsx index fe323b15..8a00fbea 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 a02c1f4f..5d5c7963 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 a791edd7..70e9cd9a 100644 --- a/src/components/ui/InputBox.tsx +++ b/src/components/ui/InputBox.tsx @@ -8,6 +8,7 @@ export default styled.input` 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` 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 7e009fd5..b6e1ab0f 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 653a6ee6..191b963d 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 2b40d279..34108c12 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 8c1a2091..93ca2cc3 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%; }