From 875604718f40976309b0b3318d747369012819ff Mon Sep 17 00:00:00 2001 From: okmttdhr Date: Tue, 17 Dec 2024 16:25:25 +0900 Subject: [PATCH] Relocate LayoutBody --- .../components/layout/style.scss | 10 +------ .../components/page-placeholder/index.tsx | 2 +- .../primary/agency-tier-overview/index.tsx | 2 +- .../tier-permission-error/index.tsx | 2 +- .../sections/client/client-landing.tsx | 2 +- .../primary/subscriptions-list/index.tsx | 2 +- .../marketplace/assign-license/index.tsx | 2 +- .../sections/marketplace/checkout/index.tsx | 2 +- .../marketplace/hosting-overview-v3/index.tsx | 2 +- .../marketplace/hosting-overview/index.tsx | 2 +- .../marketplace/pressable-overview/index.tsx | 2 +- .../primary/download-products/index.tsx | 2 +- .../marketplace/products-overview/index.tsx | 2 +- .../marketplace/wpcom-overview/index.tsx | 2 +- .../primary/migrations-commissions/index.tsx | 2 +- .../primary/migrations-overview-v2/index.tsx | 2 +- .../primary/migrations-overview/index.tsx | 2 +- .../primary/self-migration-tool/index.tsx | 2 +- .../sections/overview/overview.tsx | 2 +- .../partner-directory/partner-directory.tsx | 2 +- .../sections/plugins/controller.tsx | 2 +- .../purchases/billing/billing-dashboard.tsx | 2 +- .../invoices/invoices-overview/index.tsx | 2 +- .../licenses/licenses-overview/index.tsx | 2 +- .../payment-method-add/index.tsx | 2 +- .../payment-method-overview/index.tsx | 2 +- .../referrals/primary/bank-details/index.tsx | 2 +- .../primary/commission-overview/index.tsx | 2 +- .../primary/referrals-overview/index.tsx | 2 +- .../sections/settings/settings.tsx | 2 +- .../team/primary/get-started/index.tsx | 2 +- .../team/primary/team-accept-invite/index.tsx | 2 +- .../team/primary/team-invite/index.tsx | 2 +- .../sections/team/primary/team-list/index.tsx | 2 +- .../multi-sites-dashboard}/body.tsx | 0 .../layout/multi-sites-dashboard/style.scss | 27 +++++++++++++------ 36 files changed, 53 insertions(+), 50 deletions(-) rename client/{a8c-for-agencies/components/layout => layout/multi-sites-dashboard}/body.tsx (100%) diff --git a/client/a8c-for-agencies/components/layout/style.scss b/client/a8c-for-agencies/components/layout/style.scss index e4a2c0ada7926..9beacf9b986d8 100644 --- a/client/a8c-for-agencies/components/layout/style.scss +++ b/client/a8c-for-agencies/components/layout/style.scss @@ -1,15 +1,7 @@ @import "@wordpress/base-styles/breakpoints"; @import "@wordpress/base-styles/mixins"; -.a4a-layout__body { - width: 100%; - overflow-y: auto; - padding-block-start: 16px; - padding-block-end: 32px; -} - -.a4a-layout__banner, -.a4a-layout__body { +.a4a-layout__banner { margin-inline: 0; max-height: 100%; diff --git a/client/a8c-for-agencies/components/page-placeholder/index.tsx b/client/a8c-for-agencies/components/page-placeholder/index.tsx index 6e44ccf56f8e2..f131193d3eac0 100644 --- a/client/a8c-for-agencies/components/page-placeholder/index.tsx +++ b/client/a8c-for-agencies/components/page-placeholder/index.tsx @@ -1,6 +1,6 @@ import clsx from 'clsx'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderTitle as Title, } from 'calypso/layout/multi-sites-dashboard/header'; diff --git a/client/a8c-for-agencies/sections/agency-tier/primary/agency-tier-overview/index.tsx b/client/a8c-for-agencies/sections/agency-tier/primary/agency-tier-overview/index.tsx index e187a6d2c7297..9bec5e056bb50 100644 --- a/client/a8c-for-agencies/sections/agency-tier/primary/agency-tier-overview/index.tsx +++ b/client/a8c-for-agencies/sections/agency-tier/primary/agency-tier-overview/index.tsx @@ -2,9 +2,9 @@ import { Card, Badge } from '@automattic/components'; import { Icon, check } from '@wordpress/icons'; import { clsx } from 'clsx'; import { useTranslate } from 'i18n-calypso'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderTitle as Title, LayoutHeaderActions as Actions, diff --git a/client/a8c-for-agencies/sections/agency-tier/tier-permission-error/index.tsx b/client/a8c-for-agencies/sections/agency-tier/tier-permission-error/index.tsx index 9f3c7bf2161e3..611e0f6e54f32 100644 --- a/client/a8c-for-agencies/sections/agency-tier/tier-permission-error/index.tsx +++ b/client/a8c-for-agencies/sections/agency-tier/tier-permission-error/index.tsx @@ -1,10 +1,10 @@ import { Button } from '@wordpress/components'; import { useTranslate } from 'i18n-calypso'; import { useEffect } from 'react'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import AgencyTierLevels from 'calypso/assets/images/a8c-for-agencies/agency-tier/agency-tier-levels.svg'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderTitle as Title, LayoutHeaderActions as Actions, diff --git a/client/a8c-for-agencies/sections/client/client-landing.tsx b/client/a8c-for-agencies/sections/client/client-landing.tsx index 88e7b84df4d10..072e761d35ed5 100644 --- a/client/a8c-for-agencies/sections/client/client-landing.tsx +++ b/client/a8c-for-agencies/sections/client/client-landing.tsx @@ -2,12 +2,12 @@ import page from '@automattic/calypso-router'; import { addQueryArgs, getQueryArg, getQueryArgs } from '@wordpress/url'; import { useTranslate } from 'i18n-calypso'; import { useEffect } from 'react'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import { A4A_CLIENT_SUBSCRIPTIONS_LINK, A4A_OVERVIEW_LINK, } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderTitle as Title, } from 'calypso/layout/multi-sites-dashboard/header'; diff --git a/client/a8c-for-agencies/sections/client/primary/subscriptions-list/index.tsx b/client/a8c-for-agencies/sections/client/primary/subscriptions-list/index.tsx index 2aaa1b278c395..8f6753d657022 100644 --- a/client/a8c-for-agencies/sections/client/primary/subscriptions-list/index.tsx +++ b/client/a8c-for-agencies/sections/client/primary/subscriptions-list/index.tsx @@ -5,10 +5,10 @@ import { useTranslate } from 'i18n-calypso'; import { useMemo, ReactNode, useState, useCallback } from 'react'; import { initialDataViewsState } from 'calypso/a8c-for-agencies/components/items-dashboard/constants'; import ItemsDataViews from 'calypso/a8c-for-agencies/components/items-dashboard/items-dataviews'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import useFetchClientProducts from 'calypso/a8c-for-agencies/data/client/use-fetch-client-products'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderTitle as Title, } from 'calypso/layout/multi-sites-dashboard/header'; diff --git a/client/a8c-for-agencies/sections/marketplace/assign-license/index.tsx b/client/a8c-for-agencies/sections/marketplace/assign-license/index.tsx index 2850701b6a6be..17231978168a6 100644 --- a/client/a8c-for-agencies/sections/marketplace/assign-license/index.tsx +++ b/client/a8c-for-agencies/sections/marketplace/assign-license/index.tsx @@ -4,7 +4,6 @@ import { getQueryArg } from '@wordpress/url'; import clsx from 'clsx'; import { useTranslate } from 'i18n-calypso'; import { useCallback, useEffect, useMemo, useState } from 'react'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_MARKETPLACE_DOWNLOAD_PRODUCTS_LINK, @@ -18,6 +17,7 @@ import useFetchDashboardSites from 'calypso/data/agency-dashboard/use-fetch-dash import areLicenseKeysAssignableToMultisite from 'calypso/jetpack-cloud/sections/partner-portal/lib/are-license-keys-assignable-to-multisite'; import isWooCommerceProduct from 'calypso/jetpack-cloud/sections/partner-portal/lib/is-woocommerce-product'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderActions as Actions, LayoutHeaderSubtitle as Subtitle, diff --git a/client/a8c-for-agencies/sections/marketplace/checkout/index.tsx b/client/a8c-for-agencies/sections/marketplace/checkout/index.tsx index 6d12e8d63bae4..b029948f3785f 100644 --- a/client/a8c-for-agencies/sections/marketplace/checkout/index.tsx +++ b/client/a8c-for-agencies/sections/marketplace/checkout/index.tsx @@ -4,13 +4,13 @@ import { getQueryArg } from '@wordpress/url'; import clsx from 'clsx'; import { useTranslate } from 'i18n-calypso'; import { useCallback, useMemo, useContext, useEffect, useRef, useState } from 'react'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_MARKETPLACE_LINK, A4A_SITES_LINK, } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderBreadcrumb as Breadcrumb, } from 'calypso/layout/multi-sites-dashboard/header'; diff --git a/client/a8c-for-agencies/sections/marketplace/hosting-overview-v3/index.tsx b/client/a8c-for-agencies/sections/marketplace/hosting-overview-v3/index.tsx index 6349fc508a374..7843aa977c126 100644 --- a/client/a8c-for-agencies/sections/marketplace/hosting-overview-v3/index.tsx +++ b/client/a8c-for-agencies/sections/marketplace/hosting-overview-v3/index.tsx @@ -2,7 +2,6 @@ import page from '@automattic/calypso-router'; import { useBreakpoint } from '@automattic/viewport-react'; import { useTranslate } from 'i18n-calypso'; import { useCallback } from 'react'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import PressableUsageLimitNotice from 'calypso/a8c-for-agencies/components/pressable-usage-limit-notice'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { @@ -12,6 +11,7 @@ import { } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import QueryProductsList from 'calypso/components/data/query-products-list'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderActions as Actions, LayoutHeaderBreadcrumb as Breadcrumb, diff --git a/client/a8c-for-agencies/sections/marketplace/hosting-overview/index.tsx b/client/a8c-for-agencies/sections/marketplace/hosting-overview/index.tsx index 057b90ce6b16d..010d15d3797f5 100644 --- a/client/a8c-for-agencies/sections/marketplace/hosting-overview/index.tsx +++ b/client/a8c-for-agencies/sections/marketplace/hosting-overview/index.tsx @@ -4,7 +4,6 @@ import { useBreakpoint } from '@automattic/viewport-react'; import clsx from 'clsx'; import { useTranslate } from 'i18n-calypso'; import { useCallback } from 'react'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import PressableUsageLimitNotice from 'calypso/a8c-for-agencies/components/pressable-usage-limit-notice'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { @@ -13,6 +12,7 @@ import { } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import QueryProductsList from 'calypso/components/data/query-products-list'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderActions as Actions, LayoutHeaderBreadcrumb as Breadcrumb, diff --git a/client/a8c-for-agencies/sections/marketplace/pressable-overview/index.tsx b/client/a8c-for-agencies/sections/marketplace/pressable-overview/index.tsx index 6cf5df9d85a87..72a65070b9c64 100644 --- a/client/a8c-for-agencies/sections/marketplace/pressable-overview/index.tsx +++ b/client/a8c-for-agencies/sections/marketplace/pressable-overview/index.tsx @@ -3,7 +3,6 @@ import { Button } from '@automattic/components'; import { Icon, external } from '@wordpress/icons'; import { useTranslate } from 'i18n-calypso'; import { useCallback, useContext, useEffect } from 'react'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_MARKETPLACE_CHECKOUT_LINK, @@ -11,6 +10,7 @@ import { A4A_MARKETPLACE_LINK, } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderBreadcrumb as Breadcrumb, LayoutHeaderActions as Actions, diff --git a/client/a8c-for-agencies/sections/marketplace/primary/download-products/index.tsx b/client/a8c-for-agencies/sections/marketplace/primary/download-products/index.tsx index af523c41e4b9e..a55d2a000d452 100644 --- a/client/a8c-for-agencies/sections/marketplace/primary/download-products/index.tsx +++ b/client/a8c-for-agencies/sections/marketplace/primary/download-products/index.tsx @@ -1,8 +1,8 @@ import { getQueryArg } from '@wordpress/url'; import { useTranslate } from 'i18n-calypso'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderTitle as Title, } from 'calypso/layout/multi-sites-dashboard/header'; diff --git a/client/a8c-for-agencies/sections/marketplace/products-overview/index.tsx b/client/a8c-for-agencies/sections/marketplace/products-overview/index.tsx index c3cc96932a9f8..e7b07784aca06 100644 --- a/client/a8c-for-agencies/sections/marketplace/products-overview/index.tsx +++ b/client/a8c-for-agencies/sections/marketplace/products-overview/index.tsx @@ -3,7 +3,6 @@ import { useBreakpoint } from '@automattic/viewport-react'; import clsx from 'clsx'; import { useTranslate } from 'i18n-calypso'; import { useEffect, useState } from 'react'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_MARKETPLACE_CHECKOUT_LINK, @@ -11,6 +10,7 @@ import { } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import useProductsQuery from 'calypso/a8c-for-agencies/data/marketplace/use-products-query'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderActions as Actions, LayoutHeaderBreadcrumb as Breadcrumb, diff --git a/client/a8c-for-agencies/sections/marketplace/wpcom-overview/index.tsx b/client/a8c-for-agencies/sections/marketplace/wpcom-overview/index.tsx index 8bf168d26e439..299b157c6d5a3 100644 --- a/client/a8c-for-agencies/sections/marketplace/wpcom-overview/index.tsx +++ b/client/a8c-for-agencies/sections/marketplace/wpcom-overview/index.tsx @@ -14,7 +14,6 @@ import { } from '@wordpress/icons'; import { useTranslate } from 'i18n-calypso'; import { useCallback, useContext, useState } from 'react'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_MARKETPLACE_CHECKOUT_LINK, @@ -23,6 +22,7 @@ import { } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import useWPCOMOwnedSites from 'calypso/a8c-for-agencies/hooks/use-wpcom-owned-sites'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderBreadcrumb as Breadcrumb, LayoutHeaderActions as Actions, diff --git a/client/a8c-for-agencies/sections/migrations/primary/migrations-commissions/index.tsx b/client/a8c-for-agencies/sections/migrations/primary/migrations-commissions/index.tsx index 775b1d416d0d2..fa1d46a693e6f 100644 --- a/client/a8c-for-agencies/sections/migrations/primary/migrations-commissions/index.tsx +++ b/client/a8c-for-agencies/sections/migrations/primary/migrations-commissions/index.tsx @@ -3,12 +3,12 @@ import clsx from 'clsx'; import { useTranslate } from 'i18n-calypso'; import { useCallback, useMemo, useState } from 'react'; import A4APaymentDelayedNotice from 'calypso/a8c-for-agencies/components/a4a-payment-delayed-notice'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_MIGRATIONS_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import TextPlaceholder from 'calypso/a8c-for-agencies/components/text-placeholder'; import useGetTipaltiPayee from 'calypso/a8c-for-agencies/sections/referrals/hooks/use-get-tipalti-payee'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderBreadcrumb as Breadcrumb, LayoutHeaderActions as Actions, diff --git a/client/a8c-for-agencies/sections/migrations/primary/migrations-overview-v2/index.tsx b/client/a8c-for-agencies/sections/migrations/primary/migrations-overview-v2/index.tsx index 280d0e0691c39..d6b0d999ab76a 100644 --- a/client/a8c-for-agencies/sections/migrations/primary/migrations-overview-v2/index.tsx +++ b/client/a8c-for-agencies/sections/migrations/primary/migrations-overview-v2/index.tsx @@ -2,9 +2,9 @@ import { Button } from '@wordpress/components'; import { useTranslate } from 'i18n-calypso'; import { useCallback } from 'react'; import { CONTACT_URL_FOR_MIGRATION_OFFER_HASH_FRAGMENT } from 'calypso/a8c-for-agencies/components/a4a-contact-support-widget'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderTitle as Title, LayoutHeaderActions as Actions, diff --git a/client/a8c-for-agencies/sections/migrations/primary/migrations-overview/index.tsx b/client/a8c-for-agencies/sections/migrations/primary/migrations-overview/index.tsx index 38d335a3ac259..5d054657fa5af 100644 --- a/client/a8c-for-agencies/sections/migrations/primary/migrations-overview/index.tsx +++ b/client/a8c-for-agencies/sections/migrations/primary/migrations-overview/index.tsx @@ -3,7 +3,6 @@ import { Button, Card, WordPressLogo } from '@automattic/components'; import { Icon, external } from '@wordpress/icons'; import { useTranslate } from 'i18n-calypso'; import { useCallback } from 'react'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_REFERRALS_BANK_DETAILS_LINK, @@ -15,6 +14,7 @@ import { getAccountStatus } from 'calypso/a8c-for-agencies/sections/referrals/li import tipaltiLogo from 'calypso/a8c-for-agencies/sections/referrals/lib/tipalti-logo'; import pressableIcon from 'calypso/assets/images/pressable/pressable-icon.svg'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderTitle as Title, LayoutHeaderActions as Actions, diff --git a/client/a8c-for-agencies/sections/migrations/primary/self-migration-tool/index.tsx b/client/a8c-for-agencies/sections/migrations/primary/self-migration-tool/index.tsx index 6c8df80dfbdbf..88aec61197cc1 100644 --- a/client/a8c-for-agencies/sections/migrations/primary/self-migration-tool/index.tsx +++ b/client/a8c-for-agencies/sections/migrations/primary/self-migration-tool/index.tsx @@ -1,10 +1,10 @@ import { useTranslate } from 'i18n-calypso'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_MIGRATIONS_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import { TaskSteps } from 'calypso/a8c-for-agencies/components/task-steps'; import useGetTipaltiPayee from 'calypso/a8c-for-agencies/sections/referrals/hooks/use-get-tipalti-payee'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderBreadcrumb as Breadcrumb, LayoutHeaderActions as Actions, diff --git a/client/a8c-for-agencies/sections/overview/overview.tsx b/client/a8c-for-agencies/sections/overview/overview.tsx index e6ec32cb08234..8dd302e6d9641 100644 --- a/client/a8c-for-agencies/sections/overview/overview.tsx +++ b/client/a8c-for-agencies/sections/overview/overview.tsx @@ -1,9 +1,9 @@ import { useTranslate } from 'i18n-calypso'; import ContentSidebar from 'calypso/a8c-for-agencies/components/content-sidebar'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import PressableUsageLimitNotice from 'calypso/a8c-for-agencies/components/pressable-usage-limit-notice'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderActions as Actions, LayoutHeaderTitle as Title, diff --git a/client/a8c-for-agencies/sections/partner-directory/partner-directory.tsx b/client/a8c-for-agencies/sections/partner-directory/partner-directory.tsx index a0cba742b8dee..59d56a8e8b64e 100644 --- a/client/a8c-for-agencies/sections/partner-directory/partner-directory.tsx +++ b/client/a8c-for-agencies/sections/partner-directory/partner-directory.tsx @@ -3,7 +3,6 @@ import page from '@automattic/calypso-router'; import clsx from 'clsx'; import { useTranslate } from 'i18n-calypso'; import { ReactNode, useMemo } from 'react'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_OVERVIEW_LINK, @@ -11,6 +10,7 @@ import { } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import { Item as BreadcrumbItem } from 'calypso/components/breadcrumb'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderBreadcrumb as Breadcrumb, LayoutHeaderTitle as Title, diff --git a/client/a8c-for-agencies/sections/plugins/controller.tsx b/client/a8c-for-agencies/sections/plugins/controller.tsx index 922d558533027..8be229490ada4 100644 --- a/client/a8c-for-agencies/sections/plugins/controller.tsx +++ b/client/a8c-for-agencies/sections/plugins/controller.tsx @@ -1,7 +1,7 @@ import { type Callback } from '@automattic/calypso-router'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderSubtitle as Subtitle, LayoutHeaderTitle as Title, diff --git a/client/a8c-for-agencies/sections/purchases/billing/billing-dashboard.tsx b/client/a8c-for-agencies/sections/purchases/billing/billing-dashboard.tsx index de9cf5a2d50bc..bd9ce185ce336 100644 --- a/client/a8c-for-agencies/sections/purchases/billing/billing-dashboard.tsx +++ b/client/a8c-for-agencies/sections/purchases/billing/billing-dashboard.tsx @@ -1,9 +1,9 @@ import { Button } from '@automattic/components'; import { useTranslate } from 'i18n-calypso'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_MARKETPLACE_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderActions as Actions, LayoutHeaderTitle as Title, diff --git a/client/a8c-for-agencies/sections/purchases/invoices/invoices-overview/index.tsx b/client/a8c-for-agencies/sections/purchases/invoices/invoices-overview/index.tsx index e4b7703adb3ee..8cef84b1a4ade 100644 --- a/client/a8c-for-agencies/sections/purchases/invoices/invoices-overview/index.tsx +++ b/client/a8c-for-agencies/sections/purchases/invoices/invoices-overview/index.tsx @@ -1,7 +1,7 @@ import { useTranslate } from 'i18n-calypso'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderTitle as Title, } from 'calypso/layout/multi-sites-dashboard/header'; diff --git a/client/a8c-for-agencies/sections/purchases/licenses/licenses-overview/index.tsx b/client/a8c-for-agencies/sections/purchases/licenses/licenses-overview/index.tsx index 7905057e7a89b..5dad91baf17b8 100644 --- a/client/a8c-for-agencies/sections/purchases/licenses/licenses-overview/index.tsx +++ b/client/a8c-for-agencies/sections/purchases/licenses/licenses-overview/index.tsx @@ -1,6 +1,5 @@ import { Button } from '@automattic/components'; import { useTranslate } from 'i18n-calypso'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import PressableUsageLimitNotice from 'calypso/a8c-for-agencies/components/pressable-usage-limit-notice'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_MARKETPLACE_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; @@ -11,6 +10,7 @@ import { LicenseSortField, } from 'calypso/jetpack-cloud/sections/partner-portal/types'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderActions as Actions, LayoutHeaderTitle as Title, diff --git a/client/a8c-for-agencies/sections/purchases/payment-methods/payment-method-add/index.tsx b/client/a8c-for-agencies/sections/purchases/payment-methods/payment-method-add/index.tsx index 3e9f67e265f77..d826f34c31f48 100644 --- a/client/a8c-for-agencies/sections/purchases/payment-methods/payment-method-add/index.tsx +++ b/client/a8c-for-agencies/sections/purchases/payment-methods/payment-method-add/index.tsx @@ -1,7 +1,6 @@ import { Card } from '@automattic/components'; import clsx from 'clsx'; import { useTranslate } from 'i18n-calypso'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import LayoutStepper from 'calypso/a8c-for-agencies/components/layout/stepper'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { @@ -11,6 +10,7 @@ import { import PaymentMethodStripeInfo from 'calypso/jetpack-cloud/sections/partner-portal/payment-method-stripe-info'; import { usePaymentMethodStepper } from 'calypso/jetpack-cloud/sections/partner-portal/primary/payment-method-add-v2/hooks/use-payment-method-stepper'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderTitle as Title, LayoutHeaderSubtitle as Subtitle, diff --git a/client/a8c-for-agencies/sections/purchases/payment-methods/payment-method-overview/index.tsx b/client/a8c-for-agencies/sections/purchases/payment-methods/payment-method-overview/index.tsx index f7c6d604df0c1..1ef0ff5d179ed 100644 --- a/client/a8c-for-agencies/sections/purchases/payment-methods/payment-method-overview/index.tsx +++ b/client/a8c-for-agencies/sections/purchases/payment-methods/payment-method-overview/index.tsx @@ -2,7 +2,6 @@ import { Button } from '@automattic/components'; import clsx from 'clsx'; import { useTranslate } from 'i18n-calypso'; import { useCallback, useMemo, useState } from 'react'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_PAYMENT_METHODS_ADD_LINK, @@ -11,6 +10,7 @@ import { import Pagination from 'calypso/components/pagination'; import { PaymentMethod } from 'calypso/jetpack-cloud/sections/partner-portal/payment-methods'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderActions as Actions, LayoutHeaderTitle as Title, diff --git a/client/a8c-for-agencies/sections/referrals/primary/bank-details/index.tsx b/client/a8c-for-agencies/sections/referrals/primary/bank-details/index.tsx index adfa79689bc53..68e03a1a7d483 100644 --- a/client/a8c-for-agencies/sections/referrals/primary/bank-details/index.tsx +++ b/client/a8c-for-agencies/sections/referrals/primary/bank-details/index.tsx @@ -2,7 +2,6 @@ import { useDesktopBreakpoint } from '@automattic/viewport-react'; import clsx from 'clsx'; import { useTranslate } from 'i18n-calypso'; import { useLayoutEffect, useState } from 'react'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_REFERRALS_LINK, @@ -11,6 +10,7 @@ import { import StatusBadge from 'calypso/a8c-for-agencies/components/step-section-item/status-badge'; import TextPlaceholder from 'calypso/a8c-for-agencies/components/text-placeholder'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderBreadcrumb as Breadcrumb, LayoutHeaderActions as Actions, diff --git a/client/a8c-for-agencies/sections/referrals/primary/commission-overview/index.tsx b/client/a8c-for-agencies/sections/referrals/primary/commission-overview/index.tsx index e287bdabe52f4..879bd6ae36949 100644 --- a/client/a8c-for-agencies/sections/referrals/primary/commission-overview/index.tsx +++ b/client/a8c-for-agencies/sections/referrals/primary/commission-overview/index.tsx @@ -2,7 +2,6 @@ import { FoldableCard } from '@automattic/components'; import { useDesktopBreakpoint } from '@automattic/viewport-react'; import clsx from 'clsx'; import { useTranslate } from 'i18n-calypso'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_REFERRALS_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import StepSection from 'calypso/a8c-for-agencies/components/step-section'; @@ -11,6 +10,7 @@ import JetpackLogo from 'calypso/components/jetpack-logo'; import WooCommerceLogo from 'calypso/components/woocommerce-logo'; import WordPressLogo from 'calypso/components/wordpress-logo'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderBreadcrumb as Breadcrumb, } from 'calypso/layout/multi-sites-dashboard/header'; diff --git a/client/a8c-for-agencies/sections/referrals/primary/referrals-overview/index.tsx b/client/a8c-for-agencies/sections/referrals/primary/referrals-overview/index.tsx index 40202c2429193..289a7fb644c59 100644 --- a/client/a8c-for-agencies/sections/referrals/primary/referrals-overview/index.tsx +++ b/client/a8c-for-agencies/sections/referrals/primary/referrals-overview/index.tsx @@ -13,7 +13,6 @@ import { initialDataViewsState, } from 'calypso/a8c-for-agencies/components/items-dashboard/constants'; import { DataViewsState } from 'calypso/a8c-for-agencies/components/items-dashboard/items-dataviews/interfaces'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_MARKETPLACE_PRODUCTS_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import { REFERRAL_EMAIL_QUERY_PARAM_KEY } from 'calypso/a8c-for-agencies/constants'; @@ -23,6 +22,7 @@ import { MARKETPLACE_TYPE_REFERRAL, } from 'calypso/a8c-for-agencies/sections/marketplace/hoc/with-marketplace-type'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutColumn from 'calypso/layout/multi-sites-dashboard/column'; import LayoutHeader, { LayoutHeaderTitle as Title, diff --git a/client/a8c-for-agencies/sections/settings/settings.tsx b/client/a8c-for-agencies/sections/settings/settings.tsx index 7de2e3b6384f6..2040e84fe7cd4 100644 --- a/client/a8c-for-agencies/sections/settings/settings.tsx +++ b/client/a8c-for-agencies/sections/settings/settings.tsx @@ -1,8 +1,8 @@ import { useTranslate } from 'i18n-calypso'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_SETTINGS_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderTitle as Title, } from 'calypso/layout/multi-sites-dashboard/header'; diff --git a/client/a8c-for-agencies/sections/team/primary/get-started/index.tsx b/client/a8c-for-agencies/sections/team/primary/get-started/index.tsx index 521842474ad60..f2210b558d557 100644 --- a/client/a8c-for-agencies/sections/team/primary/get-started/index.tsx +++ b/client/a8c-for-agencies/sections/team/primary/get-started/index.tsx @@ -1,11 +1,11 @@ import { Button } from '@wordpress/components'; import { Icon, external } from '@wordpress/icons'; import { useTranslate } from 'i18n-calypso'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import { A4A_TEAM_INVITE_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import StepSection from 'calypso/a8c-for-agencies/components/step-section'; import StepSectionItem from 'calypso/a8c-for-agencies/components/step-section-item'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderActions as Actions, LayoutHeaderTitle as Title, diff --git a/client/a8c-for-agencies/sections/team/primary/team-accept-invite/index.tsx b/client/a8c-for-agencies/sections/team/primary/team-accept-invite/index.tsx index 97f2f8c0f4c58..2d6f547d8ca66 100644 --- a/client/a8c-for-agencies/sections/team/primary/team-accept-invite/index.tsx +++ b/client/a8c-for-agencies/sections/team/primary/team-accept-invite/index.tsx @@ -1,7 +1,6 @@ import page from '@automattic/calypso-router'; import { useTranslate } from 'i18n-calypso'; import { useEffect, useMemo, useState } from 'react'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import PagePlaceholder from 'calypso/a8c-for-agencies/components/page-placeholder'; import { A4A_OVERVIEW_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import useActivateMemberMutation, { @@ -9,6 +8,7 @@ import useActivateMemberMutation, { } from 'calypso/a8c-for-agencies/data/team/use-activate-member'; import AgencyLogo from 'calypso/assets/images/a8c-for-agencies/agency-logo.svg'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderTitle as Title, } from 'calypso/layout/multi-sites-dashboard/header'; diff --git a/client/a8c-for-agencies/sections/team/primary/team-invite/index.tsx b/client/a8c-for-agencies/sections/team/primary/team-invite/index.tsx index 2dc0192a6658b..34ff0894a5122 100644 --- a/client/a8c-for-agencies/sections/team/primary/team-invite/index.tsx +++ b/client/a8c-for-agencies/sections/team/primary/team-invite/index.tsx @@ -9,10 +9,10 @@ import useShowFeedback from 'calypso/a8c-for-agencies/components/a4a-feedback/ho import Form from 'calypso/a8c-for-agencies/components/form'; import FormField from 'calypso/a8c-for-agencies/components/form/field'; import FormSection from 'calypso/a8c-for-agencies/components/form/section'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import { A4A_TEAM_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import useSendTeamMemberInvite from 'calypso/a8c-for-agencies/data/team/use-send-team-member-invite'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderBreadcrumb as Breadcrumb, } from 'calypso/layout/multi-sites-dashboard/header'; diff --git a/client/a8c-for-agencies/sections/team/primary/team-list/index.tsx b/client/a8c-for-agencies/sections/team/primary/team-list/index.tsx index aea546079723d..76136f499da06 100644 --- a/client/a8c-for-agencies/sections/team/primary/team-list/index.tsx +++ b/client/a8c-for-agencies/sections/team/primary/team-list/index.tsx @@ -3,7 +3,6 @@ import { useDesktopBreakpoint } from '@automattic/viewport-react'; import { Button } from '@wordpress/components'; import { useTranslate } from 'i18n-calypso'; import { ReactNode, useMemo } from 'react'; -import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; import PagePlaceholder from 'calypso/a8c-for-agencies/components/page-placeholder'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { @@ -11,6 +10,7 @@ import { A4A_TEAM_LINK, } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import Layout from 'calypso/layout/multi-sites-dashboard'; +import LayoutBody from 'calypso/layout/multi-sites-dashboard/body'; import LayoutHeader, { LayoutHeaderActions as Actions, LayoutHeaderTitle as Title, diff --git a/client/a8c-for-agencies/components/layout/body.tsx b/client/layout/multi-sites-dashboard/body.tsx similarity index 100% rename from client/a8c-for-agencies/components/layout/body.tsx rename to client/layout/multi-sites-dashboard/body.tsx diff --git a/client/layout/multi-sites-dashboard/style.scss b/client/layout/multi-sites-dashboard/style.scss index 021c157afaf05..4875f64c40ab6 100644 --- a/client/layout/multi-sites-dashboard/style.scss +++ b/client/layout/multi-sites-dashboard/style.scss @@ -49,16 +49,17 @@ html, body { flex: 1; } -.multi-sites-dashboard-layout__top-wrapper { +.a4a-layout__body { + width: 100%; + overflow-y: auto; + padding-block-start: 16px; + padding-block-end: 32px; +} + +.multi-sites-dashboard-layout__top-wrapper, +.a4a-layout__body { margin-inline: 0; max-height: 100%; - padding-block-start: 24px; - border-bottom: #f1f1f1 1px solid; - - @include breakpoint-deprecated( "<660px" ) { - padding: 0; - border-block-end: 1px solid var(--color-neutral-5); - } > * { padding-inline: 16px; @@ -69,6 +70,16 @@ html, body { padding-inline: 64px; } } +} + +.multi-sites-dashboard-layout__top-wrapper { + padding-block-start: 24px; + border-bottom: #f1f1f1 1px solid; + + @include breakpoint-deprecated( "<660px" ) { + padding: 0; + border-block-end: 1px solid var(--color-neutral-5); + } .notice-banner { padding: 24px;