Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: css name conflict for .right class name #902

Merged
merged 1 commit into from
Mar 21, 2024
Merged

fix: css name conflict for .right class name #902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions css/metabox-settings.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,16 @@
.fz-input-group{flex-wrap: wrap;}
.fz-input-group .fz-input-group-right{width: 100%; padding-left: 0; padding-top: 8px;}
.fz-input-group .fz-input-group-right .btn.dropdown-toggle{width: 100%;}
.fz-form-wrap .form-block.form-block-two-column .left{width: 100%; padding-right: 0; padding-bottom: 24px;}
.fz-form-wrap .form-block.form-block-two-column .right{width: 100%;}
.fz-form-action .left{width: 100%; padding-bottom: 16px;}
.fz-form-action .left .btn{width: 100%; display: block; text-align: center;}
.fz-form-action .right{width: 100%; flex-direction: column;}
.fz-form-action .right .btn + .btn{margin-left: 0; margin-top: 8px;}
.fz-form-wrap .form-block.form-block-two-column .fz-left{width: 100%; padding-right: 0; padding-bottom: 24px;}
.fz-form-wrap .form-block.form-block-two-column .fz-right{width: 100%;}
.fz-form-action .fz-left{width: 100%; padding-bottom: 16px;}
.fz-form-action .fz-left .btn{width: 100%; display: block; text-align: center;}
.fz-form-action .fz-right{width: 100%; flex-direction: column;}
.fz-form-action .fz-right .btn + .btn{margin-left: 0; margin-top: 8px;}
.fz-form-row .fz-form-col-6, .fz-form-row .fz-form-col-4, .fz-form-row .fz-form-col-8{width: 100%;}
.fz-document-list > ul > li{width: 100%;}
.fz-help-improve-box .left{width: 100%;}
.fz-help-improve-box .right{width: 100%;}
.fz-help-improve-box .fz-left{width: 100%;}
.fz-help-improve-box .fz-right{width: 100%;}
.fz-tabs-menu ul {flex-wrap: wrap;}
.fz-tabs-menu ul li{flex-shrink: 0; width: 50%;}
.fz-tabs-menu ul li a{padding: 0px; border: 1px solid transparent;}
Expand Down
19 changes: 10 additions & 9 deletions css/settings.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,14 +350,15 @@ fieldset[disabled] .form-control {
display: flex;
flex-wrap: wrap;
}
.fz-form-wrap .form-block.form-block-two-column .left{
.fz-form-wrap .form-block.form-block-two-column .fz-left{
width: 285px;
padding-right: 24px;
}
.fz-form-wrap .form-block.form-block-two-column .right{
.fz-form-wrap .form-block.form-block-two-column .fz-right{
width: calc(100% - 285px);
text-align: left;
}
.fz-form-wrap .form-block.form-block-two-column .right .upgrade-alert{
.fz-form-wrap .form-block.form-block-two-column .fz-right .upgrade-alert{
margin-top: 20px;
}
.fz-form-wrap .form-block .only-pro-content{
Expand Down Expand Up @@ -666,14 +667,14 @@ input.fz-switch-toggle[type=checkbox]:checked:before{
flex-wrap: wrap;
justify-content: space-between;
}
.fz-form-action .right{
.fz-form-action .fz-right{
display: flex;
flex-wrap: wrap;
}
.fz-form-action .right .btn{
.fz-form-action .fz-right .btn{
margin-bottom: 8px;
}
.fz-form-action .right .btn + .btn{
.fz-form-action .fz-right .btn + .btn{
margin-left: 16px;
}

Expand Down Expand Up @@ -1310,18 +1311,18 @@ input.fz-switch-toggle[type=checkbox]:checked:before{
flex-direction: row-reverse;
border: 1px solid #D9D9D9;
}
.fz-help-improve-box .left{
.fz-help-improve-box .fz-left{
width: calc(100% - 320px);
padding: 30px;
}
.fz-help-improve-box .left p{
.fz-help-improve-box .fz-left p{
font-size: 16px;
line-height: 24px;
color: #050505;
margin-bottom: 24px;
max-width: 710px;
}
.fz-help-improve-box .right{
.fz-help-improve-box .fz-right{
width: 320px;
padding: 18px;
background-color: #F5F7F9;
Expand Down
4 changes: 2 additions & 2 deletions includes/layouts/feedzy-improve.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div id="fz-feedback-modal"></div>
<div class="fz-help-improve-wrap">
<div class="fz-help-improve-box">
<div class="right">
<div class="fz-right">
<img src="<?php echo esc_url( FEEDZY_ABSURL . 'img/improve-feedzy.png' ); ?>" alt="">
</div>
<div class="left">
<div class="fz-left">
<h3 class="h3 pb-16">Answer a few questions to help us improve Feedzy</h3>
<p>We're always looking for suggestions to further improve Feedzy.
<?php if ( ! feedzy_is_pro() ) { ?>
Expand Down
84 changes: 42 additions & 42 deletions includes/views/import-metabox-edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ class="dashicons dashicons-arrow-down-alt2"></span>
<div class="fz-form-wrap">
<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'filter-keyword', 'import' ) ); ?>
<div class="left">
<div class="fz-left">
<h4 class="h4"><?php esc_html_e( 'Filter by Keyword(s)', 'feedzy-rss-feeds' ); ?><?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
<div class="form-block-pro-text">
<?php
Expand All @@ -140,7 +140,7 @@ class="dashicons dashicons-arrow-down-alt2"></span>
<a href="https://docs.themeisle.com/article/1154-how-to-use-feed-to-post-feature-in-feedzy#filters" target="_blank"><?php esc_html_e( 'Learn More', 'feedzy-rss-feeds' ); ?></a>
</div>
</div>
<div class="right">
<div class="fz-right">
<div class="fz-form-group">
<label class="form-label"><?php esc_html_e( 'Display item only if the selected field contains specific keyword(s)', 'feedzy-rss-feeds' ); ?></label>
<div class="fz-input-group">
Expand Down Expand Up @@ -180,10 +180,10 @@ class="dashicons dashicons-arrow-down-alt2"></span>

<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'exclude-items', 'import' ) ); ?>
<div class="left">
<div class="fz-left">
<h4 class="h4"><?php esc_html_e( 'Exclude Items', 'feedzy-rss-feeds' ); ?><?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
</div>
<div class="right">
<div class="fz-right">
<div class="fz-form-group">
<label class="form-label"><?php esc_html_e( 'Exclude item if the selected field contains specific keyword(s)', 'feedzy-rss-feeds' ); ?></label>
<div class="fz-input-group">
Expand Down Expand Up @@ -223,10 +223,10 @@ class="dashicons dashicons-arrow-down-alt2"></span>

<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'filter-time-range', 'import' ) ); ?>
<div class="left">
<div class="fz-left">
<h4 class="h4"><?php esc_html_e( 'Filter by Time Range', 'feedzy-rss-feeds' ); ?><?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
</div>
<div class="right">
<div class="fz-right">
<div class="date-range-group">
<div class="fz-form-group">
<label class="form-label"
Expand Down Expand Up @@ -286,10 +286,10 @@ class="dashicons dashicons-arrow-down-alt2"></span>
<div class="fz-tab-content" id="fz-general">
<div class="fz-form-wrap">
<div class="form-block form-block-two-column">
<div class="left">
<div class="fz-left">
<h4 class="h4"><?php esc_html_e( 'Post Type', 'feedzy-rss-feeds' ); ?></h4>
</div>
<div class="right">
<div class="fz-right">
<div class="fz-form-group">
<label class="form-label"><?php esc_html_e( 'The post type you want to use for the generated post.', 'feedzy-rss-feeds' ); ?></label>
<div class="mx-320">
Expand All @@ -310,10 +310,10 @@ class="dashicons dashicons-arrow-down-alt2"></span>
</div>

<div class="form-block form-block-two-column">
<div class="left">
<div class="fz-left">
<h4 class="h4"><?php esc_html_e( 'Post Taxonomy', 'feedzy-rss-feeds' ); ?></h4>
</div>
<div class="right">
<div class="fz-right">
<div class="fz-form-group">
<label class="form-label"><?php esc_html_e( 'Assigns the post to a Category', 'feedzy-rss-feeds' ); ?></label>
<div class="mx-320">
Expand Down Expand Up @@ -342,10 +342,10 @@ class="dashicons dashicons-arrow-down-alt2"></span>
</div>

<div class="form-block form-block-two-column">
<div class="left">
<div class="fz-left">
<h4 class="h4"><?php esc_html_e( 'Post Status', 'feedzy-rss-feeds' ); ?></h4>
</div>
<div class="right">
<div class="fz-right">
<div class="fz-form-group">
<label class="form-label"><?php esc_html_e( 'The post status for the imported posts.', 'feedzy-rss-feeds' ); ?></label>
<div class="mx-320">
Expand All @@ -370,10 +370,10 @@ class="dashicons dashicons-arrow-down-alt2"></span>
</div>

<div class="form-block form-block-two-column">
<div class="left">
<div class="fz-left">
<h4 class="h4"><?php esc_html_e( 'Post Title', 'feedzy-rss-feeds' ); ?></h4>
</div>
<div class="right">
<div class="fz-right">
<div class="fz-form-group">
<label class="form-label"><?php esc_html_e( 'The title for the generated post.', 'feedzy-rss-feeds' ); ?></label>
<div class="fz-input-group">
Expand Down Expand Up @@ -405,10 +405,10 @@ class="dashicons dashicons-arrow-down-alt2"></span>
</div>

<div class="form-block form-block-two-column">
<div class="left">
<div class="fz-left">
<h4 class="h4"><?php esc_html_e( 'Post Date', 'feedzy-rss-feeds' ); ?></h4>
</div>
<div class="right">
<div class="fz-right">
<div class="fz-form-group">
<label class="form-label"><?php esc_html_e( 'The date for the generated post. ', 'feedzy-rss-feeds' ); ?></label>
<div class="fz-input-group">
Expand Down Expand Up @@ -441,10 +441,10 @@ class="dashicons dashicons-arrow-down-alt2"></span>
</div>

<div class="form-block form-block-two-column">
<div class="left">
<div class="fz-left">
<h4 class="h4"><?php esc_html_e( 'Content', 'feedzy-rss-feeds' ); ?></h4>
</div>
<div class="right">
<div class="fz-right">
<div class="fz-form-group">
<label class="form-label"><?php esc_html_e( 'The content for the generated post', 'feedzy-rss-feeds' ); ?></label>
<div class="fz-input-group">
Expand Down Expand Up @@ -484,10 +484,10 @@ class="form-control fz-textarea-tagify"><?php echo esc_html( feedzy_custom_tag_e
</div>

<div class="form-block form-block-two-column">
<div class="left">
<div class="fz-left">
<h4 class="h4"><?php esc_html_e( 'Featured image', 'feedzy-rss-feeds' ); ?></h4>
</div>
<div class="right">
<div class="fz-right">
<div class="fz-form-group">
<label class="form-label"><?php esc_html_e( 'The Featured image for the generated post.', 'feedzy-rss-feeds' ); ?></label>
<div class="fz-input-group">
Expand Down Expand Up @@ -523,10 +523,10 @@ class="form-control fz-textarea-tagify"><?php echo esc_html( feedzy_custom_tag_e
<div class="fz-tab-content" id="fz-advanced-options">
<div class="fz-form-wrap">
<div class="form-block form-block-two-column">
<div class="left">
<div class="fz-left">
<h4 class="h4"><?php esc_html_e( 'External image', 'feedzy-rss-feeds' ); ?></h4>
</div>
<div class="right">
<div class="fz-right">
<div class="fz-form-group">
<div class="fz-form-switch">
<input id="use-external-image" name="feedzy_meta_data[import_use_external_image]"
Expand All @@ -543,10 +543,10 @@ class="fz-switch-toggle" type="checkbox" value="yes"

<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'post-author', 'import' ) ); ?>
<div class="left">
<div class="fz-left">
<h4 class="h4"><?php esc_html_e( 'Post Author', 'feedzy-rss-feeds' ); ?> <?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
</div>
<div class="right">
<div class="fz-right">
<div class="fz-form-group">
<div class="fz-form-switch">
<input id="feedzy-toggle_author_admin" name="feedzy_meta_data[import_link_author_admin]"
Expand Down Expand Up @@ -578,10 +578,10 @@ class="fz-switch-toggle" type="checkbox" value="yes"
</div>

<div class="form-block form-block-two-column">
<div class="left">
<div class="fz-left">
<h4 class="h4"><?php esc_html_e( 'Post Excerpt', 'feedzy-rss-feeds' ); ?></h4>
</div>
<div class="right">
<div class="fz-right">
<div class="fz-form-group">
<label class="form-label"><?php esc_html_e( 'The Post Excerpt for the generated post', 'feedzy-rss-feeds' ); ?></label>
<div class="fz-input-group">
Expand Down Expand Up @@ -622,14 +622,14 @@ class="fz-switch-toggle" type="checkbox" value="yes"

<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'custom-fields', 'import' ) ); ?>
<div class="left">
<div class="fz-left">
<h4 class="h4"><?php esc_html_e( 'Custom Fields', 'feedzy-rss-feeds' ); ?> <?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
<div class="form-block-pro-text">
<?php esc_html_e( 'This feature is only for Pro users.', 'feedzy-rss-feeds' ); ?><br>
<a href="https://docs.themeisle.com/article/977-how-do-i-extract-values-from-custom-tags-in-feedzy" target="_blank"><?php esc_html_e( 'Learn More', 'feedzy-rss-feeds' ); ?></a>
</div>
</div>
<div class="right">
<div class="fz-right">
<div class="fz-form-group">
<label class="form-label pb-16"><?php esc_html_e( 'Customizable fields to fetch custom values such as date updated, rating, etc.', 'feedzy-rss-feeds' ); ?></label>
<div class="custom_fields">
Expand Down Expand Up @@ -690,10 +690,10 @@ class="fz-switch-toggle" type="checkbox" value="yes"
<div class="fz-form-wrap">
<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'auto-delete', 'import' ) ); ?>
<div class="left">
<div class="fz-left">
<h4 class="h4"><?php esc_html_e( 'Auto-Delete', 'feedzy-rss-feeds' ); ?> <?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
</div>
<div class="right">
<div class="fz-right">
<div class="fz-form-group">
<label class="form-label"><?php esc_html_e( 'Delete the posts created for this import after a number of days', 'feedzy-rss-feeds' ); ?></label>
<input type="number" min="0" max="9999" id="feedzy_delete_days" name="feedzy_meta_data[import_feed_delete_days]" class="form-control" value="<?php echo esc_attr( (int) $import_feed_delete_days ); ?>" />
Expand All @@ -705,10 +705,10 @@ class="fz-switch-toggle" type="checkbox" value="yes"
</div>

<div class="form-block form-block-two-column">
<div class="left">
<div class="fz-left">
<h4 class="h4"><?php esc_html_e( 'Remove Duplicates', 'feedzy-rss-feeds' ); ?></h4>
</div>
<div class="right">
<div class="fz-right">
<div class="fz-form-group">
<div class="fz-form-switch">
<input id="remove-duplicates" name="feedzy_meta_data[import_remove_duplicates]"
Expand All @@ -725,10 +725,10 @@ class="fz-switch-toggle" type="checkbox" value="yes"
</div>

<div class="form-block form-block-two-column">
<div class="left">
<div class="fz-left">
<h4 class="h4"><?php esc_html_e( 'Items Count', 'feedzy-rss-feeds' ); ?></h4>
</div>
<div class="right">
<div class="fz-right">
<div class="fz-form-group">
<label class="form-label"><?php esc_html_e( 'How many feed items to import from the source?', 'feedzy-rss-feeds' ); ?></label>
<input type="number" min="0" max="9999" id="feedzy_item_limit" name="feedzy_meta_data[import_feed_limit]" class="form-control" value="<?php echo esc_attr( (int) $import_feed_limit ); ?>" />
Expand All @@ -740,10 +740,10 @@ class="fz-switch-toggle" type="checkbox" value="yes"
</div>
<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'fallback-imaget', 'import' ) ); ?>
<div class="left">
<div class="fz-left">
<h4 class="h4"><?php esc_html_e( 'Fallback Image', 'feedzy-rss-feeds' ); ?> <?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
</div>
<div class="right">
<div class="fz-right">
<div class="fz-form-group">
<label class="form-label"><?php esc_html_e( 'Select an image to be the fallback featured image.', 'feedzy-rss-feeds' ); ?></label>
<?php
Expand All @@ -768,7 +768,7 @@ class="fz-switch-toggle" type="checkbox" value="yes"
</div>
<?php if ( function_exists( 'icl_get_languages' ) ) : ?>
<div class="form-block form-block-two-column">
<div class="left">
<div class="fz-left">
<h4 class="h4"><?php esc_html_e( 'Assign Language', 'feedzy-rss-feeds' ); ?><?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
<?php if ( ! feedzy_is_pro() ) : ?>
<div class="form-block-pro-text">
Expand All @@ -777,7 +777,7 @@ class="fz-switch-toggle" type="checkbox" value="yes"
</div>
<?php endif; ?>
</div>
<div class="right">
<div class="fz-right">
<div class="fz-form-group">
<label class="form-label"><?php esc_html_e( 'Content Language after import', 'feedzy-rss-feeds' ); ?></label>
<div class="mx-320">
Expand Down Expand Up @@ -1020,13 +1020,13 @@ class="fz-switch-toggle" type="checkbox" value="yes"
$target_lang = apply_filters( 'feedzy_available_automatically_translation_language', $target_lang );
?>
<div class="form-block form-block-two-column">
<div class="left">
<div class="fz-left">
<h4 class="h4"><?php esc_html_e( 'Enable automatic translation?', 'feedzy-rss-feeds' ); ?></h4>
<div class="form-block-pro-text">
<?php esc_html_e( 'Enable and select the language to translate the text automatically. Enable this only if you used the Translate magic tags. The default is English', 'feedzy-rss-feeds' ); ?>
</div>
</div>
<div class="right">
<div class="fz-right">
<div class="fz-form-group">
<div style="margin-bottom: 5px;">
<input id="feedzy-auto-translation" name="feedzy_meta_data[import_auto_translation]" class="fz-switch-toggle" type="checkbox" value="yes" <?php echo esc_attr( $import_auto_translation ); ?>>
Expand Down Expand Up @@ -1056,7 +1056,7 @@ class="fz-switch-toggle" type="checkbox" value="yes"

<input type="hidden" id="custom_post_status" name="custom_post_status" value="draft" />
<div class="fz-form-action">
<div class="left">
<div class="fz-left">
<?php
$clone_url = wp_nonce_url(
add_query_arg(
Expand All @@ -1072,7 +1072,7 @@ class="fz-switch-toggle" type="checkbox" value="yes"
?>
<a href="<?php echo esc_url( $clone_url ); ?>" class="btn btn-ghost"><?php esc_html_e( 'Clone Import', 'feedzy-rss-feeds' ); ?></a>
</div>
<div class="right">
<div class="fz-right">
<button type="button" id="preflight" name="check" class="btn btn-ghost" value="Check"
title="<?php esc_html_e( 'Click to see what items will be imported from the source, according to the filters specified', 'feedzy-rss-feeds' ); ?>"><?php esc_html_e( 'Preview Import', 'feedzy-rss-feeds' ); ?></button>
<?php
Expand Down
Loading