From 28cb1008eb11d71ce86078a9fa1c0efaa6ccdb2e Mon Sep 17 00:00:00 2001 From: Kyle Nel <22053773+kdevnel@users.noreply.github.com> Date: Tue, 4 Jul 2023 14:08:50 +0200 Subject: [PATCH] Add skeleton and cherry-picked commits - Reset layout to allow full width - Added Footer & IconWithText components Add temporary placeholder components All components here are temporary and can be removed/replaced when their relevant PR is ready. Add marketplace footer component The component is added using a SlotFill to use the existing WC Admin footer and utilise full width correctly. Setup initial content area layout Update tab styles Setup styling to match latest design Finalise footer, wide layout, and tidy styles - Applies the wide layout from latest MVP design - Applies the correct footer links to titles - Some general style tidying Organise styles and setup variables Swap to using CSS Grid for layouts Update breakpoints Restructure style naming and update to core styles Add translation in some places In-app marketplace search component. Cleaned up the commit history of this branch. Copied changes from these commits: e9828422706176817e511778980005222aa36cc5 9ca2ae351c97fcd27ecd77a1464c2a9ca16de040 e47815705f3854bf50ff48d7975b7cf2f541614b 976811c458e67ae7fa107c8bf8554fdc3e809d85 46eafdf49fe39c12dee77d6ce0885bdeda527dea Deleted unused import. --- .../marketplace/assets/images/woo-icon.svg | 14 +++ .../components/content/content.scss | 13 ++- .../components/content/content.tsx | 10 +- .../components/discover/discover.scss | 1 + .../components/discover/discover.tsx | 7 +- .../components/extensions/extensions.scss | 1 + .../components/extensions/extensions.tsx | 8 +- .../marketplace/components/footer/footer.scss | 51 ++++++++++ .../marketplace/components/footer/footer.tsx | 89 ++++++++++++++++++ .../icon-with-text/icon-with-text.scss | 29 ++++++ .../icon-with-text/icon-with-text.tsx | 37 ++++++++ .../product-list-content.scss | 40 ++++++++ .../product-list-content.tsx | 19 ++++ .../product-list-header.scss | 11 +++ .../product-list-header.tsx | 24 +++++ .../components/product-list/product-list.tsx | 24 +++++ .../marketplace/components/search/search.scss | 36 +++++++ .../marketplace/components/search/search.tsx | 94 +++++++++++++++++++ .../marketplace/components/tabs/tabs.scss | 28 +++++- .../client/marketplace/index.tsx | 14 +-- .../client/marketplace/marketplace.scss | 19 +++- .../marketplace/stylesheets/_variables.scss | 28 ++++++ 22 files changed, 579 insertions(+), 18 deletions(-) create mode 100644 plugins/woocommerce-admin/client/marketplace/assets/images/woo-icon.svg create mode 100644 plugins/woocommerce-admin/client/marketplace/components/discover/discover.scss create mode 100644 plugins/woocommerce-admin/client/marketplace/components/extensions/extensions.scss create mode 100644 plugins/woocommerce-admin/client/marketplace/components/footer/footer.scss create mode 100644 plugins/woocommerce-admin/client/marketplace/components/footer/footer.tsx create mode 100644 plugins/woocommerce-admin/client/marketplace/components/icon-with-text/icon-with-text.scss create mode 100644 plugins/woocommerce-admin/client/marketplace/components/icon-with-text/icon-with-text.tsx create mode 100644 plugins/woocommerce-admin/client/marketplace/components/product-list-content/product-list-content.scss create mode 100644 plugins/woocommerce-admin/client/marketplace/components/product-list-content/product-list-content.tsx create mode 100644 plugins/woocommerce-admin/client/marketplace/components/product-list-header/product-list-header.scss create mode 100644 plugins/woocommerce-admin/client/marketplace/components/product-list-header/product-list-header.tsx create mode 100644 plugins/woocommerce-admin/client/marketplace/components/product-list/product-list.tsx create mode 100644 plugins/woocommerce-admin/client/marketplace/components/search/search.scss create mode 100644 plugins/woocommerce-admin/client/marketplace/components/search/search.tsx create mode 100644 plugins/woocommerce-admin/client/marketplace/stylesheets/_variables.scss diff --git a/plugins/woocommerce-admin/client/marketplace/assets/images/woo-icon.svg b/plugins/woocommerce-admin/client/marketplace/assets/images/woo-icon.svg new file mode 100644 index 00000000000..915dd8a1522 --- /dev/null +++ b/plugins/woocommerce-admin/client/marketplace/assets/images/woo-icon.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/plugins/woocommerce-admin/client/marketplace/components/content/content.scss b/plugins/woocommerce-admin/client/marketplace/components/content/content.scss index e102260eb5b..ee052b14a3a 100644 --- a/plugins/woocommerce-admin/client/marketplace/components/content/content.scss +++ b/plugins/woocommerce-admin/client/marketplace/components/content/content.scss @@ -1,3 +1,14 @@ +@import '../../stylesheets/_variables.scss'; + .woocommerce-marketplace__content { - padding: 16px; + box-sizing: content-box; + margin: auto; + max-width: $content-max-width; + padding: 0 $content-spacing-small; +} + +@media screen and (min-width: $breakpoint-medium) { + .woocommerce-marketplace__content { + padding: $content-spacing-large; + } } diff --git a/plugins/woocommerce-admin/client/marketplace/components/content/content.tsx b/plugins/woocommerce-admin/client/marketplace/components/content/content.tsx index 9a4fa428004..51c6267673a 100644 --- a/plugins/woocommerce-admin/client/marketplace/components/content/content.tsx +++ b/plugins/woocommerce-admin/client/marketplace/components/content/content.tsx @@ -8,6 +8,7 @@ import './content.scss'; import Discover from '../discover/discover'; import Extensions from '../extensions/extensions'; +import Footer from '../footer/footer'; export interface ContentProps { selectedTab?: string | undefined; @@ -24,5 +25,12 @@ const renderContent = ( selectedTab?: string ): JSX.Element => { export default function Content( props: ContentProps ): JSX.Element { const { selectedTab } = props; - return <>{ renderContent( selectedTab ) }; + return ( + <> +
+ { renderContent( selectedTab ) } +
+