Skip to content

Commit 9c582a8

Browse files
authored
Merge pull request #944 from polkadot-fellows/nik-alter-all-theme
2 parents 71cdfb8 + ff01ec0 commit 9c582a8

File tree

19 files changed

+199
-216
lines changed

19 files changed

+199
-216
lines changed

eslint.config.mjs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,7 @@ export default [
5050
},
5151
rules: {
5252
'react-hooks/rules-of-hooks': 'error',
53-
'react-hooks/exhaustive-deps': [
54-
'warn',
55-
{
56-
additionalHooks: '(useTheme)',
57-
},
58-
],
53+
'react-hooks/exhaustive-deps': 'warn',
5954
'react-refresh/only-export-components': [
6055
'warn',
6156
{ allowConstantExport: true },

src/App.tsx

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@ import { Toaster } from '@/components/ui/sonner'
77
import '@/App.css'
88
import '@/index.css'
99
import { Content } from '@/Content'
10-
import { useState } from 'react'
10+
import { Footer } from '@/footer'
1111
import { AccountContextProvider } from './contexts/AccountContextProvider'
1212

1313
const App = () => {
14-
const [lightClientLoaded, setLightClientLoaded] = useState<boolean>(false)
15-
1614
const [settings] = useLocalStorage('fellowship-settings', {
1715
themeMode: 'light',
1816
})
@@ -23,16 +21,11 @@ const App = () => {
2321
<AccountContextProvider>
2422
<TooltipProvider>
2523
<div className="bg-muted/40 flex min-h-screen w-full flex-col">
26-
<Navigation
27-
lightClientLoaded={lightClientLoaded}
28-
setLightClientLoaded={setLightClientLoaded}
29-
/>
30-
<div className="flex flex-col sm:gap-4 sm:py-4 sm:pl-56">
31-
<Header
32-
lightClientLoaded={lightClientLoaded}
33-
setLightClientLoaded={setLightClientLoaded}
34-
/>
24+
<Navigation />
25+
<div className="mb-24 flex flex-col pb-24 sm:gap-4 sm:py-4 sm:pl-56">
26+
<Header />
3527
<Content />
28+
<Footer />
3629
</div>
3730
</div>
3831
</TooltipProvider>

src/assets/img/newLogo-black.png

1.79 KB
Loading

src/assets/img/newLogo-white.png

4.09 KB
Loading

src/assets/img/newLogo.svg

Lines changed: 16 additions & 0 deletions
Loading

src/assets/img/newLogoBlack.svg

Lines changed: 17 additions & 0 deletions
Loading
Lines changed: 16 additions & 0 deletions
Loading

src/components/ui/button.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ import { cva, type VariantProps } from 'class-variance-authority'
66
import { cn } from '@/lib/utils'
77

88
const buttonVariants = cva(
9-
'inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
9+
'inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 cursor-pointer',
1010
{
1111
variants: {
1212
variant: {
13-
default: 'bg-primary text-primary-foreground hover:bg-primary/90',
13+
default:
14+
'bg-secondary text-primary-foreground hover:text-secondary hover:bg-primary/90',
1415
destructive:
1516
'bg-destructive text-destructive-foreground hover:bg-destructive/90',
1617
outline:

src/components/ui/sonner.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable react-hooks/exhaustive-deps */
21
import { useTheme } from 'next-themes'
32
import { Toaster as Sonner } from 'sonner'
43

src/consts.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ type RankInfoType = {
3131
salary: number
3232
}
3333
const reusableH1 =
34-
'font-unbounded text-primary flex-1 shrink-0 whitespace-nowrap text-xl font-semibold tracking-tight sm:grow-0'
34+
'font-dm-serif text-primary flex-1 shrink-0 whitespace-nowrap text-xl font-semibold tracking-tight sm:grow-0'
3535

3636
// Page constants
3737
const rankInfo: RankInfoType[] = [

0 commit comments

Comments
 (0)