diff --git a/css/metabox-settings.css b/css/metabox-settings.css index fae7c4c5..8701a53c 100644 --- a/css/metabox-settings.css +++ b/css/metabox-settings.css @@ -42,6 +42,7 @@ .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-input-group .fz-insert-tags{width: auto; padding: 0;} .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;} diff --git a/css/settings.css b/css/settings.css index 10d681fe..d1e5b212 100644 --- a/css/settings.css +++ b/css/settings.css @@ -93,6 +93,9 @@ .mx-320{ max-width: 320px; } +.position-relative{position: relative;} +.position-absolute{position: absolute;} + .feedzy-wrap a:not(#fz-feedback-btn):focus{ box-shadow: none; outline: 0; @@ -110,6 +113,9 @@ color: #ffffff; vertical-align: super; } +.feedzy-wrap .feedzy-accordion-item .pro-label{ + font-size: 0.55rem !important; +} .post-type-feedzy_imports:not(.edit-post) .wrap div#side-sortables{ display: none; @@ -140,12 +146,17 @@ } /* feedzy accordion style start */ +.feedzy-accordion-item, +.feedzy-accordion-item *{ + font-size: 15px !important; +} .feedzy-accordion-item{ background: #ffffff; border: 1px solid #D9D9D9; } .feedzy-accordion-item__title{ position: relative; + padding: 8px 15px; } .fdz-upgrade-link{ width: 100%; @@ -169,34 +180,38 @@ border: 0; background: transparent; outline: 0; - padding: 30px 90px 30px 30px; + padding: 10px; } .feedzy-accordion-item .feedzy-accordion__step-number{ padding-bottom: 10px; } .feedzy-accordion-item .feedzy-accordion__step-title{ color: #050505; + line-height: 1.3; } .feedzy-accordion-item .feedzy-accordion__icon{ position: absolute; right: 30px; top: 50%; - margin-top: -24px; - width: 48px; - height: 48px; + margin-top: -15px; + width: 30px; + height: 30px; background: #F0F2F5; border-radius: 24px; display: flex; align-items: center; justify-content: center; font-size: 20px; - line-height: 1; + line-height: 1.5; color: #757575; -webkit-transition: all 0.3s ease-in-out; -moz-transition: all 0.3s ease-in-out; -o-transition: all 0.3s ease-in-out; transition: all 0.3s ease-in-out; } +.feedzy-accordion-item .feedzy-accordion__icon .dashicons{ + line-height: 1.5; +} .feedzy-accordion-item .feedzy-accordion__icon.feedzy-accordion__icon--success{ width: 24px; height: 24px; @@ -235,6 +250,8 @@ -moz-transition: all 0.3s ease-in-out; -o-transition: all 0.3s ease-in-out; transition: all 0.3s ease-in-out; + font-size: 10px !important; + margin-right: 5px; } .feedzy-accordion .feedzy-accordion-item .is-active .feedzy-accordion__step-number{ opacity: 1; @@ -297,6 +314,7 @@ height: auto; min-height: 48px; padding-top: 2px; + line-height: 0; } .fz-form-wrap .form-control:focus { @@ -377,6 +395,16 @@ fieldset[disabled] .form-control { .fz-input-group .fz-input-group-right .dropdown-toggle{ min-width: 150px; } +.fz-input-group .fz-insert-tags{ + top: 7px; + right: 10px; +} +.fz-input-group .fz-insert-tags button.dropdown-toggle { + padding: 5px 20px; + border: 2px solid; + border-radius: 5px; + min-width: auto; +} .fz-input-group .help-text{ padding-top: 8px; } @@ -946,6 +974,13 @@ input.fz-switch-toggle[type=checkbox]:checked:before{ .tag-list .tagify{ border: 0; } +.fz-form-wrap .tagify>.tagify__tag{ + margin: 5px 7px 7px; +} +.fz-form-wrap .tagify .tagify__tag .tagify__input, +.fz-form-wrap .tagify .tagify__input{ + padding: 5px; +} .fz-form-wrap .tagify__tag{ position: relative; margin-left: 2px; @@ -2559,6 +2594,9 @@ li.draggable-item .components-panel__body-toggle.components-button{ border-bottom: 0; padding: 24px 0 0; } +span.dashicons { + line-height: 1.3; +} @-webkit-keyframes spin { 100% { -webkit-transform: rotate(360deg); } } diff --git a/includes/admin/feedzy-rss-feeds-import.php b/includes/admin/feedzy-rss-feeds-import.php index a0c0c4d7..e3952138 100644 --- a/includes/admin/feedzy-rss-feeds-import.php +++ b/includes/admin/feedzy-rss-feeds-import.php @@ -436,6 +436,12 @@ public function feedzy_import_feed_options() { $import_link_author[1] = 'checked'; } + // default values when creating a import. + if ( 'post-new.php' === $pagenow ) { + $import_date = '[#item_date]'; + $import_featured_img = '[[{"value":"%5B%7B%22id%22%3A%22%22%2C%22tag%22%3A%22item_image%22%2C%22data%22%3A%7B%7D%7D%5D"}]]'; + } + // maybe more options are required from pro? $pro_options = apply_filters( 'feedzy_metabox_options', array(), $post->ID ); diff --git a/includes/views/import-metabox-edit.php b/includes/views/import-metabox-edit.php index cdc04160..fe609062 100644 --- a/includes/views/import-metabox-edit.php +++ b/includes/views/import-metabox-edit.php @@ -52,10 +52,8 @@ class="form-control" />
- +
@@ -116,7 +114,7 @@ class="dashicons dashicons-arrow-down-alt2">
-
+
@@ -131,13 +129,6 @@ class="dashicons dashicons-arrow-down-alt2">
-
-

- -

-
-
@@ -241,9 +230,6 @@ class="dashicons dashicons-arrow-down-alt2">
-
+
+
+ +
+ +
+
+
-
-
-
- -
- -
-
+
+ +
@@ -310,15 +298,23 @@ class="dashicons dashicons-arrow-down-alt2">
-
-
+
+
+
+ +
+ +
+
+
?>
-
-
- -
- -
-
-
@@ -350,15 +335,24 @@ class="dashicons dashicons-arrow-down-alt2">
-
-
- + class="form-control fz-input-tagify" + value="" /> +
+
+ +
+ +
+
+
-
-
- -
- -
-
-
@@ -402,15 +385,23 @@ class="form-control fz-textarea-tagify">
-
-
+
+
+
+ +
+ +
+
+
-
-
- -
- -
-
-
@@ -463,7 +443,6 @@ class="fz-switch-toggle" type="checkbox" value="yes"
-
+
+
+ +
+ +
+
+
-
-
- -
- -
-
-
@@ -566,9 +542,6 @@ class="fz-switch-toggle" type="checkbox" value="yes"
-
{ return document.querySelector( '.fz-action-popup .fz-action-panel ul' ); }; + const actionButtonTitle = action.length ? __( 'Save Actions', 'feedzy-rss-feeds' ) : __( 'Skip Actions', 'feedzy-rss-feeds' ); + // Click to open action popup. document.querySelectorAll( '[data-action_popup]' ).forEach( actionItem => { actionItem.addEventListener( 'click', ( event ) => { @@ -434,7 +436,7 @@ const ActionModal = () => {
)}
- { action && ( ) } + { action && ( ) }
diff --git a/tests/e2e/utils.js b/tests/e2e/utils.js index e3656267..cf93ba8b 100644 --- a/tests/e2e/utils.js +++ b/tests/e2e/utils.js @@ -51,7 +51,7 @@ export async function addFeaturedImage( page, feedTag ) { */ export async function addContentMapping( page, mapping ) { await page.evaluate( ( mapping ) => { - document.querySelector( 'textarea[name="feedzy_meta_data[import_post_content]"]' ).value = mapping; + document.querySelector( 'input[name="feedzy_meta_data[import_post_content]"]' ).value = mapping; }, mapping ); }