From ce31ef84ccee61ee7979fd63d7dd40b3343d363e Mon Sep 17 00:00:00 2001 From: Nikolai R Kristiansen Date: Sun, 17 Apr 2022 16:29:18 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84=20Pretty=20deposit=20user=20select?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../features/register/ProductCard.module.css | 3 +- .../src/features/register/Register.module.css | 9 +++- frontend/src/features/register/Register.tsx | 2 +- .../src/features/users/UserCard.module.css | 41 ++++++++++++------- frontend/src/features/users/UserCard.tsx | 10 +++-- 5 files changed, 41 insertions(+), 24 deletions(-) diff --git a/frontend/src/features/register/ProductCard.module.css b/frontend/src/features/register/ProductCard.module.css index be7d70b..cb603ea 100644 --- a/frontend/src/features/register/ProductCard.module.css +++ b/frontend/src/features/register/ProductCard.module.css @@ -1,7 +1,6 @@ .product { display: flex; border: none; - /*border: 1px solid var(--background);*/ background: rgb(35, 15, 41); border-radius: 4px; transition: background-color 0.1s ease-out, border 0.1s ease-out; @@ -31,7 +30,7 @@ top: 0; bottom: 0; right: 0; - padding: 10px 12px 8px 8px; + padding: 12px 12px 8px 8px; border-left: 1px solid transparent; color: transparent; font-size: 2rem; diff --git a/frontend/src/features/register/Register.module.css b/frontend/src/features/register/Register.module.css index 5ea2018..50de586 100644 --- a/frontend/src/features/register/Register.module.css +++ b/frontend/src/features/register/Register.module.css @@ -1,7 +1,12 @@ .userList { display: grid; - grid-template-columns: repeat(12, 128px); - row-gap: 16px; + grid-template-columns: repeat(5, 220px); + column-gap: 16px; + row-gap: 24px; +} + +.showAll { + margin-top: 1rem; } .productList { diff --git a/frontend/src/features/register/Register.tsx b/frontend/src/features/register/Register.tsx index aece961..0de885c 100644 --- a/frontend/src/features/register/Register.tsx +++ b/frontend/src/features/register/Register.tsx @@ -48,7 +48,7 @@ export const Register = (): JSX.Element => { /> ))} - diff --git a/frontend/src/features/users/UserCard.module.css b/frontend/src/features/users/UserCard.module.css index 151f438..a2d3cac 100644 --- a/frontend/src/features/users/UserCard.module.css +++ b/frontend/src/features/users/UserCard.module.css @@ -1,31 +1,29 @@ .user { display: flex; - flex-direction: column; align-items: center; - padding: 4px; - border: 1px solid transparent; - background: transparent; + padding: 0; + border: none; + border-left: 4px solid transparent; + background: rgb(35, 15, 41); border-radius: 4px; color: var(--text); transition: background-color 0.1s ease-out, border 0.1s ease-out; - max-height: 100px; } .user:hover { - border-color: var(--border); cursor: pointer; } - -.active { - border-color: var(--border); - background: var(--border); +.user:hover, +.active.user { + background-color: var(--background); + box-shadow: 0 0 4px var(--background), 0 0 11px var(--background), 0 0 19px var(--background); } - -.active:hover { - /* TODO */ +.active.user { + border-left: 4px solid var(--sun) } .avatar { + margin-left: 1rem; width: 50px; height: 50px; clip-path: polygon(50% 0%, 100% 50%, 50% 100%, 0% 50%); @@ -36,6 +34,7 @@ } .noAvatar { + margin-left: 1rem; display: block; width: 50px; height: 50px; @@ -44,6 +43,18 @@ content: ""; } -.name { - font-weight: bold; +.meta { + display: flex; + padding: 1rem; + flex-direction: column; + align-items: flex-start; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + font-size: 1.2rem; + text-shadow: none; } + +.balance { + color: var(--sun) +} \ No newline at end of file diff --git a/frontend/src/features/users/UserCard.tsx b/frontend/src/features/users/UserCard.tsx index 9b1d16c..f62e738 100644 --- a/frontend/src/features/users/UserCard.tsx +++ b/frontend/src/features/users/UserCard.tsx @@ -1,7 +1,7 @@ import clsx from "clsx"; import React, { MouseEventHandler } from "react"; -import { AllUsersQuery } from "../types"; +import { AllUsersQuery } from "../../types"; import styles from "./UserCard.module.css"; type UserCardProps = { @@ -14,7 +14,7 @@ type UserCardProps = { export const UserCard = ({ user, onUser, active = false }: UserCardProps): JSX.Element => { const classes = clsx(styles.user, { [styles.active]: active }); return ( - ); };