Skip to content
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.

Sign up for GitHub

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

SUM-45 | @rebeccahongsf | Theme & style header #3

Merged
merged 21 commits into from
May 6, 2024
Merged

SUM-45 | @rebeccahongsf | Theme & style header #3

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
cdce8e6
SUM-45 | @rebeccahongsf | style header
rebeccahongsf Apr 19, 2024
79b4a50
fixup
rebeccahongsf Apr 23, 2024
9d2d81a
tweak mobile colors and chevron size
rebeccahongsf Apr 24, 2024
d5b83d4
Merge branch '1.x' into feature/SUM-45--header
rebeccahongsf Apr 24, 2024
2382843
revert
rebeccahongsf Apr 24, 2024
94de0f3
fixup main menu dropdown stylng
rebeccahongsf Apr 24, 2024
818881b
add spacing to submenu
rebeccahongsf Apr 25, 2024
553b4ec
tweak top menu styles
rebeccahongsf Apr 25, 2024
9951233
adjust mobile menu styles
rebeccahongsf Apr 25, 2024
00ddea3
remove parentheses
rebeccahongsf Apr 25, 2024
72fe75e
fixup formatting
rebeccahongsf Apr 25, 2024
e1e98a2
fixup formatting
rebeccahongsf Apr 25, 2024
c3b4f5f
remove border on large
rebeccahongsf Apr 26, 2024
2e0effb
Merge branch '1.x' into feature/SUM-45--header
rebeccahongsf Apr 26, 2024
9d1857c
add header buttons
rebeccahongsf Apr 28, 2024
bb949f5
remove header buttons component; move two liners into page header and…
rebeccahongsf May 1, 2024
8555d3e
add types; fixup button order and style
rebeccahongsf May 2, 2024
2ed7e13
fixup lint err
rebeccahongsf May 2, 2024
940a2f4
Pass in primary and secondary button props
rebeccahongsf May 3, 2024
76c3a21
Pass in primary and secondary button props
rebeccahongsf May 3, 2024
208d38c
fixup lint err
rebeccahongsf May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/elements/lockup/lockup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export const Lockup = ({

if (!suLockupEnabled) {
return (
<div className="py-10">
<div>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we probably don't need the div here. Less markup is often a good way to go. But if we do need it, totally fine. I've seen some videos that suggest to remove elements if there's no attributes, or use fragments: <>

<Link href="/" className="flex no-underline">
<div className="self-end">
<div className="lg:inline-block pr-2 mr-2 lg:border-r border-black">
Expand Down Expand Up @@ -99,7 +99,7 @@ export const Lockup = ({
case "none":
default:
return (
<div className="py-10">
<div>
<Link href="/"
className="flex flex-col lg:flex-row gap-4 no-underline">
<LockupLogo {...lockupProps}/>
Expand Down
12 changes: 6 additions & 6 deletions src/components/global/page-header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import SiteSearchForm from "@components/search/site-search-form";
import MainMenu from "@components/menu/main-menu";
import GlobalMessage from "@components/config-pages/global-message";
import Lockup from "@components/elements/lockup/lockup";
Expand Down Expand Up @@ -30,11 +29,12 @@ const PageHeader = async () => {
</div>
</div>
{globalMessageConfig && <GlobalMessage {...globalMessageConfig}/>}
<div className="relative shadow">
<div className="centered min-h-50 pr-24 lg:pr-0">
<div className="flex w-full justify-between">
<Lockup {...siteSettingsConfig} {...lockupSettingsConfig}/>
<SiteSearchForm className="hidden lg:block"/>
<div className="relative bg-fog-light">
<div className="w-full border-b-2">
<div className="centered min-h-50 pr-24 rs-py-2 lg:pr-0">
<div className="flex w-full justify-between">
<Lockup {...siteSettingsConfig} {...lockupSettingsConfig}/>
</div>
</div>
</div>

Expand Down
Loading