Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/gambitph/Stackable into …
Browse files Browse the repository at this point in the history 
…develop
  • Loading branch information
Benjamin Intal authored and Benjamin Intal committed Oct 17, 2023
2 parents 7b07493 + a240ccd commit dabb90b
Show file tree
Hide file tree
Showing 13 changed files with 0 additions and 248 deletions.
19 changes: 0 additions & 19 deletions src/block/blockquote/deprecated.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,6 @@ const deprecated = [
version: 2,
}

// Container borders while the container was turned off was allowed
// before, now it's not allowed. Turn on the container to mimic the
// effect. This goes first before the container paddings check below
// because we need to set the paddings to zero for this to work.
const hasContainerBorders = !! attributes.containerBorderType ||
( typeof attributes.containerBorderRadius !== 'undefined' && attributes.containerBorderRadius !== '' ) ||
!! attributes.containerShadow

if ( ! attributes.hasContainer && hasContainerBorders ) {
newAttributes = {
...newAttributes,
hasContainer: true,
containerPadding: {
top: 0, right: 0, bottom: 0, left: 0,
},
containerBackgroundColor: 'transparent',
}
}

newAttributes = deprecateContainerBackgroundColorOpacity.migrate( newAttributes )
newAttributes = deprecateBlockBackgroundColorOpacity.migrate( newAttributes )

Expand Down
19 changes: 0 additions & 19 deletions src/block/call-to-action/deprecated.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,25 +60,6 @@ const deprecated = [
}
}

// Container borders while the container was turned off was allowed
// before, now it's not allowed. Turn on the container to mimic the
// effect. This goes first before the container paddings check below
// because we need to set the paddings to zero for this to work.
const hasContainerBorders = !! attributes.containerBorderType ||
( typeof attributes.containerBorderRadius !== 'undefined' && attributes.containerBorderRadius !== '' ) ||
!! attributes.containerShadow

if ( ! attributes.hasContainer && hasContainerBorders ) {
newAttributes = {
...newAttributes,
hasContainer: true,
containerPadding: {
top: 0, right: 0, bottom: 0, left: 0,
},
containerBackgroundColor: 'transparent',
}
}

// If the inner blocks are horizontal, adjust to accomodate the new
// column gap, it will modify blocks because people used block
// margins before instead of a proper column gap.
Expand Down
19 changes: 0 additions & 19 deletions src/block/card/deprecated.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,25 +112,6 @@ const deprecated = [
}
}

// Container borders while the container was turned off was allowed
// before, now it's not allowed. Turn on the container to mimic the
// effect. This goes first before the container paddings check below
// because we need to set the paddings to zero for this to work.
const hasContainerBorders = !! attributes.containerBorderType ||
( typeof attributes.containerBorderRadius !== 'undefined' && attributes.containerBorderRadius !== '' ) ||
!! attributes.containerShadow

if ( ! attributes.hasContainer && hasContainerBorders ) {
newAttributes = {
...newAttributes,
hasContainer: true,
containerPadding: {
top: 0, right: 0, bottom: 0, left: 0,
},
containerBackgroundColor: 'transparent',
}
}

// If the inner blocks are horizontal, adjust to accomodate the new
// column gap, it will modify blocks because people used block
// margins before instead of a proper column gap.
Expand Down
19 changes: 0 additions & 19 deletions src/block/column/deprecated.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,25 +104,6 @@ const deprecated = [
}
}

// Container borders while the container was turned off was allowed
// before, now it's not allowed. Turn on the container to mimic the
// effect. This goes first before the container paddings check below
// because we need to set the paddings to zero for this to work.
const hasContainerBorders = !! attributes.containerBorderType ||
( typeof attributes.containerBorderRadius !== 'undefined' && attributes.containerBorderRadius !== '' ) ||
!! attributes.containerShadow

if ( ! attributes.hasContainer && hasContainerBorders ) {
newAttributes = {
...newAttributes,
hasContainer: true,
containerPadding: {
top: 0, right: 0, bottom: 0, left: 0,
},
containerBackgroundColor: 'transparent',
}
}

// If the inner blocks are horizontal, adjust to accomodate the new
// column gap, it will modify blocks because people used block
// margins before instead of a proper column gap.
Expand Down
19 changes: 0 additions & 19 deletions src/block/countdown/deprecated.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,6 @@ const deprecated = [
migrate: attributes => {
let newAttributes = { ...attributes }

// Container borders while the container was turned off was allowed
// before, now it's not allowed. Turn on the container to mimic the
// effect. This goes first before the container paddings check below
// because we need to set the paddings to zero for this to work.
const hasContainerBorders = !! attributes.containerBorderType ||
( typeof attributes.containerBorderRadius !== 'undefined' && attributes.containerBorderRadius !== '' ) ||
!! attributes.containerShadow

if ( ! attributes.hasContainer && hasContainerBorders ) {
newAttributes = {
...newAttributes,
hasContainer: true,
containerPadding: {
top: 0, right: 0, bottom: 0, left: 0,
},
containerBackgroundColor: 'transparent',
}
}

newAttributes = deprecateContainerBackgroundColorOpacity.migrate( newAttributes )
newAttributes = deprecateBlockBackgroundColorOpacity.migrate( newAttributes )
newAttributes = deprecateTypographyGradientColor.migrate( 'digit%s' )( newAttributes )
Expand Down
19 changes: 0 additions & 19 deletions src/block/feature/deprecated.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,25 +89,6 @@ const deprecated = [
}
}

// Container borders while the container was turned off was allowed
// before, now it's not allowed. Turn on the container to mimic the
// effect. This goes first before the container paddings check below
// because we need to set the paddings to zero for this to work.
const hasContainerBorders = !! attributes.containerBorderType ||
( typeof attributes.containerBorderRadius !== 'undefined' && attributes.containerBorderRadius !== '' ) ||
!! attributes.containerShadow

if ( ! attributes.hasContainer && hasContainerBorders ) {
newAttributes = {
...newAttributes,
hasContainer: true,
containerPadding: {
top: 0, right: 0, bottom: 0, left: 0,
},
containerBackgroundColor: 'transparent',
}
}

newAttributes = deprecateContainerBackgroundColorOpacity.migrate( newAttributes )
newAttributes = deprecateBlockBackgroundColorOpacity.migrate( newAttributes )

Expand Down
20 changes: 0 additions & 20 deletions src/block/hero/deprecated.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,26 +60,6 @@ const deprecated = [
}
}

// Container borders while the container was turned off was allowed
// before, now it's not allowed. Turn on the container to mimic the
// effect. This goes first before the container paddings check below
// because we need to set the paddings to zero for this to work.
const hasContainerBorders = !! attributes.containerBorderType ||
( typeof attributes.containerBorderRadius !== 'undefined' && attributes.containerBorderRadius !== '' ) ||
!! attributes.containerShadow

if ( ! attributes.hasContainer && hasContainerBorders ) {
newAttributes = {
...newAttributes,
hasContainer: true,
containerPadding: {
top: 0, right: 0, bottom: 0, left: 0,
},
containerBackgroundColorOpacity: 0,
// containerBackgroundColor: 'transparent',
}
}

// If the inner blocks are horizontal, adjust to accomodate the new
// column gap, it will modify blocks because people used block
// margins before instead of a proper column gap.
Expand Down
19 changes: 0 additions & 19 deletions src/block/icon-box/deprecated.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,25 +33,6 @@ const deprecated = [
}
}

// Container borders while the container was turned off was allowed
// before, now it's not allowed. Turn on the container to mimic the
// effect. This goes first before the container paddings check below
// because we need to set the paddings to zero for this to work.
const hasContainerBorders = !! attributes.containerBorderType ||
( typeof attributes.containerBorderRadius !== 'undefined' && attributes.containerBorderRadius !== '' ) ||
!! attributes.containerShadow

if ( ! attributes.hasContainer && hasContainerBorders ) {
newAttributes = {
...newAttributes,
hasContainer: true,
containerPadding: {
top: 0, right: 0, bottom: 0, left: 0,
},
containerBackgroundColor: 'transparent',
}
}

newAttributes = deprecateContainerBackgroundColorOpacity.migrate( newAttributes )
newAttributes = deprecateBlockBackgroundColorOpacity.migrate( newAttributes )

Expand Down
19 changes: 0 additions & 19 deletions src/block/notification/deprecated.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,25 +60,6 @@ const deprecated = [
}
}

// Container borders while the container was turned off was allowed
// before, now it's not allowed. Turn on the container to mimic the
// effect. This goes first before the container paddings check below
// because we need to set the paddings to zero for this to work.
const hasContainerBorders = !! attributes.containerBorderType ||
( typeof attributes.containerBorderRadius !== 'undefined' && attributes.containerBorderRadius !== '' ) ||
!! attributes.containerShadow

if ( ! attributes.hasContainer && hasContainerBorders ) {
newAttributes = {
...newAttributes,
hasContainer: true,
containerPadding: {
top: 0, right: 0, bottom: 0, left: 0,
},
containerBackgroundColor: 'transparent',
}
}

// If the inner blocks are horizontal, adjust to accomodate the new
// column gap, it will modify blocks because people used block
// margins before instead of a proper column gap.
Expand Down
19 changes: 0 additions & 19 deletions src/block/posts/deprecated.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,25 +100,6 @@ const deprecated = [
}
}

// Container borders while the container was turned off was allowed
// before, now it's not allowed. Turn on the container to mimic the
// effect. This goes first before the container paddings check below
// because we need to set the paddings to zero for this to work.
const hasContainerBorders = !! attributes.containerBorderType ||
( typeof attributes.containerBorderRadius !== 'undefined' && attributes.containerBorderRadius !== '' ) ||
!! attributes.containerShadow

if ( ! attributes.hasContainer && hasContainerBorders ) {
newAttributes = {
...newAttributes,
hasContainer: true,
containerPadding: {
top: 0, right: 0, bottom: 0, left: 0,
},
containerBackgroundColor: 'transparent',
}
}

newAttributes = deprecationImageOverlayOpacity.migrate( newAttributes )
newAttributes = deprecateContainerBackgroundColorOpacity.migrate( newAttributes )
newAttributes = deprecateBlockBackgroundColorOpacity.migrate( newAttributes )
Expand Down
19 changes: 0 additions & 19 deletions src/block/pricing-box/deprecated.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,25 +60,6 @@ const deprecated = [
}
}

// Container borders while the container was turned off was allowed
// before, now it's not allowed. Turn on the container to mimic the
// effect. This goes first before the container paddings check below
// because we need to set the paddings to zero for this to work.
const hasContainerBorders = !! attributes.containerBorderType ||
( typeof attributes.containerBorderRadius !== 'undefined' && attributes.containerBorderRadius !== '' ) ||
!! attributes.containerShadow

if ( ! attributes.hasContainer && hasContainerBorders ) {
newAttributes = {
...newAttributes,
hasContainer: true,
containerPadding: {
top: 0, right: 0, bottom: 0, left: 0,
},
containerBackgroundColor: 'transparent',
}
}

// If the inner blocks are horizontal, adjust to accomodate the new
// column gap, it will modify blocks because people used block
// margins before instead of a proper column gap.
Expand Down
19 changes: 0 additions & 19 deletions src/block/team-member/deprecated.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,25 +60,6 @@ const deprecated = [
}
}

// Container borders while the container was turned off was allowed
// before, now it's not allowed. Turn on the container to mimic the
// effect. This goes first before the container paddings check below
// because we need to set the paddings to zero for this to work.
const hasContainerBorders = !! attributes.containerBorderType ||
( typeof attributes.containerBorderRadius !== 'undefined' && attributes.containerBorderRadius !== '' ) ||
!! attributes.containerShadow

if ( ! attributes.hasContainer && hasContainerBorders ) {
newAttributes = {
...newAttributes,
hasContainer: true,
containerPadding: {
top: 0, right: 0, bottom: 0, left: 0,
},
containerBackgroundColor: 'transparent',
}
}

// If the inner blocks are horizontal, adjust to accomodate the new
// column gap, it will modify blocks because people used block
// margins before instead of a proper column gap.
Expand Down
19 changes: 0 additions & 19 deletions src/block/testimonial/deprecated.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,25 +60,6 @@ const deprecated = [
}
}

// Container borders while the container was turned off was allowed
// before, now it's not allowed. Turn on the container to mimic the
// effect. This goes first before the container paddings check below
// because we need to set the paddings to zero for this to work.
const hasContainerBorders = !! attributes.containerBorderType ||
( typeof attributes.containerBorderRadius !== 'undefined' && attributes.containerBorderRadius !== '' ) ||
!! attributes.containerShadow

if ( ! attributes.hasContainer && hasContainerBorders ) {
newAttributes = {
...newAttributes,
hasContainer: true,
containerPadding: {
top: 0, right: 0, bottom: 0, left: 0,
},
containerBackgroundColor: 'transparent',
}
}

// If the inner blocks are horizontal, adjust to accomodate the new
// column gap, it will modify blocks because people used block
// margins before instead of a proper column gap.
Expand Down

0 comments on commit dabb90b

Please sign in to comment.