From 0063eaec5006c7f6a218b57983420c1d4e6d3452 Mon Sep 17 00:00:00 2001 From: Titani Date: Tue, 11 Jul 2023 15:47:49 -0400 Subject: [PATCH 1/2] chore(docs): Update pf logos in masthead and full page demos --- .../components/Masthead/examples/Masthead.md | 8 +- .../Masthead/examples/pf-logo-small.svg | 23 ----- .../components/Masthead/examples/pf-logo.svg | 28 ++++++ packages/react-core/src/demos/Masthead.md | 1 + packages/react-core/src/demos/Nav.md | 87 ++++++------------- .../NotificationDrawer/NotificationDrawer.md | 10 +-- packages/react-core/src/demos/Page.md | 3 +- .../react-core/src/demos/Wizard/WizardDemo.md | 10 +-- .../react-core/src/demos/Wizard/imgBrand.svg | 1 - .../react-core/src/demos/assets/pf-logo.svg | 28 ++++++ .../src/demos/examples/DashboardHeader.js | 13 ++- ...stheadWithUtilitiesAndUserDropdownMenu.tsx | 10 +-- .../Page/PageStickySectionBreadcrumb.tsx | 15 ++-- .../examples/Page/PageStickySectionGroup.tsx | 15 ++-- .../Page/PageStickySectionGroupAlternate.tsx | 14 ++- .../src/demos/examples/pfColorLogo.svg | 33 ------- 16 files changed, 124 insertions(+), 175 deletions(-) delete mode 100644 packages/react-core/src/components/Masthead/examples/pf-logo-small.svg create mode 100644 packages/react-core/src/components/Masthead/examples/pf-logo.svg delete mode 100644 packages/react-core/src/demos/Wizard/imgBrand.svg create mode 100644 packages/react-core/src/demos/assets/pf-logo.svg delete mode 100644 packages/react-core/src/demos/examples/pfColorLogo.svg diff --git a/packages/react-core/src/components/Masthead/examples/Masthead.md b/packages/react-core/src/components/Masthead/examples/Masthead.md index 0f3460d8d12..cfba75f1f9c 100644 --- a/packages/react-core/src/components/Masthead/examples/Masthead.md +++ b/packages/react-core/src/components/Masthead/examples/Masthead.md @@ -7,7 +7,7 @@ propComponents: ['Masthead', 'MastheadToggle', 'MastheadMain', 'MastheadBrand', import BarsIcon from '@patternfly/react-icons/dist/js/icons/bars-icon'; import { Link } from '@reach/router'; -import pfIcon from './pf-logo-small.svg'; +import pfIcon from './pf-logo.svg'; `Masthead` should contain the following components to maintain proper layout and formatting: `MastheadToggle`, `MastheadMain`, and `MastheadContent`. @@ -210,10 +210,10 @@ import BarsIcon from '@patternfly/react-icons/dist/js/icons/bars-icon'; ```ts import React from 'react'; -import { Masthead, MastheadToggle, MastheadMain, MastheadBrand, MastheadContent, Button } from '@patternfly/react-core'; +import { Masthead, MastheadToggle, MastheadMain, MastheadBrand, MastheadContent, Button, Brand } from '@patternfly/react-core'; import BarsIcon from '@patternfly/react-icons/dist/js/icons/bars-icon'; import { Link } from '@reach/router'; -import pfIcon from './pf-logo-small.svg'; +import pfIcon from './pf-logo.svg'; @@ -223,7 +223,7 @@ import pfIcon from './pf-logo-small.svg'; }> - Patterfly Logo + diff --git a/packages/react-core/src/components/Masthead/examples/pf-logo-small.svg b/packages/react-core/src/components/Masthead/examples/pf-logo-small.svg deleted file mode 100644 index 44c092431cb..00000000000 --- a/packages/react-core/src/components/Masthead/examples/pf-logo-small.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - Group 12 - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/react-core/src/components/Masthead/examples/pf-logo.svg b/packages/react-core/src/components/Masthead/examples/pf-logo.svg new file mode 100644 index 00000000000..a47a3cb740b --- /dev/null +++ b/packages/react-core/src/components/Masthead/examples/pf-logo.svg @@ -0,0 +1,28 @@ + + + PF-HorizontalLogo-Reverse + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/react-core/src/demos/Masthead.md b/packages/react-core/src/demos/Masthead.md index f3001b14af2..e6cfe3c948a 100644 --- a/packages/react-core/src/demos/Masthead.md +++ b/packages/react-core/src/demos/Masthead.md @@ -12,6 +12,7 @@ import ThIcon from '@patternfly/react-icons/dist/esm/icons/th-icon'; import QuestionCircleIcon from '@patternfly/react-icons/dist/esm/icons/question-circle-icon'; import imgAvatar from '@patternfly/react-core/src/components/Avatar/examples/avatarImg.svg'; import pfIcon from './Card/pf-logo-small.svg'; +import pfLogo from './assets/pf-logo.svg'; import { Link } from '@reach/router'; ## Demos diff --git a/packages/react-core/src/demos/Nav.md b/packages/react-core/src/demos/Nav.md index 6480dc67c23..84d96460733 100644 --- a/packages/react-core/src/demos/Nav.md +++ b/packages/react-core/src/demos/Nav.md @@ -12,7 +12,7 @@ import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-ico import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon'; import BarsIcon from '@patternfly/react-icons/dist/esm/icons/bars-icon'; import imgAvatar from '@patternfly/react-core/src/components/Avatar/examples/avatarImg.svg'; -import imgColorBrand from '@patternfly/react-core/src/demos/examples/pfColorLogo.svg'; +import pfLogo from '@patternfly/react-core/src/demos/assets/pf-logo.svg'; ## Demos @@ -406,8 +406,8 @@ import HelpIcon from '@patternfly/react-icons/dist/esm/icons/help-icon'; import QuestionCircleIcon from '@patternfly/react-icons/dist/esm/icons/question-circle-icon'; import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon'; import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon'; -import imgColorBrand from '@patternfly/react-core/src/demos/examples/pfColorLogo.svg'; import imgAvatar from '@patternfly/react-core/src/components/Avatar/examples/avatarImg.svg'; +import pfLogo from '@patternfly/react-core/src/demos/assets/pf-logo.svg'; class PageLayoutHorizontalNav extends React.Component { constructor(props) { @@ -497,25 +497,18 @@ class PageLayoutHorizontalNav extends React.Component { Logout ); - + const headerToolbar = ( - - {PageNav} - + {PageNav} -