Skip to content

Commit 617cd8a

Browse files
committed
Merge branch 'import-snippets' of https://github.com/codesnippetspro/code-snippets into import-snippets
# Conflicts: # src/php/class-plugin.php
2 parents a65496c + f13294f commit 617cd8a

File tree

7 files changed

+8
-7
lines changed

7 files changed

+8
-7
lines changed

src/js/components/Import/FromFileUpload/FileUploadForm.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,12 +133,12 @@ export const FileUploadForm: React.FC = () => {
133133

134134
{currentStep === 'select' && importWorkflow.availableSnippets.length > 0 && !importWorkflow.uploadResult?.success && (
135135
<ImportCard ref={selectSectionRef}>
136-
<div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', marginBottom: '20px' }}>
136+
<div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', marginBlockEnd: '20px' }}>
137137
<Button onClick={handleBackToUpload} className="button-link">
138138
{__('← Upload Different Files', 'code-snippets')}
139139
</Button>
140140
</div>
141-
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '10px' }}>
141+
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBlockEnd: '10px' }}>
142142
<div>
143143
<h3 style={{ margin: '0' }}>{__('Available Snippets', 'code-snippets')} ({importWorkflow.availableSnippets.length})</h3>
144144
<p style={{ margin: '0.5em 0 1em 0', color: '#666' }}>

src/js/components/Import/FromOtherPlugins/ImportForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ export const ImportForm: React.FC = () => {
106106
snippetImport.importSuccess.length === 0 && (
107107
<ImportCard>
108108
<div style={{ textAlign: 'center', padding: '40px 20px', color: '#666' }}>
109-
<div style={{ fontSize: '48px', marginBottom: '16px' }}>📭</div>
109+
<div style={{ fontSize: '48px', marginBlockEnd: '16px' }}>📭</div>
110110
<h3 style={{ margin: '0 0 8px 0', fontSize: '18px', color: '#333' }}>
111111
{__('No snippets found', 'code-snippets')}
112112
</h3>

src/js/components/Import/FromOtherPlugins/components/SimpleSnippetTable.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export const SimpleSnippetTable: React.FC<SimpleSnippetTableProps> = ({
2525

2626
return (
2727
<ImportCard className="snippets-table-container">
28-
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '10px' }}>
28+
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBlockEnd: '10px' }}>
2929
<div>
3030
<h2 style={{ margin: '0' }}>{__('Available Snippets', 'code-snippets')} ({snippets.length})</h2>
3131
<p style={{ margin: '0.5em 0 1em 0' }}>{__('We found the following snippets.', 'code-snippets')}</p>

src/js/components/Import/FromOtherPlugins/components/StatusDisplay.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export const StatusDisplay: React.FC<StatusDisplayProps> = ({
1818
const isError = type === 'error'
1919

2020
return (
21-
<ImportCard variant="controls" style={{ display: 'flex', alignItems: 'flex-start', gap: '12px', marginBottom: '20px' }}>
21+
<ImportCard variant="controls" style={{ display: 'flex', alignItems: 'flex-start', gap: '12px', marginBlockEnd: '20px' }}>
2222
<div style={{
2323
backgroundColor: isError ? '#d63638' : '#00a32a',
2424
borderRadius: '50%',

src/js/components/Import/ImportApp.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export const ImportApp: React.FC = () => {
2727

2828
return (
2929
<div className="narrow" style={{ maxWidth: '800px' }}>
30-
<h2 className="nav-tab-wrapper" style={{ marginBottom: '20px' }}>
30+
<h2 className="nav-tab-wrapper" style={{ marginBlockEnd: '20px' }}>
3131
<a
3232
className={`nav-tab${activeTab === 'upload' ? ' nav-tab-active' : ''}`}
3333
href="#"

src/js/components/Import/shared/components/ImportCard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export const ImportCard = React.forwardRef<HTMLDivElement, ImportCardProps>(({
2020
padding: '25px',
2121
borderRadius: '5px',
2222
border: '1px solid #e0e0e0',
23-
marginBottom: '10px',
23+
marginBlockEnd: '10px',
2424
width: '100%',
2525
...style
2626
}

src/php/class-plugin.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ public function load_plugin() {
160160
// Importers.
161161
new Plugins_Import_Manager();
162162
new Files_Import_Manager();
163+
163164
// Initialize promotions.
164165
new Promotions\Elementor_Pro();
165166
}

0 commit comments

Comments
 (0)