Skip to content

Commit

Permalink
Changed the color patterns in config files to fit shadcn. I also had …
Browse files Browse the repository at this point in the history
…to update the data sources and registry pages because the colors were not fully displayed as they should. In the process I also exchanged the daisyUI components with shadcn components for those 2 pages already. Otherwise there are minor color mismatches on other sites but nothing too extreme. These will be further fixed in the design library work coming up soon.DDDDDDDD

Signed-off-by: Jan Lorenz <[email protected]>
  • Loading branch information
JanProgrammierung committed Oct 10, 2024
1 parent b0b0fa6 commit a5a3946
Show file tree
Hide file tree
Showing 13 changed files with 1,054 additions and 861 deletions.
182 changes: 181 additions & 1 deletion next-app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions next-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
},
"dependencies": {
"@jonkoops/matomo-tracker-react": "^0.7.0",
"@radix-ui/react-checkbox": "^1.1.2",
"@radix-ui/react-slot": "^1.1.0",
"axios": "^1.7.7",
"class-variance-authority": "^0.7.0",
Expand Down
60 changes: 28 additions & 32 deletions next-app/src/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,69 +3,65 @@
@tailwind utilities;

@layer base {
html {
font-family: Lato, sans-serif
}
:root {
--background: 0 0% 100%;
--background: 210 40% 98%;
--foreground: 222.2 84% 4.9%;

--card: 0 0% 100%;
--card-foreground: 222.2 84% 4.9%;

--popover: 0 0% 100%;
--popover-foreground: 222.2 84% 4.9%;
--primary: 222.2 47.4% 11.2%;

--primary: 187 92% 20%;
--primary-foreground: 210 40% 98%;
--secondary: 210 40% 96.1%;
--secondary-foreground: 222.2 47.4% 11.2%;

--secondary: 0 2% 46%;
--secondary-foreground: 210 40% 98%;

--muted: 210 40% 96.1%;
--muted-foreground: 215.4 16.3% 46.9%;
--accent: 210 40% 96.1%;
--accent-foreground: 222.2 47.4% 11.2%;

--accent: 84 47% 53%;
--accent-foreground: 222.2 84% 4.9%;

--destructive: 0 84.2% 60.2%;
--destructive-foreground: 210 40% 98%;

--border: 214.3 31.8% 91.4%;
--input: 214.3 31.8% 91.4%;
--ring: 222.2 84% 4.9%;
--chart-1: 12 76% 61%;
--chart-2: 173 58% 39%;
--chart-3: 197 37% 24%;
--chart-4: 43 74% 66%;
--chart-5: 27 87% 67%;
--radius: 0.5rem

--radius: 0.5rem;
}

.dark {
--background: 222.2 84% 4.9%;
--foreground: 210 40% 98%;

--card: 222.2 84% 4.9%;
--card-foreground: 210 40% 98%;

--popover: 222.2 84% 4.9%;
--popover-foreground: 210 40% 98%;
--primary: 210 40% 98%;

--primary: 187 92% 20%;
--primary-foreground: 222.2 47.4% 11.2%;
--secondary: 217.2 32.6% 17.5%;

--secondary: 0 2% 46%;
--secondary-foreground: 210 40% 98%;

--muted: 217.2 32.6% 17.5%;
--muted-foreground: 215 20.2% 65.1%;
--accent: 217.2 32.6% 17.5%;

--accent: 84 47% 53%;
--accent-foreground: 210 40% 98%;

--destructive: 0 62.8% 30.6%;
--destructive-foreground: 210 40% 98%;

--border: 217.2 32.6% 17.5%;
--input: 217.2 32.6% 17.5%;
--ring: 212.7 26.8% 83.9%;
--chart-1: 220 70% 50%;
--chart-2: 160 60% 45%;
--chart-3: 30 80% 55%;
--chart-4: 280 65% 60%;
--chart-5: 340 75% 55%
}
}

@layer base {
* {
@apply border-border;
}
body {
@apply bg-background text-foreground;
}
}
6 changes: 1 addition & 5 deletions next-app/src/app/ragnar/answer/page.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
"use client";

import { ReactElement } from "react";
import { BODY_CLASSES } from "@/constants";
import { TrackPageViewIfEnabled } from "@/util/cookiesHandling";
import { ILink } from "@/interfaces/types";
import Link from "next/link";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import {
Card,
CardContent,
CardDescription,
CardHeader,
CardTitle,
Expand All @@ -18,8 +16,6 @@ import { Search, Terminal } from "lucide-react";

import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";

const RAGnarLogo = "/images/RAGnar.svg";

export default function RAGAnswerPage(): ReactElement {
TrackPageViewIfEnabled();

Expand All @@ -33,7 +29,7 @@ export default function RAGAnswerPage(): ReactElement {
<div className="text-sm breadcrumbs">
<ul>
{Object.keys(breadcrumbs).map((key) => (
<li>
<li key={key}>
{breadcrumbs[key].link ? (
<Link href={breadcrumbs[key].link}>
{breadcrumbs[key].text}
Expand Down
5 changes: 1 addition & 4 deletions next-app/src/app/ragnar/ask/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"use client";

import { ReactElement } from "react";
import { BODY_CLASSES } from "@/constants";
import { TrackPageViewIfEnabled } from "@/util/cookiesHandling";
import { ILink } from "@/interfaces/types";
import Link from "next/link";
Expand All @@ -10,8 +9,6 @@ import { Input } from "@/components/ui/input";
import { Card, CardContent } from "@/components/ui/card";
import { Search } from "lucide-react";

const RAGnarLogo = "/images/RAGnar.svg";

export default function RAGAskPage(): ReactElement {
TrackPageViewIfEnabled();

Expand All @@ -25,7 +22,7 @@ export default function RAGAskPage(): ReactElement {
<div className="text-sm breadcrumbs">
<ul>
{Object.keys(breadcrumbs).map((key) => (
<li>
<li key={key}>
{breadcrumbs[key].link ? (
<Link href={breadcrumbs[key].link}>
{breadcrumbs[key].text}
Expand Down
Loading

0 comments on commit a5a3946

Please sign in to comment.