fix: rebase issues

This commit is contained in:
Christel Westerberg
2024-05-21 16:13:50 +02:00
parent d5f2604ca0
commit 158b5a5dbb
25 changed files with 43 additions and 346 deletions
-15
View File
@@ -1,15 +0,0 @@
import { serverClient } from "@/lib/trpc/server"
import styles from "./user.module.css"
export default async function User() {
const user = await serverClient().user.get()
return (
<div className={styles.user}>
{user.firstName[0].toUpperCase()}
{user.lastName[0].toUpperCase()}
<span className={styles.alert}>1</span>
</div>
)
}
@@ -1,43 +0,0 @@
.user {
align-items: center;
background-color: var(--some-black-color, #000);
border-radius: 50%;
color: var(--some-white-color, #fff);
display: flex;
font-family: var(--ff-fira-sans);
font-size: 1.2rem;
font-weight: 600;
height: 3.5rem;
justify-content: center;
position: relative;
width: 3.5rem;
}
.alert {
align-items: center;
background-color: var(--some-red-color, #ed2027);
border-radius: 50%;
display: flex;
font-size: 1rem;
height: 2rem;
justify-content: center;
position: absolute;
right: -1rem;
top: -0.5rem;
width: 2rem;
}
@media screen and (min-width: 950px) {
.user {
height: 2.8rem;
width: 2.8rem;
}
.alert {
font-size: 0.6rem;
height: 1rem;
right: -0.2rem;
top: -0.1rem;
width: 1rem;
}
}