Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

move some stuff to tailwind theme

Blue Mouse5ab4c82f8934
diff --git a/web/app/root.tsx b/web/app/root.tsx
index 4b2c4b2aa..8a8d3f8c6 100644
--- a/web/app/root.tsx
+++ b/web/app/root.tsx
@@ -18,7 +18,7 @@ import { ExternalScripts } from 'remix-utils/external-scripts'
import { getCookie, generateCookieString } from '~/utils/cookie'
import { ExclamationTriangleIcon, ChevronDownIcon, ChevronUpIcon } from '@heroicons/react/24/outline'
import { Provider } from 'react-redux'
-import clsx from 'clsx'
+import cx from 'clsx'
import _replace from 'lodash/replace'
import BillboardCss from 'billboard.js/dist/billboard.min.css'
@@ -89,14 +89,14 @@ export function ErrorBoundary() {
</head>
<body>
{/* Using style because for some reason min-h-screen doesn't work */}
- <div style={{ minHeight: '100vh' }} className='flex flex-col bg-gray-50 pb-12 pt-16 dark:bg-slate-900'>
+ <div style={{ minHeight: '100vh' }} className='flex flex-col bg-gray-50 pt-16 pb-12 dark:bg-slate-900'>
<div className='mx-auto flex w-full max-w-7xl flex-grow flex-col justify-center px-4 sm:px-6 lg:px-8'>
<div className='flex shrink-0 justify-center'>
<ExclamationTriangleIcon className='h-24 w-auto text-yellow-400 dark:text-yellow-600' />
</div>
<div className='py-8'>
<div className='text-center'>
- <h1 className='text-4xl font-extrabold tracking-tight text-gray-900 dark:text-gray-50 sm:text-5xl'>
+ <h1 className='text-4xl font-extrabold tracking-tight text-gray-900 sm:text-5xl dark:text-gray-50'>
Uh-oh..
</h1>
<p className='mt-2 text-base font-medium text-gray-800 dark:text-gray-300'>
@@ -133,7 +133,7 @@ export function ErrorBoundary() {
)}
</span>
{crashStackShown && (
- <span className='whitespace-pre-line text-sm text-gray-600 dark:text-gray-400'>
+ <span className='text-sm whitespace-pre-line text-gray-600 dark:text-gray-400'>
{error.stack}
</span>
)}
@@ -226,7 +226,7 @@ export default function App() {
useChangeLanguage(locale)
return (
- <html className={theme} lang={locale} dir={i18n.dir()}>
+ <html className={cx('font-swetrix antialiased', theme)} lang={locale} dir={i18n.dir()}>
<head>
<meta charSet='utf-8' />
<SEO />
@@ -255,7 +255,7 @@ export default function App() {
/>
</head>
<body
- className={clsx({
+ className={cx({
'bg-white': theme === 'light',
'bg-slate-900': theme === 'dark',
})}
diff --git a/web/app/styles/index.css b/web/app/styles/index.css
index 90e4dfef4..369b619c3 100644
--- a/web/app/styles/index.css
+++ b/web/app/styles/index.css
@@ -1,11 +1,3 @@
-body {
- height: 100%;
- margin: 0;
- padding: 0;
- width: 100%;
- -webkit-font-smoothing: antialiased;
-}
-
.loader-head {
background-color: #c6dafc;
height: 4px;
@@ -81,27 +73,6 @@ body {
}
}
-html {
- font-family:
- 'Inter',
- 'Cantarell',
- 'Roboto',
- system-ui,
- -apple-system,
- BlinkMacSystemFont,
- 'Helvetica Neue',
- 'Oxygen',
- 'Ubuntu',
- sans-serif;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
- scroll-behavior: smooth;
-}
-
-body {
- margin: 0;
-}
-
.scrollbar-thin {
scrollbar-width: thin;
}
diff --git a/web/app/styles/tailwind.css b/web/app/styles/tailwind.css
index 1498591b3..3f177daeb 100644
--- a/web/app/styles/tailwind.css
+++ b/web/app/styles/tailwind.css
@@ -4,6 +4,9 @@
@plugin "@tailwindcss/typography";
@theme {
+ /* Fonts */
+ --font-swetrix: 'Inter', 'Cantarell', 'Roboto', system-ui, -apple-system, BlinkMacSystemFont, 'Helvetica Neue', 'Oxygen', 'Ubuntu', sans-serif;
+
/* Colors */
--color-gray-750: oklch(23.11% 0.0357 262.54); /* Converting #141d2e to OKLCH */
@@ -29,6 +32,11 @@
.animate-ping-slow {
animation: ping-op 3s cubic-bezier(0, 0, 0.2, 1) infinite;
}
+
+ .antialiased {
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ }
}
@custom-variant dark (&:where(.dark, .dark *));