Skip to content

Commit

Permalink
Merge pull request #7 from verdigado/task/3_change-appearance
Browse files Browse the repository at this point in the history
Customize Styling
  • Loading branch information
NikoHadouken authored Aug 29, 2024
2 parents f404cc1 + bab1f08 commit 7a92b1a
Show file tree
Hide file tree
Showing 7 changed files with 227 additions and 16 deletions.
2 changes: 1 addition & 1 deletion apps/web/public/logo-mark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 6 additions & 2 deletions apps/web/src/app/[locale]/(admin)/termite-alert.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export function TermiteAlert() {
}

return (
<Alert className="mt-4" icon={InfoIcon}>
<Alert className="termite-alert my-4" icon={InfoIcon}>
<AlertTitle>Herzlich Willkommen bei der neuen Termite! 🎉</AlertTitle>
<AlertDescription>
<p className="mt-4">
Expand All @@ -31,7 +31,11 @@ export function TermiteAlert() {
<p>
Eure bisherigen Umfragen wurden archiviert. Ihr könnt sie noch bis zum
15.09.2024{" "}
<a href="https://framadate.gruene.verdigado.net/" target="_blank">
<a
className="text-link"
href="https://framadate.gruene.verdigado.net/"
target="_blank"
>
hier
</a>{" "}
einsehen und herunterladen.
Expand Down
5 changes: 5 additions & 0 deletions apps/web/src/app/[locale]/(auth)/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import { TermiteAlert } from "@/app/[locale]/(admin)/termite-alert";

export default function Layout({ children }: { children: React.ReactNode }) {
return (
<div className="h-full p-3 sm:p-8">
<div className="mx-auto max-w-4xl mb-10">
<TermiteAlert />
</div>
<div className="mx-auto max-w-lg">{children}</div>
</div>
);
Expand Down
1 change: 1 addition & 0 deletions apps/web/src/app/[locale]/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import "tailwindcss/tailwind.css";
import "../../style.css";
import "../../verdigado-styles.css";

import languages from "@rallly/languages";
import { Toaster } from "@rallly/ui/toaster";
Expand Down
1 change: 1 addition & 0 deletions apps/web/src/pages/_app.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import "react-big-calendar/lib/css/react-big-calendar.css";
import "tailwindcss/tailwind.css";
import "../style.css";
import "../verdigado-styles.css"

import { TooltipProvider } from "@rallly/ui/tooltip";
import { domMax, LazyMotion } from "framer-motion";
Expand Down
185 changes: 185 additions & 0 deletions apps/web/src/verdigado-styles.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,185 @@
/* GENERIC STYLES */
body {
color: #003221;
background: #E5F3EB;
}

.bg-gray-200 {
background: #E5F3EB;
}

button,
a {
transition: all .3s;
}

/* buttons */
button.bg-primary,
button.bg-gray-50:not(.rounded-none),
a.bg-primary {
border-radius: 2rem !important;
padding-left: 1.5rem !important;
padding-right: 1.5rem !important;
}

button:focus,
button:active,
a.bg-primary:focus,
a.bg-primary:active,
input:focus-visible {
box-shadow: 0 0 1px 2px #0BA1DD !important;
}

button.bg-primary,
a.bg-primary {
color: white;
}

button.bg-primary svg,
a.bg-primary svg {
fill: white;
stroke: white;
}

button.bg-primary:hover,
button.bg-primary:focus,
button.bg-primary:active,
a.bg-primary:hover,
a.bg-primary:focus,
a.bg-primary:active {
border-color: #FFF17A;
background-color: #FFF17A;
color: #002216;
}

button.bg-primary:hover svg,
button.bg-primary:focus svg,
button.bg-primary:active svg,
a.bg-primary:hover svg,
a.bg-primary:focus svg,
a.bg-primary:active svg {
fill: #002216;
stroke: #002216;
}

button.bg-gray-50:not(.rounded-none) {
background: none;
border-color: #005437;
color: #005437;
}

button.bg-gray-50 svg {
fill: #005437;
stroke: #005437;
}

button.bg-gray-50:not(.rounded-none):hover,
button.bg-gray-50:not(.rounded-none):focus,
button.bg-gray-50:not(.rounded-none):active{
background-color: #005437;
color: white !important;
}

button.bg-gray-50:hover svg,
button.bg-gray-50:focus svg,
button.bg-gray-50:active svg {
fill: white;
stroke: white;
}

/* links */
.text-link {
color: #005437;
}

/* alert */
.termite-alert .lucide-info {
color: #005437;
}

/* LOGIN PAGE */

/* login page body */
body:has(.mx-auto.max-w-lg) {
background: #008939;
}

/* login page card */
.mx-auto.max-w-lg .rounded-lg .bg-pattern {
display: none;
}

/* login page footer */
.rounded-lg + .text-center,
.rounded-lg + .text-center .text-link {
color: white;
}

.rounded-lg + .text-center .text-link:hover,
.rounded-lg + .text-center .text-link:focus {
color: #FFF17A;
}

/* DASHBOARD */

/* sidebar */
.w-72 {
background: white;
box-shadow: 5px 5px 8px rgba(32, 29, 27, 0.1)
}

.hover\:bg-gray-200 {
color: #003221;
}

.hover\:bg-gray-200:hover,
.hover\:bg-gray-200:focus,
.hover\:bg-gray-200:active {
background-color: #E5F3EB;
}

/* main */
.w-72 + .grow a.bg-gray-50 {
border-radius: 2rem;
padding-left: 1.5rem;
padding-right: 1.5rem;
background: none;
border-color: #005437;
color: #005437;
}

.w-72 + .grow a.bg-gray-50:hover,
.w-72 + .grow a.bg-gray-50:focus,
.w-72 + .grow a.bg-gray-50:active {
background-color: #005437;
color: white;
}

.w-72 + .grow a.bg-gray-50:hover svg,
.w-72 + .grow a.bg-gray-50:focus svg,
.w-72 + .grow a.bg-gray-50:active svg {
fill: white;
stroke: white;
}

.w-72 + .grow a.bg-gray-50:focus,
.w-72 + .grow a.bg-gray-50:active {
box-shadow: 0 0 1px 2px #0BA1DD;
}

/* navbar */
body > div > div.sticky {
background-color: #005437;
color: white;
}

body > div > div.sticky button {
background: none !important;
box-shadow: none !important;
color: white !important;
}

body > div > div.sticky svg {
fill: white !important;
stroke: white !important;
}
41 changes: 28 additions & 13 deletions packages/tailwind-config/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,37 @@ module.exports = {
},
colors: {
primary: {
...colors.indigo,
DEFAULT: colors.indigo["600"],
foreground: colors.indigo["50"],
background: colors.indigo["50"],
'50': '#D5EEE6',
'100': '#BEDDD2',
'200': '#A6CCBF',
'300': '#8EBBAB',
'400': '#5F9885',
'500': '#2F765E',
'600': '#005437',
'700': '#00432C',
'800': '#003221',
'900': '#002216',
'950': '#002216',
DEFAULT: '#005437',
foreground: colors.white,
background: '#D5EEE6',
},
secondary: {
background: colors.gray["100"],
DEFAULT: colors.gray["100"],
foreground: colors.gray["700"],
foreground: '#003221',
},
gray: {
...colors.gray,
'50': colors.white,
'100': "#f5faf7",
'200': "#E5F3EB",
},
gray: colors.gray,
border: colors.gray["200"],
input: {
DEFAULT: colors.gray["200"],
background: colors.white,
foreground: colors.gray["700"],
foreground: '#003221',
},
ring: {
DEFAULT: colors.gray["300"],
Expand All @@ -45,23 +60,23 @@ module.exports = {
foreground: colors.rose["50"],
},
background: colors.white,
foreground: colors.gray["700"],
foreground: '#003221',
accent: {
DEFAULT: colors.gray["100"],
DEFAULT: "#E5F3EB",
},
muted: {
DEFAULT: colors.gray["100"],
background: colors.gray["50"],
DEFAULT: "#E5F3EB",
background: "#E5F3EB",
foreground: colors.gray["500"],
},
popover: {
DEFAULT: colors.white,
foreground: colors.gray["700"],
foreground: '#003221',
},
card: {
DEFAULT: colors.white,
background: colors.white,
foreground: colors.gray["700"],
foreground: '#003221',
},
},
keyframes: {
Expand Down

0 comments on commit 7a92b1a

Please sign in to comment.