Skip to content

Commit 11f3365

Browse files
authored
Merge pull request #3587 from woocommerce/PCP-5053-display-help-center-section
Display help center section (5053)
2 parents 098a792 + acf937e commit 11f3365

File tree

9 files changed

+20
-16
lines changed

9 files changed

+20
-16
lines changed

modules/ppcp-settings/resources/css/components/_reusable.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
@import './reusable-components/button';
66
@import './reusable-components/elements';
77
@import './reusable-components/fields';
8+
@import './reusable-components/help-section';
89
@import './reusable-components/navigation';
910
@import './reusable-components/onboarding-header';
1011
@import './reusable-components/payment-method-icons';
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/* The help section at the bottom of post pages */
2+
.ppcp-r-tab-overview-help {
3+
--block-header-gap: 8px;
4+
--card-gap-top: 24px;
5+
}

modules/ppcp-settings/resources/css/components/reusable-components/_settings-card.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ $width_gap: 24px;
2929

3030
display: var(--card-layout);
3131
gap: var(--card-gap);
32-
margin: 0 0 var(--card-gap) 0;
32+
margin: var(--card-gap-top, 0) 0 var(--card-gap) 0;
3333

3434
.ppcp-r-settings-card__header {
3535
display: var(--card-layout);

modules/ppcp-settings/resources/css/components/screens/_settings.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,6 @@
164164
--block-header-gap: 12px;
165165
}
166166

167-
.ppcp-r-tab-overview-help {
168-
--block-header-gap: 8px;
169-
}
170-
171167
.ppcp-r-settings-block__feature {
172168
.ppcp--action-buttons {
173169
display: flex;

modules/ppcp-settings/resources/css/components/screens/onboarding/_step-welcome.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
.onboarding-advanced-options {
3030
margin-top: 24px;
31+
margin-bottom: 48px;
3132
max-width: 800px;
3233

3334
.ppcp--toggler .ppcp--title-wrapper {
Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
import { __ } from '@wordpress/i18n';
2-
import { FeatureSettingsBlock } from '../../../../../ReusableComponents/SettingsBlocks';
3-
import {
4-
Content,
5-
ContentWrapper,
6-
} from '../../../../../ReusableComponents/Elements';
7-
import SettingsCard from '../../../../../ReusableComponents/SettingsCard';
2+
import { FeatureSettingsBlock } from './SettingsBlocks';
3+
import { Content, ContentWrapper } from './Elements';
4+
import SettingsCard from './SettingsCard';
85

9-
const Help = () => {
6+
const HelpSection = () => {
107
return (
118
<SettingsCard
129
className="ppcp-r-tab-overview-help"
@@ -69,4 +66,4 @@ const Help = () => {
6966
);
7067
};
7168

72-
export default Help;
69+
export default HelpSection;

modules/ppcp-settings/resources/js/Components/Screens/Onboarding/Steps/StepWelcome.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { Separator } from '../../../ReusableComponents/Elements';
66
import Accordion from '../../../ReusableComponents/AccordionSection';
77
import { CommonHooks, OnboardingHooks } from '../../../../data';
88
import BusyStateWrapper from '../../../ReusableComponents/BusyStateWrapper';
9+
import HelpSection from '../../../ReusableComponents/HelpSection';
910
import OnboardingHeader from '../Components/OnboardingHeader';
1011
import WelcomeDocs from '../Components/WelcomeDocs';
1112
import AdvancedOptionsForm from '../Components/AdvancedOptionsForm';
@@ -88,6 +89,7 @@ const StepWelcome = ( { setStep, currentStep } ) => {
8889
>
8990
<AdvancedOptionsForm />
9091
</Accordion>
92+
<HelpSection />
9193
</div>
9294
);
9395
};

modules/ppcp-settings/resources/js/Components/Screens/Settings/Tabs/TabOverview.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { __ } from '@wordpress/i18n';
22
import Todos from '../Components/Overview/Todos/Todos';
33
import Features from '../Components/Overview/Features/Features';
4-
import Help from '../Components/Overview/Help/Help';
54
import { TodosHooks, CommonHooks, FeaturesHooks } from '../../../../data';
65
import SpinnerOverlay from '../../../ReusableComponents/SpinnerOverlay';
76
import usePaymentGatewaySync from '../../../../hooks/usePaymentGatewaySync';
@@ -37,7 +36,6 @@ const TabOverview = () => {
3736
>
3837
<Todos />
3938
<Features />
40-
<Help />
4139
</div>
4240
);
4341
};

modules/ppcp-settings/resources/js/Components/Screens/Settings/index.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import Container from '../../ReusableComponents/Container';
2+
import HelpSection from '../../ReusableComponents/HelpSection';
23
import SettingsNavigation from './Components/Navigation';
34
import { getSettingsTabs } from './Tabs';
45

@@ -13,7 +14,10 @@ const SettingsScreen = ( { activePanel, setActivePanel } ) => {
1314
activePanel={ activePanel }
1415
setActivePanel={ setActivePanel }
1516
/>
16-
<Container page="settings">{ Component }</Container>
17+
<Container page="settings">
18+
{ Component }
19+
<HelpSection />
20+
</Container>
1721
</>
1822
);
1923
};

0 commit comments

Comments
 (0)