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.

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

New UI #1

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
43 changes: 43 additions & 0 deletions client/src/components/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,46 @@
padding: var(--m) var(--m);
margin: auto;
}
/*
#root {
max-width: 900px;
margin: 0 auto;
padding: var(--m) var(--m);
text-align: left;
}

.logo {
height: 6em;
padding: 1.5em;
will-change: filter;
transition: filter 300ms;
}
.logo:hover {
filter: drop-shadow(0 0 2em #646cffaa);
}
.logo.react:hover {
filter: drop-shadow(0 0 2em #61dafbaa);
}

@keyframes logo-spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}

@media (prefers-reduced-motion: no-preference) {
a:nth-of-type(2) .logo {
animation: logo-spin infinite 20s linear;
}
}

.card {
padding: 2em;
}

.read-the-docs {
color: #888;
} */
4 changes: 4 additions & 0 deletions client/src/components/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ import { get, post } from "../utilities";
import { Outlet } from "react-router-dom";

// to use styles, import the necessary CSS files

// import "../utilities.css";
//import "./App.css";

import "../utilities.css";
import "./App.css";
import "../index.css";
Expand Down
3 changes: 3 additions & 0 deletions client/src/components/modules/Chat.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/* @tailwind base;
@tailwind components;
@tailwind utilities; */
/*@tailwind base;
@tailwind components;
@tailwind utilities;*/
Expand Down
7 changes: 6 additions & 1 deletion client/src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,10 @@ form {

/* @layer utilities {
.border-border {
border: 1px solid black;
}
.bg-background {
background-color: #f0f0f0;
border: 1px solid black;
}
.bg-background {
Expand All @@ -189,4 +193,5 @@ form {
.text-foreground {
color: #333333;
}
} */
}
}*/
13 changes: 7 additions & 6 deletions client/src/tailwind.css
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@tailwind utilities;

@layer utilities {
.border-border {
border: 2px solid black; /* Or your intended style */
border: 2px solid black;
}
.bg-background {
background-color: #f0f0f0; /* Or your intended background color */
}

background-color: #f0f0f0;
}
.text-foreground {
color: #333333; /* Or your intended text color */
color: #333333;
}
}


.bg-red-500 {
background-color: #ef4444;
}
Expand Down
7 changes: 4 additions & 3 deletions client/src/utilities.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@

@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,600");

/* @tailwind base;
/*@tailwind base;
@tailwind components;
@tailwind utilities;

@tailwind utilities; */
/*
:root {
--primary: #396dff;
--primary--dim: #6987db;
Expand Down Expand Up @@ -91,4 +92,4 @@ form {
.u-link:hover {
color: var(--primary--dim);
}
*/
*/