Skip to content

Update header to include fontawesome and fix navbar scrolling issue #1447

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

Merged
merged 3 commits into from
Jan 17, 2025
Merged

Update header to include fontawesome and fix navbar scrolling issue #1447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5218e98
build: updated header-footer and license inclusions
davidornelas11 Jan 16, 2025
b152ac8
fix(component-header-footer): fix header navbar not hiding
davidornelas11 Jan 16, 2025
5bc4ee5
chore: update yarn.lock
mlsamuelson Jan 17, 2025
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
6 changes: 3 additions & 3 deletions packages/app-degree-pages/vite.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ export default defineConfig({
},
},
},
minify: false,
minify: true,
},
esbuild: {
legalComments: 'none',
keepNames: true,
legalComments: 'eof',
keepNames: false,
},
define: {
process: {env: {NODE_ENV: process.env.NODE_ENV}},
Expand Down
2 changes: 1 addition & 1 deletion packages/app-webdir-ui/vite.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default defineConfig({
minify: true,
},
esbuild: {
legalComments: 'none',
legalComments: 'eof',
keepNames: false,
},
define: {
Expand Down
6 changes: 4 additions & 2 deletions packages/component-header-footer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,13 @@
"postdocs": "node ../../scripts/process-readme-props.js",
"build-storybook": "storybook build -o ../../build/$npm_package_name"
},
"peerDependencies": {
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^6.4.2",
"@fortawesome/free-brands-svg-icons": "^6.4.2",
"@fortawesome/free-solid-svg-icons": "^6.4.2",
"@fortawesome/react-fontawesome": "^0.2.0",
"@fortawesome/react-fontawesome": "^0.2.0"
},
"peerDependencies": {
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
Expand Down
17 changes: 5 additions & 12 deletions packages/component-header-footer/src/header/header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import { Header, HeaderDiv } from "./header.styles";
*/

const ASUHeader = ({
isPartner,
isPartner = false,
navTree: rawNavTree,
title,
baseUrl,
baseUrl = "/",
parentOrg,
parentOrgUrl,
partnerLogo,
Expand All @@ -34,9 +34,9 @@ const ASUHeader = ({
logoutLink,
onLogoutClick,
buttons,
breakpoint,
breakpoint = "Xl",
animateTitle,
expandOnHover,
expandOnHover = false,
mobileNavTree: rawMobileNavTree,
searchUrl,
site,
Expand Down Expand Up @@ -90,7 +90,7 @@ const ASUHeader = ({
const Wrapper = renderDiv === "true" ? HeaderDiv : Header;

return (
<Wrapper id="asuHeader" ref={headerRef}>
<Wrapper id="asuHeader" ref={headerRef} breakpoint={breakpoint}>
<HeaderMain />
</Wrapper>
);
Expand Down Expand Up @@ -130,11 +130,4 @@ const ASUHeader = ({

ASUHeader.propTypes = { ...HeaderPropTypes };

ASUHeader.defaultProps = {
isPartner: false,
baseUrl: "/",
breakpoint: "Xl",
expandOnHover: false,
};

export { ASUHeader };
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,10 @@ __metadata:
"@babel/plugin-syntax-jsx": "npm:^7.14.5"
"@babel/plugin-transform-react-jsx": "npm:^7.13.12"
"@babel/plugin-transform-runtime": "npm:^7.14.5"
"@fortawesome/fontawesome-svg-core": "npm:^6.4.2"
"@fortawesome/free-brands-svg-icons": "npm:^6.4.2"
"@fortawesome/free-solid-svg-icons": "npm:^6.4.2"
"@fortawesome/react-fontawesome": "npm:^0.2.0"
"@storybook/addon-a11y": "npm:^7.6.14"
"@storybook/addon-essentials": "npm:^7.6.14"
"@storybook/addon-links": "npm:^7.6.14"
Expand Down Expand Up @@ -382,10 +386,6 @@ __metadata:
webpack-filter-warnings-plugin: "npm:^1.2.1"
webpack-merge: "npm:^5.8.0"
peerDependencies:
"@fortawesome/fontawesome-svg-core": ^6.4.2
"@fortawesome/free-brands-svg-icons": ^6.4.2
"@fortawesome/free-solid-svg-icons": ^6.4.2
"@fortawesome/react-fontawesome": ^0.2.0
react: ^18.3.1
react-dom: ^18.3.1
languageName: unknown
Expand Down