fix: grids and lists in rte

This commit is contained in:
Christel Westerberg
2024-07-08 15:28:58 +02:00
parent da343f45da
commit cccfbfe29a
4 changed files with 19 additions and 14 deletions

View File

@@ -14,20 +14,20 @@
gap: var(--Spacing-x1); gap: var(--Spacing-x1);
} }
.ol:has(li:nth-last-child(n + 4)), .ol:has(li:nth-last-child(n + 5)),
.ul:has(li:nth-last-child(n + 4)) { .ul:has(li:nth-last-child(n + 5)) {
grid-template-columns: 1fr 1fr; grid-template-columns: 1fr 1fr;
grid-auto-flow: column;
} }
.ol > li::marker { .ol > li::marker {
color: var(--Primary-Light-On-Surface-Accent); color: var(--Primary-Light-On-Surface-Accent);
} }
.ul:has(.heart), .li:has(.heart),
.ul:has(.check) { .li:has(.check) {
list-style: none; list-style: none;
} }
.li:has(.heart), .li:has(.heart),
.li:has(.check) { .li:has(.check) {
display: flex; display: flex;
@@ -54,7 +54,7 @@
} }
.container { .container {
display: "grid"; display: grid;
gap: var(--Spacing-x3); gap: var(--Spacing-x3);
max-width: 1197px; max-width: 1197px;
} }

View File

@@ -497,7 +497,10 @@ export const renderOptions: RenderOptions = {
className={styles.ul} className={styles.ul}
style={ style={
numberOfRows numberOfRows
? { gridTemplateRows: `repeat(${numberOfRows}, auto)` } ? {
gridTemplateRows: `repeat(${numberOfRows}, auto)`,
gridAutoFlow: "column",
}
: {} : {}
} }
> >

View File

@@ -1,6 +1,5 @@
import { login } from "@/constants/routes/handleAuth" import { serverClient } from "@/lib/trpc/server"
import { auth } from "@/auth"
import ArrowRight from "@/components/Icons/ArrowRight" import ArrowRight from "@/components/Icons/ArrowRight"
import { ScandicFriends } from "@/components/Levels" import { ScandicFriends } from "@/components/Levels"
import Button from "@/components/TempDesignSystem/Button" import Button from "@/components/TempDesignSystem/Button"
@@ -21,9 +20,10 @@ export default async function JoinLoyaltyContact({
lang, lang,
}: JoinLoyaltyContactProps & LangParams) { }: JoinLoyaltyContactProps & LangParams) {
const { formatMessage } = await getIntl() const { formatMessage } = await getIntl()
const session = await auth() const user = await serverClient().user.name()
if (session) { // Check if we have user, that means we are logged in.
if (user) {
return null return null
} }
return ( return (

View File

@@ -1,12 +1,14 @@
import { auth } from "@/auth" import { serverClient } from "@/lib/trpc/server"
import MyPagesSidebar from "@/components/MyPages/Sidebar" import MyPagesSidebar from "@/components/MyPages/Sidebar"
import { LangParams } from "@/types/params" import { LangParams } from "@/types/params"
export default async function MyPagesNavigation({ lang }: LangParams) { export default async function MyPagesNavigation({ lang }: LangParams) {
const session = await auth() const user = await serverClient().user.name()
if (!session) { // Check if we have user, that means we are logged in.
if (!user) {
return null return null
} }