Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop:
  v.1.4.9
  block editor fixes
  • Loading branch information
Vanesa Reinerth committed Apr 8, 2020
2 parents 68e7b48 + aea7de4 commit d928b9f
Show file tree
Hide file tree
Showing 12 changed files with 319 additions and 94 deletions.
9 changes: 6 additions & 3 deletions README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
Contributors: getbowtied, vanesareinerth, adrianlbs
Tags: gutenberg, blocks
Requires at least: 5.0
Tested up to: 5.3.2
Stable tag: 1.4.8
Tested up to: 5.4
Stable tag: 1.4.9
Requires PHP: 5.5.0
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
~Current Version:1.4.8~
~Current Version:1.4.9~

Extends the functionality of the The Retailer theme by adding theme specific features.

Expand Down Expand Up @@ -39,6 +39,9 @@ Companion plugin for the **The Retailer** theme. Extends the functionality by ad

== Changelog ==

= 1.4.9 =
- Small maintenance updates

= 1.4.8 =
- Small maintenance updates

Expand Down
8 changes: 4 additions & 4 deletions core/updater/assets/plugin.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"name": "The Retailer Extender",
"version": "1.4.8",
"version": "1.4.9",
"download_url": "https://github.com/getbowtied/the-retailer-extender/zipball/master",

"homepage": "https://themeforest.net/item/the-retailer-responsive-wordpress-theme/4287447",
"requires": "5.0",
"tested": "5.3.2",
"last_updated": "2020-03-25 13:00:00",
"tested": "5.4",
"last_updated": "2020-04-08 10:00:00",

"author": "GetBowtied",
"author_homepage": "https://getbowtied.com/",

"sections": {
"description": "<p>Companion plugin for the <b>The Retailer</b> theme. Extends the functionality by adding theme specific features.</p><h4>Features:</h4><ul><li>Adds 'Social Media' section in Customizer for easy management of links to social media profiles</li><li>Adds header image option for WooCommerce product categories</li><li>Adds 'Additional JS' section in Customizer allowing for site customization with custom JavaScript code</li><li>Adds social sharing buttons for WooCommerce products and blog posts</li></ul><h4>Gutenberg Blocks:</h4><ul><li>Banner</li><li>Image Slider</li><li>Posts Grid</li><li>Social Media Profiles</li></ul><h4>WPBakery Page Builder Elements:</h4><ul><li>Slider</li><li>Banner</li><li>Blog Posts</li><li>Title & Subtitle</li><li>Social Media Profiles</li><li>Team Members</li><li>Icon Box</li><li>Product Sliders</li></ul>",
"changelog": "<h4>1.4.8</h4><ul><li>Small maintenance updates</li></ul><h4>1.4.7</h4><ul><li>Fixed: Localization issues</li></ul><h4>1.4.6</h4><ul><li>Fixed: Slider arrows display</li></ul><h4>1.4.5</h4><ul><li>Updated the language template file</li></ul><h4>1.4.4</h4><ul><li>WordPress 5.3.1 compatibility updates</li></ul><h4>1.4.3</h4><ul><li>WordPress 5.3 compatibility updates</li></ul><h4>1.4.2</h4><ul><li>Upcoming WordPress 5.3 compatibility updates</li></ul><h4>1.4.1</h4><ul><li>Fixed: Header image add/remove option for WooCommerce product categories</li><li>The Retailer 3.1.0 compatibility updates</li></ul><h4>1.4</h4><ul><li>The Retailer 3 compatibility updates</li></ul><h4>1.3.2</h4><ul><li>Fixed: Featured products slider shortcode display issues</li></ul><h4>1.3.1</h4><ul><li>Added: Row and Inner Row Options for WPBakery's Page Builder</li></ul><h4>1.3</h4><ul><li>Adds: the 'Social Media' section in Customizer allowing for easy management of links to social media profiles. The icons are being displayed in the footer area and can be displayed in pages using the Gutenberg Block or the WPBakery Page Builder element (functionality transferred from the theme).</li><li>Adds: Theme-specific WPBakery Page Builder elements: Slider, Banner, Blog Posts, Title & Subtitle, Social Media Profiles, Team Members, Icon Box, Product Sliders (functionality transferred from the theme).</li><li>Adds: Upload header images for WooCommerce product categories (functionality transferred from the theme).</li><li>Adds: Theme-specific 'Additional JS' section in Customizer allowing for site customization with custom JavaScript code</li><li>Adds: Theme-specific social sharing buttons for WooCommerce products and blog posts</li></ul><h4>1.2.2</h4><ul><li>WordPress 5.1 compatibility improvements</li></ul><h4>1.2.1</h4><ul><li>Fixed: Columns Block displaying issue</li></ul><h4>1.2</h4><ul><li>WordPress 5+ compatibility improvements</li><li>Improved styles for theme neutrality</li> <li>Localization issues with the Posts Grid Block</li></ul><h4>1.1</h4><ul><li>WordPress 5+ compatibility improvements</li></ul><h4>1.0</h4><ul><li>Initial Version</li></ul>"
"changelog": "<h4>1.4.9</h4><ul><li>Small maintenance updates</li></ul><h4>1.4.8</h4><ul><li>Small maintenance updates</li></ul><h4>1.4.7</h4><ul><li>Fixed: Localization issues</li></ul><h4>1.4.6</h4><ul><li>Fixed: Slider arrows display</li></ul><h4>1.4.5</h4><ul><li>Updated the language template file</li></ul><h4>1.4.4</h4><ul><li>WordPress 5.3.1 compatibility updates</li></ul><h4>1.4.3</h4><ul><li>WordPress 5.3 compatibility updates</li></ul><h4>1.4.2</h4><ul><li>Upcoming WordPress 5.3 compatibility updates</li></ul><h4>1.4.1</h4><ul><li>Fixed: Header image add/remove option for WooCommerce product categories</li><li>The Retailer 3.1.0 compatibility updates</li></ul><h4>1.4</h4><ul><li>The Retailer 3 compatibility updates</li></ul><h4>1.3.2</h4><ul><li>Fixed: Featured products slider shortcode display issues</li></ul><h4>1.3.1</h4><ul><li>Added: Row and Inner Row Options for WPBakery's Page Builder</li></ul><h4>1.3</h4><ul><li>Adds: the 'Social Media' section in Customizer allowing for easy management of links to social media profiles. The icons are being displayed in the footer area and can be displayed in pages using the Gutenberg Block or the WPBakery Page Builder element (functionality transferred from the theme).</li><li>Adds: Theme-specific WPBakery Page Builder elements: Slider, Banner, Blog Posts, Title & Subtitle, Social Media Profiles, Team Members, Icon Box, Product Sliders (functionality transferred from the theme).</li><li>Adds: Upload header images for WooCommerce product categories (functionality transferred from the theme).</li><li>Adds: Theme-specific 'Additional JS' section in Customizer allowing for site customization with custom JavaScript code</li><li>Adds: Theme-specific social sharing buttons for WooCommerce products and blog posts</li></ul><h4>1.2.2</h4><ul><li>WordPress 5.1 compatibility improvements</li></ul><h4>1.2.1</h4><ul><li>Fixed: Columns Block displaying issue</li></ul><h4>1.2</h4><ul><li>WordPress 5+ compatibility improvements</li><li>Improved styles for theme neutrality</li> <li>Localization issues with the Posts Grid Block</li></ul><h4>1.1</h4><ul><li>WordPress 5+ compatibility improvements</li></ul><h4>1.0</h4><ul><li>Initial Version</li></ul>"
},

"icons" : {
Expand Down
3 changes: 1 addition & 2 deletions includes/gbt-blocks/assets/css/editor.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
.main-inspector-wrapper {
border-top: 1px solid #e2e4e7;
margin-top: 15px;
padding-top: 15px; }
padding: 15px; }
.main-inspector-wrapper .products-ajax-search-wrapper {
position: relative; }
.main-inspector-wrapper .products-ajax-search-wrapper.is-disabled .components-base-control__field {
Expand Down
49 changes: 24 additions & 25 deletions includes/gbt-blocks/assets/css/editor.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
.main-inspector-wrapper {
border-top: 1px solid #e2e4e7;
margin-top: 15px;
padding-top: 15px;
padding: 15px;
.products-ajax-search-wrapper {
position: relative;

&.is-disabled{
.components-base-control__field {
opacity: .3;
Expand Down Expand Up @@ -49,7 +48,7 @@
overflow-y: auto;
overflow-x: hidden;
margin-top: -9px;

.no-results {
display: inline-block;
margin: 20px 12px;
Expand All @@ -68,7 +67,7 @@
border-bottom: 1px solid #E8EBEF;
transition: all 0.3s ease-in-out;
cursor: pointer;

&:hover {
background:#F8FCFF;
.dashicons-yes {
Expand All @@ -88,19 +87,19 @@
line-height: 51px;
padding-left: 51px;
cursor: pointer;

input[type="checkbox"]{
display: none;
}
}

.img-wrapper{
width: 32px;
height: 32px;
position: relative;
margin-right: 12px;
margin-left: 12px;
flex: 0 0 32px;
flex: 0 0 32px;

.img {
background-size: cover;
Expand All @@ -110,7 +109,7 @@
position: absolute;
left: 0;
top: 0;
}
}
}

&:after {
Expand All @@ -136,7 +135,7 @@

&.selected {
background:#F8FCFF;

&:after {
background: linear-gradient(to left, rgba(248, 252, 255, 1), rgba(248, 252, 255, 0.7));
}
Expand Down Expand Up @@ -170,7 +169,7 @@
overflow-y: auto;
overflow-x: hidden;
padding-left: 2px;

.single-result {
display: flex;
align-items: center;
Expand All @@ -183,11 +182,11 @@
cursor: pointer;
box-sizing: border-box;
background:#F8FCFF;

&:last-child {
border-bottom: none;
}

.title-wrapper {
position: absolute;
left: 0;
Expand All @@ -197,19 +196,19 @@
line-height: 51px;
padding-left: 51px;
cursor: pointer;

input[type="checkbox"]{
display: none;
}
}

.img-wrapper{
width: 32px;
height: 32px;
position: relative;
margin-right: 12px;
margin-left: 12px;
flex: 0 0 32px;
flex: 0 0 32px;

.img {
background-size: cover;
Expand All @@ -219,7 +218,7 @@
position: absolute;
left: 0;
top: 0;
}
}
}

&:after {
Expand Down Expand Up @@ -280,10 +279,10 @@
margin-bottom: 20px;
padding-left: 3px;
margin-top: 10px;

ul {
list-style: none;
margin: 0;
margin: 0;
padding: 0;
&.level-1 {
margin-left: 10px;
Expand All @@ -306,16 +305,16 @@
width: 100%;
position: relative;
transition: all .3s ease-in-out;

sup {
margin-left: 4px;
color: #ccc;
}

.expand {
position: absolute;
right: 0;
transition: all .3s ease-in-out;
right: 0;
transition: all .3s ease-in-out;
}

&.expanded {
Expand All @@ -335,16 +334,16 @@
width: 100%;
position: relative;
margin-bottom: 10px;

sup {
margin-left: 4px;
color: #ccc;
}
}
}
button.render-results {
margin-top:20px;
margin-top:20px;

&.disabled {
color: #4daacf;
background: #005d82;
Expand Down
95 changes: 94 additions & 1 deletion includes/gbt-blocks/banner/assets/css/editor.css
Original file line number Diff line number Diff line change
@@ -1 +1,94 @@
.gbt_18_tr_editor_banner:hover{background-size:115%}.gbt_18_tr_editor_banner:hover .gbt_18_tr_editor_banner_background{-webkit-transform:scale(1.1);-ms-transform:scale(1.1);transform:scale(1.1)}.gbt_18_tr_editor_banner .gbt_18_tr_editor_banner_wrapper{cursor:pointer;margin-bottom:30px;clear:both;position:relative}.gbt_18_tr_editor_banner .gbt_18_tr_editor_banner_wrapper .gbt_18_tr_editor_banner_wrapper_inner{padding:15px;overflow:hidden;position:relative;backface-visibility:hidden;-webkit-backface-visibility:hidden;height:100%}.gbt_18_tr_editor_banner .gbt_18_tr_editor_banner_wrapper .gbt_18_tr_editor_banner_wrapper_inner .gbt_18_tr_editor_banner_background{width:100%;height:100%;position:absolute;top:0;left:0;bottom:0;right:0;display:block;background-color:#f5f5f5;background-size:cover;background-repeat:no-repeat;background-position:center;-webkit-transition:all 1s ease;-o-transition:all 1s ease;transition:all 1s ease;z-index:2}.gbt_18_tr_editor_banner .gbt_18_tr_editor_banner_wrapper .gbt_18_tr_editor_banner_wrapper_inner:before{content:"";display:block;position:absolute;top:0;left:0;width:100%;height:100%;-webkit-transition:all 0.2s linear;-o-transition:all 0.2s linear;transition:all 0.2s linear;z-index:3}.gbt_18_tr_editor_banner .gbt_18_tr_editor_banner_wrapper .gbt_18_tr_editor_banner_wrapper_inner:hover .gbt_18_tr_editor_banner_background{-webkit-transform:scale(1.1);-ms-transform:scale(1.1);transform:scale(1.1)}.gbt_18_tr_editor_banner .gbt_18_tr_editor_banner_wrapper .gbt_18_tr_editor_banner_wrapper_inner:hover:before{background:rgba(0, 0, 0, 0.3)}.gbt_18_tr_editor_banner .gbt_18_tr_editor_banner_wrapper .gbt_18_tr_editor_banner_content{padding:20px;text-align:center;-webkit-transition:all 0.2s linear;-o-transition:all 0.2s linear;transition:all 0.2s linear;cursor:default;display:table;width:100%;-webkit-box-sizing:border-box;box-sizing:border-box;height:100%;position:relative;z-index:4}.gbt_18_tr_editor_banner .gbt_18_tr_editor_banner_wrapper .gbt_18_tr_editor_banner_content .editor-rich-text{cursor:text}.gbt_18_tr_editor_banner .gbt_18_tr_editor_banner_wrapper .gbt_18_tr_editor_banner_content .gbt_18_tr_editor_banner_text_content{display:table-cell;vertical-align:middle;text-align:center;position:relative}.gbt_18_tr_editor_banner .gbt_18_tr_editor_banner_wrapper .gbt_18_tr_editor_banner_content .gbt_18_tr_editor_banner_text_content .gbt_18_tr_editor_banner_title{padding:0;margin:0 0 10px 0;font-weight:900}.gbt_18_tr_editor_banner .gbt_18_tr_editor_banner_wrapper .gbt_18_tr_editor_banner_content .gbt_18_tr_editor_banner_text_content .gbt_18_tr_editor_banner_subtitle{padding:0;margin:0;font-weight:normal}.gbt_18_tr_editor_banner .gbt_18_tr_editor_banner_wrapper .button.gbt_18_tr_editor_banner_add_image,.gbt_18_tr_editor_banner .gbt_18_tr_editor_banner_wrapper .button.gbt_18_tr_editor_banner_remove_image{position:absolute;visibility:hidden;opacity:0;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out;z-index:100;top:30px;left:30px}.wp-block.editor-block-list__block[data-type="getbowtied/tr-banner"].is-hovered .button.gbt_18_tr_editor_banner_add_image,.wp-block.editor-block-list__block[data-type="getbowtied/tr-banner"].is-hovered .button.gbt_18_tr_editor_banner_remove_image,.wp-block.editor-block-list__block[data-type="getbowtied/tr-banner"].is-selected .button.gbt_18_tr_editor_banner_add_image,.wp-block.editor-block-list__block[data-type="getbowtied/tr-banner"].is-selected .button.gbt_18_tr_editor_banner_remove_image,.wp-block.editor-block-list__block[data-type="getbowtied/tr-banner"].is-typing .button.gbt_18_tr_editor_banner_add_image,.wp-block.editor-block-list__block[data-type="getbowtied/tr-banner"].is-typing .button.gbt_18_tr_editor_banner_remove_image{visibility:visible;opacity:1}
.gbt_18_tr_editor_banner:hover {
background-size: 115%; }
.gbt_18_tr_editor_banner:hover .gbt_18_tr_editor_banner_background {
-webkit-transform: scale(1.1);
-ms-transform: scale(1.1);
transform: scale(1.1); }

.gbt_18_tr_editor_banner .gbt_18_tr_editor_banner_wrapper {
cursor: pointer;
margin-bottom: 30px;
clear: both;
position: relative; }
.gbt_18_tr_editor_banner .gbt_18_tr_editor_banner_wrapper .gbt_18_tr_editor_banner_wrapper_inner {
padding: 15px;
overflow: hidden;
position: relative;
backface-visibility: hidden;
-webkit-backface-visibility: hidden;
height: 100%; }
.gbt_18_tr_editor_banner .gbt_18_tr_editor_banner_wrapper .gbt_18_tr_editor_banner_wrapper_inner .gbt_18_tr_editor_banner_background {
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
display: block;
background-color: #f5f5f5;
background-size: cover;
background-repeat: no-repeat;
background-position: center;
-webkit-transition: all 1s ease;
-o-transition: all 1s ease;
transition: all 1s ease;
z-index: 2; }
.gbt_18_tr_editor_banner .gbt_18_tr_editor_banner_wrapper .gbt_18_tr_editor_banner_wrapper_inner:before {
content: "";
display: block;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
-webkit-transition: all 0.2s linear;
-o-transition: all 0.2s linear;
transition: all 0.2s linear;
z-index: 3; }
.gbt_18_tr_editor_banner .gbt_18_tr_editor_banner_wrapper .gbt_18_tr_editor_banner_wrapper_inner:hover .gbt_18_tr_editor_banner_background {
-webkit-transform: scale(1.1);
-ms-transform: scale(1.1);
transform: scale(1.1); }
.gbt_18_tr_editor_banner .gbt_18_tr_editor_banner_wrapper .gbt_18_tr_editor_banner_wrapper_inner:hover:before {
background: rgba(0, 0, 0, 0.3); }
.gbt_18_tr_editor_banner .gbt_18_tr_editor_banner_wrapper .gbt_18_tr_editor_banner_content {
padding: 20px;
text-align: center;
-webkit-transition: all 0.2s linear;
-o-transition: all 0.2s linear;
transition: all 0.2s linear;
cursor: default;
display: table;
width: 100%;
-webkit-box-sizing: border-box;
box-sizing: border-box;
height: 100%;
position: relative;
z-index: 4; }
.gbt_18_tr_editor_banner .gbt_18_tr_editor_banner_wrapper .gbt_18_tr_editor_banner_content .editor-rich-text {
cursor: text; }
.gbt_18_tr_editor_banner .gbt_18_tr_editor_banner_wrapper .gbt_18_tr_editor_banner_content .gbt_18_tr_editor_banner_text_content {
display: table-cell;
vertical-align: middle;
text-align: center;
position: relative; }
.gbt_18_tr_editor_banner .gbt_18_tr_editor_banner_wrapper .gbt_18_tr_editor_banner_content .gbt_18_tr_editor_banner_text_content .gbt_18_tr_editor_banner_title {
padding: 0;
margin: 0 0 10px 0;
font-weight: 900; }
.gbt_18_tr_editor_banner .gbt_18_tr_editor_banner_wrapper .gbt_18_tr_editor_banner_content .gbt_18_tr_editor_banner_text_content .gbt_18_tr_editor_banner_subtitle {
padding: 0;
margin: 0;
font-weight: normal; }
.gbt_18_tr_editor_banner .gbt_18_tr_editor_banner_wrapper .button.gbt_18_tr_editor_banner_add_image,
.gbt_18_tr_editor_banner .gbt_18_tr_editor_banner_wrapper .button.gbt_18_tr_editor_banner_remove_image {
position: absolute;
visibility: visible;
opacity: 1;
-webkit-transition: all .2s ease-in-out;
-o-transition: all .2s ease-in-out;
transition: all .2s ease-in-out;
z-index: 100;
top: 30px;
left: 30px; }
18 changes: 2 additions & 16 deletions includes/gbt-blocks/banner/assets/scss/editor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -102,26 +102,12 @@
.button.gbt_18_tr_editor_banner_remove_image
{
position: absolute;
visibility: hidden;
opacity: 0;
visibility: visible;
opacity: 1;
transition: all .2s ease-in-out;
z-index: 100;
top: 30px;
left: 30px;
}
}
}

.wp-block.editor-block-list__block[data-type="getbowtied/tr-banner"] {

&.is-selected,
&.is-hovered,
&.is-typing {

.button.gbt_18_tr_editor_banner_add_image,
.button.gbt_18_tr_editor_banner_remove_image {
visibility: visible;
opacity: 1;
}
}
}
Loading

0 comments on commit d928b9f

Please sign in to comment.