Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

style(organizations): change background color on card to grey #1702

Merged
merged 1 commit into from
Oct 28, 2024
+8 −4
Merged

style(organizations): change background color on card to grey #1702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tavla/app/(admin)/organizations/components/Organizations.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { TOrganization } from 'types/settings'
import EnturLogoBlue from 'assets/logos/Tavla-blue.svg'
import EnturLogo from 'assets/logos/Tavla-white.svg'
import Image from 'next/image'
import { Link } from '@entur/typography'
import NextLink from 'next/link'
Expand Down Expand Up @@ -28,17 +28,17 @@ function Organizations({
className=" border rounded-md shadow-sm"
key={organization.id}
>
<div className="flex flex-col">
<div className="flex flex-col bg-grey60">
<div className="h-36 flex align-center justify-center relative">
<Image
src={organization.logo ?? EnturLogoBlue}
src={organization.logo ?? EnturLogo}
alt="Logo til organisasjonen"
fill
objectFit="contain"
className="py-12 px-8"
/>
</div>
<div className="bg-gray-100 p-4 flex flex-row justify-between gap-4">
<div className="bg-grey80 p-4 flex flex-row justify-between gap-4">
<Link
as={NextLink}
href={`/organizations/${organization.id}`}
Expand Down
3 changes: 3 additions & 0 deletions tavla/app/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
--blue80: var(--colors-blues-blue80);
--blue90: var(--colors-blues-blue90);

--grey60: var(--colors-greys-grey60);
--grey70: var(--colors-greys-grey70);
--grey80: var(--colors-greys-grey80);

Expand Down Expand Up @@ -80,6 +81,7 @@
--blue80: var(--colors-blues-blue80);
--blue90: var(--colors-blues-blue90);

--grey60: var(--colors-greys-grey60);
--grey70: var(--colors-greys-grey70);
--grey80: var(--colors-greys-grey80);

Expand Down Expand Up @@ -130,6 +132,7 @@
--blue80: var(--colors-blues-blue80);
--blue90: var(--colors-blues-blue90);

--grey60: var(--colors-greys-grey60);
--grey70: var(--colors-greys-grey70);
--grey80: var(--colors-greys-grey80);

Expand Down
1 change: 1 addition & 0 deletions tavla/tailwind.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ module.exports = {
secondary: 'var(--secondary-background-color)',
tertiary: 'var(--tertiary-background-color)',
contrast: 'var(--contrast-background-color)',
grey60: 'var(--grey60)',
grey70: 'var(--grey70)',
grey80: 'var(--grey80)',
blue80: 'var(--blue80)',
Expand Down