-
Notifications
You must be signed in to change notification settings - Fork 2
Feature/#50 setup base theme typography and main layout #51
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
Merged
brauliodiez
merged 5 commits into
main
from
feature/#50-setup-base-theme-typography-and-main-layout
Dec 3, 2025
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
57cabd8
feat(#50): add Nunito Sans font, Prettier and Tailwind CSS plugin for…
gustedeveloper bd95b95
feat(#50): defined a custom DaisyUI theme, established base styles fo…
gustedeveloper c314196
feat(#50): add header and footer components with logo and navigation …
gustedeveloper d751776
feat(#50): integrate header and footer components in layout, apply cu…
gustedeveloper 09996ca
remove dummy paragraph
gustedeveloper File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "plugins": ["prettier-plugin-tailwindcss"] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,88 @@ | ||
| @import "tailwindcss"; | ||
| @plugin "daisyui"; | ||
|
|
||
| @import "@fontsource/nunito-sans/400.css"; | ||
| @import "@fontsource/nunito-sans/500.css"; | ||
| @import "@fontsource/nunito-sans/600.css"; | ||
|
|
||
| @plugin "daisyui/theme" { | ||
| name: "info-embalse"; | ||
| default: true; | ||
| color-scheme: light; | ||
|
|
||
| --color-primary: #1b9aaa; | ||
| --color-accent: #d9d900; | ||
|
|
||
| --color-base-100: #feffff; /* White background */ | ||
| --color-base-200: #eaeaea; /* Grey background */ | ||
| --color-base-content: #060d14; /* Text color */ | ||
| } | ||
|
|
||
| @theme { | ||
| --font-sans: "Nunito Sans", sans-serif; | ||
|
|
||
| /* Title color */ | ||
| --color-title: #051c1f; | ||
|
|
||
| /* Accesible visited link color */ | ||
| --color-visited-link: #257782; | ||
|
|
||
| /*Primary color palette*/ | ||
|
|
||
| --color-brand-50: #e8f5f7; | ||
| --color-brand-100: #d1ebee; | ||
| --color-brand-200: #a4d7dd; | ||
| --color-brand-300: #76c2cc; | ||
| --color-brand-400: #49aebb; | ||
| --color-brand-500: #1b9aaa; /* Primary color */ | ||
| --color-brand-600: #167b88; | ||
| --color-brand-700: #105c66; | ||
| --color-brand-800: #0b3e44; | ||
| --color-brand-900: #051f22; | ||
| --color-brand-950: #01161a; | ||
| } | ||
|
|
||
| @layer base { | ||
| h1, | ||
| h2, | ||
| h3, | ||
| h4, | ||
| h5, | ||
| h6 { | ||
| @apply text-title opacity-95; | ||
| } | ||
|
|
||
| p, | ||
| body { | ||
| @apply opacity-85; | ||
| } | ||
|
|
||
| /* H1 Title 36px */ | ||
| h1 { | ||
| @apply text-4xl leading-none font-semibold; | ||
| } | ||
|
|
||
| /* H2 Title 28px */ | ||
| h2 { | ||
| @apply text-[28px] leading-normal font-semibold; | ||
| } | ||
|
|
||
| /* H3 Subtitle 24px */ | ||
| h3 { | ||
| @apply text-2xl leading-none font-medium; | ||
| } | ||
|
|
||
| /* Text 14px */ | ||
| p, | ||
| body { | ||
| @apply text-base-content text-base leading-normal font-normal; | ||
| } | ||
| } | ||
|
|
||
| @layer utilities { | ||
| /*Accesible link */ | ||
|
|
||
| .link-accessible { | ||
| @apply link text-title visited:text-visited-link font-bold opacity-95; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| import Link from "next/link"; | ||
| import { FC } from "react"; | ||
|
|
||
| export const FooterComponent: FC = () => { | ||
| return ( | ||
| <footer className="bg-base-100"> | ||
| <div className="border-accent flex flex-col items-center gap-2 border-t-2 p-3"> | ||
| <div className="flex flex-col items-center gap-2 pb-[10px]"> | ||
| <Link | ||
| href="/embalse-provincia" | ||
| className="link-accessible text-[15px] leading-none font-normal" | ||
| > | ||
| Embalses por provincias | ||
| </Link> | ||
|
|
||
| <div className="flex justify-between gap-2"> | ||
| <Link | ||
| href="/aviso-legal" | ||
| className="link-accessible text-sm font-normal" | ||
| > | ||
| Aviso Legal | ||
| </Link> | ||
| <Link | ||
| href="/politica-cookies" | ||
| className="link-accessible text-sm font-normal" | ||
| > | ||
| Política de cookies | ||
| </Link> | ||
| </div> | ||
| </div> | ||
|
|
||
| <p className="text-xs leading-none font-normal"> | ||
| Infoembalse © 2025 Todos los derechos reservados | ||
| </p> | ||
| </div> | ||
| </footer> | ||
| ); | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| import { FC } from "react"; | ||
|
|
||
| export const HeaderComponent: FC = () => { | ||
| return ( | ||
| <header className="bg-base-100"> | ||
| <div className="border-accent flex h-[60px] items-center border-b-3 pl-5"> | ||
| <img src="/images/logo.svg" alt="InfoEmbalse logo" /> | ||
| </div> | ||
| </header> | ||
| ); | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| export * from "./header.component"; | ||
| export * from "./footer.component"; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@gustedeveloper Remove dummy paragraph
<h2>Detalle del embalse: {embalse}</h2> - <p>Hola hgola h uhfrf hfueh</p>There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done! @brauliodiez