-
Notifications
You must be signed in to change notification settings - Fork 0
Integrate flowbite #7
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
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
94c393a
Basic test of flowbite.
Tallented-Code-bot dcab75b
Transition to using tailwindcss.
Tallented-Code-bot 664d26b
Add theme for tailwind.
Tallented-Code-bot 6e3cfa4
Improve the carousel on the front page.
Tallented-Code-bot 75132c4
Update the page to use flowbite and tailwindcss.
Tallented-Code-bot 66c9290
Update layout to use tailwind and flowbite.
Tallented-Code-bot 095267a
Update to use tailwindcss and flowbite.
Tallented-Code-bot 5a84de6
Fix text color.
Tallented-Code-bot ba79f0c
Get the site to work on mobile.
Tallented-Code-bot 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
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,5 @@ | ||
| { | ||
| "files.associations": { | ||
| "*.css": "tailwindcss" | ||
| } | ||
| } |
Large diffs are not rendered by default.
Oops, something went wrong.
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,187 +1,90 @@ | ||
| <script lang="ts"> | ||
| import './layout.css'; | ||
| import { Navbar, NavBrand, NavLi, NavUl, NavHamburger, Footer } from 'flowbite-svelte'; | ||
| import { FontAwesomeIcon } from '@fortawesome/svelte-fontawesome'; | ||
| import { faInstagram, faLinkedin, faGithub } from '@fortawesome/free-brands-svg-icons'; | ||
| import { faLocationDot } from '@fortawesome/free-solid-svg-icons'; | ||
|
|
||
| let { children } = $props(); | ||
| </script> | ||
|
|
||
| <header class="navbar"> | ||
| <a href="/"> | ||
| <img id="logo" src="/racing_logo.png" alt="Wazzu Racing's logo" /> | ||
| </a> | ||
|
|
||
| <div class="links-right"> | ||
| <a href="/about">About</a> | ||
| <!-- <a href="/cars">Cars</a> | ||
| <div class="dropdown" role="navigation" onmouseleave={closeMembersDropdown}> | ||
| <button | ||
| class="dropdown-toggle" | ||
| onclick={toggleMembersDropdown} | ||
| onmouseenter={() => (membersDropdownOpen = true)} | ||
| <Navbar class="bg-black px-4 py-2.5" fluid={true}> | ||
| <NavBrand href="/"> | ||
| <img src="/racing_logo.png" class="h-12 w-auto" alt="Wazzu Racing Logo" /> | ||
| </NavBrand> | ||
| <NavHamburger class="text-white hover:text-red-700 md:hidden" /> | ||
| <NavUl class="order-1 ml-auto bg-black md:order-0 md:space-x-4 md:bg-transparent"> | ||
| <NavLi | ||
| href="/about" | ||
| class="cursor-pointer text-xl text-white hover:text-red-700 md:py-0" | ||
| active={false}>About</NavLi | ||
| > | ||
| <NavLi | ||
| href="/contact" | ||
| class="cursor-pointer text-xl text-white hover:text-red-700 md:py-0" | ||
| active={false}>Contact</NavLi | ||
| > | ||
| <NavLi href="/donate" class="cursor-pointer md:py-0" active={false}> | ||
| <span class="rounded-md bg-red-700 px-4 py-2 text-xl text-white hover:bg-red-800">Donate</span | ||
| > | ||
| Members ▾ | ||
| </button> | ||
| {#if membersDropdownOpen} | ||
| <div class="dropdown-menu"> | ||
| <a href="/members/current" onclick={closeMembersDropdown}>Current Members</a> | ||
| <a href="/members/alumni" onclick={closeMembersDropdown}>Alumni</a> | ||
| </div> | ||
| {/if} | ||
| </div> --> | ||
| <!-- <a href="/calendar">Calendar</a> --> | ||
| <!-- TODO Coming soon --> | ||
| <!-- <a href="/sponsors">Sponsors</a> --> | ||
| <a href="/contact">Contact</a> | ||
| <a class="donate" href="/donate">Donate</a> | ||
| </div> | ||
| </header> | ||
| </NavLi> | ||
| </NavUl> | ||
| </Navbar> | ||
|
|
||
| <main class="main"> | ||
| {@render children?.()} | ||
| </main> | ||
| <main class="px-[10%]">{@render children?.()}</main> | ||
|
|
||
| <footer class="footer"> | ||
| <div class="college"> | ||
| <div id="vcea"> | ||
| <a href="https://vcea.wsu.edu/"> | ||
| <Footer class="bg-gray-800"> | ||
| <div class="flex w-full flex-col items-center justify-between gap-6 px-8 py-6 sm:flex-row"> | ||
| <div class="flex items-center"> | ||
| <a href="https://vcea.wsu.edu/" target="_blank" rel="noopener noreferrer"> | ||
| <img | ||
| src="/vcea.png" | ||
| alt="Logo for the Voiland College of Engineering and Architecture" | ||
| /></a | ||
| > | ||
| alt="Voiland College of Engineering and Architecture" | ||
| class="h-auto w-48 sm:w-64" | ||
| /> | ||
| </a> | ||
| </div> | ||
|
|
||
| <div id="social-icons"> | ||
| <div class="flex items-center gap-6"> | ||
| <a | ||
| href="https://www.instagram.com/wazzu_racing" | ||
| target="_blank" | ||
| rel="noopener noreferrer" | ||
| aria-label="Instagram" | ||
| class="text-white transition-colors hover:text-red-700" | ||
| > | ||
| <FontAwesomeIcon icon={faInstagram} size="2x" /> | ||
| </a> | ||
|
|
||
| <a | ||
| href="https://www.linkedin.com/company/wazzu-racing/" | ||
| target="_blank" | ||
| rel="noopener noreferrer" | ||
| aria-label="LinkedIn" | ||
| class="text-white transition-colors hover:text-red-700" | ||
| > | ||
| <FontAwesomeIcon icon={faLinkedin} size="2x" /> | ||
| </a> | ||
|
|
||
| <a | ||
| href="https://github.com/wazzu-racing" | ||
| target="_blank" | ||
| rel="noopener noreferrer" | ||
| aria-label="GitHub" | ||
| class="text-white transition-colors hover:text-red-700" | ||
| > | ||
| <FontAwesomeIcon icon={faGithub} size="2x" /> | ||
| </a> | ||
|
|
||
| <a | ||
| href="https://maps.app.goo.gl/JHnJ2f79Gac3HZfU7" | ||
| target="_blank" | ||
| rel="noopener noreferrer" | ||
| aria-label="Location" | ||
| class="text-white transition-colors hover:text-red-700" | ||
| > | ||
| <FontAwesomeIcon icon={faLocationDot} size="2x" /> | ||
| </a> | ||
| </div> | ||
| </div> | ||
| </footer> | ||
|
|
||
| <style> | ||
| .main { | ||
| padding-left: 10%; | ||
| padding-right: 10%; | ||
| } | ||
|
|
||
| .footer { | ||
| background-color: var(--primary-gray); | ||
| display: flex; | ||
| flex-direction: column; | ||
| } | ||
|
|
||
| .college { | ||
| padding-top: 15px; | ||
| padding-bottom: 15px; | ||
| padding-left: 2vw; | ||
| padding-right: 2vw; | ||
| display: flex; | ||
| } | ||
|
|
||
| #vcea { | ||
| display: flex; | ||
| align-content: center; | ||
| width: 100%; | ||
| } | ||
|
|
||
| #vcea img { | ||
| display: flex; | ||
| align-content: center; | ||
| justify-content: center; | ||
| width: 20vw; | ||
| } | ||
|
|
||
| #social-icons { | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: right; | ||
| gap: 24px; | ||
| width: 100%; | ||
| } | ||
|
|
||
| #social-icons a { | ||
| color: var(--secondary-white); | ||
| transition: color 0.3s ease; | ||
| } | ||
|
|
||
| #social-icons a:hover { | ||
| color: var(--primary-crimson); | ||
| } | ||
|
|
||
| .navbar { | ||
| background-color: black; | ||
| overflow: visible; | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: flex-start; | ||
| } | ||
|
|
||
| .links-right { | ||
| margin-left: auto; | ||
|
|
||
| display: flex; | ||
| } | ||
|
|
||
| .navbar a { | ||
| font-family: Verdana, Arial, Helvetica, sans-serif; | ||
| font-weight: 300; | ||
| display: block; | ||
| margin: auto 14px; | ||
| color: var(--secondary-white); | ||
| text-align: center; | ||
| text-decoration: none; | ||
| font-size: 14pt; | ||
| } | ||
|
|
||
| .navbar a img { | ||
| width: 16vw; | ||
| } | ||
|
|
||
| .navbar a:hover { | ||
| color: var(--primary-crimson); | ||
| } | ||
|
|
||
| #logo { | ||
| /*height: 50%;*/ | ||
| height: 6vh; | ||
| width: auto; | ||
| /*position: relative;*/ | ||
| } | ||
|
|
||
| .donate { | ||
| background-color: var(--primary-crimson); | ||
| border-radius: 5px; | ||
| padding: 10px; | ||
| } | ||
| </style> | ||
| </Footer> |
Oops, something went wrong.
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.
flowbite-sveltedepends onflowbite^3.1.2(seepackage-lock.jsonentries forflowbite-svelte), but this PR adds a direct dependency onflowbite^4.0.1. This installs multipleflowbiteversions and can cause plugin/runtime mismatches. Align the top-levelflowbiteversion with whatflowbite-svelteexpects (or drop the directflowbitedependency if it’s only needed transitively).