@foreach (var item in Model)
{
- bool attrForceLeft = item.ForceLeft;
- bool attrForceRight = item.ForceRight;
@{
var partialViewName = "blockgrid/Components/" + item.Content.ContentType.Alias;
diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/da.xml b/src/Umbraco.Core/EmbeddedResources/Lang/da.xml
index 049b617f93..1c23c53e38 100644
--- a/src/Umbraco.Core/EmbeddedResources/Lang/da.xml
+++ b/src/Umbraco.Core/EmbeddedResources/Lang/da.xml
@@ -2244,12 +2244,6 @@ Mange hilsner fra Umbraco robotten
-
Påtving placering i venstre side
-
Påtving placering i højre side
-
Fjern påtvungen placering i venstre side
-
Fjern påtvungen placering i højre side
-
Skift påtvungen placering i venstre side
-
Skift påtvungen placering i højre side
Træk for at skalere
Tilføj indhold label
Overskriv labellen for tilføj indholds knappen i dette område.
diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/en.xml b/src/Umbraco.Core/EmbeddedResources/Lang/en.xml
index 99428a8837..3cd7f0d40a 100644
--- a/src/Umbraco.Core/EmbeddedResources/Lang/en.xml
+++ b/src/Umbraco.Core/EmbeddedResources/Lang/en.xml
@@ -2794,12 +2794,6 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
-
Force placement at left side
-
Force placement at right side
-
Remove forced placement at left side
-
Remove forced placement at right side
-
Toggle forced placement at left side
-
Toggle forced placement at right side
Drag to scale
Create Button Label
Overwrite the label on the create button of this Area.
diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml b/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml
index 483219eeb8..a20075769a 100644
--- a/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml
+++ b/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml
@@ -2897,12 +2897,6 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
-
Force placement at left side
-
Force placement at right side
-
Remove forced placement at left side
-
Remove forced placement at right side
-
Toggle forced placement at left side
-
Toggle forced placement at right side
Drag to scale
Create Button Label
Overwrite the label on the create button of this Area.
diff --git a/src/Umbraco.Core/Models/Blocks/BlockGridItem.cs b/src/Umbraco.Core/Models/Blocks/BlockGridItem.cs
index 097882c5ab..eb554ef90d 100644
--- a/src/Umbraco.Core/Models/Blocks/BlockGridItem.cs
+++ b/src/Umbraco.Core/Models/Blocks/BlockGridItem.cs
@@ -81,18 +81,6 @@ namespace Umbraco.Cms.Core.Models.Blocks
[DataMember(Name = "columnSpan")]
public int ColumnSpan { get; set; }
- ///
- /// Forcing the item to be located in the left side.
- ///
- [DataMember(Name = "forceLeft")]
- public bool ForceLeft { get; set; }
-
- ///
- /// Forcing the item to be located in the right side.
- ///
- [DataMember(Name = "forceRight")]
- public bool ForceRight { get; set; }
-
///
/// The grid areas within this item
///
diff --git a/src/Umbraco.Infrastructure/Models/Blocks/BlockGridLayoutItem.cs b/src/Umbraco.Infrastructure/Models/Blocks/BlockGridLayoutItem.cs
index 9014e2789a..30494b03f7 100644
--- a/src/Umbraco.Infrastructure/Models/Blocks/BlockGridLayoutItem.cs
+++ b/src/Umbraco.Infrastructure/Models/Blocks/BlockGridLayoutItem.cs
@@ -25,12 +25,6 @@ public class BlockGridLayoutItem : IBlockLayoutItem
[JsonProperty("rowSpan", NullValueHandling = NullValueHandling.Ignore)]
public int? RowSpan { get; set; }
- [JsonProperty("forceLeft")]
- public bool ForceLeft { get; set; }
-
- [JsonProperty("forceRight")]
- public bool ForceRight { get; set; }
-
[JsonProperty("areas", NullValueHandling = NullValueHandling.Ignore)]
public BlockGridLayoutAreaItem[] Areas { get; set; } = Array.Empty
();
}
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/BlockGridPropertyValueConverter.cs b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/BlockGridPropertyValueConverter.cs
index 6cd2d4bd38..ae330870fa 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/BlockGridPropertyValueConverter.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/BlockGridPropertyValueConverter.cs
@@ -49,8 +49,6 @@ namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters
blockItem.RowSpan = layoutItem.RowSpan!.Value;
blockItem.ColumnSpan = layoutItem.ColumnSpan!.Value;
- blockItem.ForceLeft = layoutItem.ForceLeft;
- blockItem.ForceRight = layoutItem.ForceRight;
blockItem.AreaGridColumns = blockConfig.AreaGridColumns;
blockItem.GridColumns = configuration.GridColumns;
blockItem.Areas = layoutItem.Areas.Select(area =>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridui.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridui.less
index 38ff8086c6..b6205d73ac 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridui.less
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridui.less
@@ -28,9 +28,7 @@
> ng-form > .umb-block-grid__block--inline-create-button,
> ng-form > .umb-block-grid__block--validation-border,
- > ng-form > .umb-block-grid__block--actions,
- > ng-form > .umb-block-grid__force-left,
- > ng-form > .umb-block-grid__force-right {
+ > ng-form > .umb-block-grid__block--actions {
z-index: 3;
}
}
@@ -80,11 +78,6 @@ ng-form.ng-invalid-val-server-match-content > .umb-block-grid__block:not(.--acti
opacity: 0;
transition: opacity 120ms;
}
- > .umb-block-grid__force-left,
- > .umb-block-grid__force-right {
- opacity: 0;
- transition: opacity 120ms;
- }
> .umb-block-grid__block--context {
opacity: 0;
transition: opacity 120ms;
@@ -149,10 +142,6 @@ ng-form.ng-invalid-val-server-match-content > .umb-block-grid__block:not(.--acti
> .umb-block-grid__scale-label {
opacity: 1;
}
- > .umb-block-grid__force-left,
- > .umb-block-grid__force-right {
- opacity: 1;
- }
}
/** make sure to hide child block ui: */
@@ -169,10 +158,6 @@ ng-form.ng-invalid-val-server-match-content > .umb-block-grid__block:not(.--acti
> .umb-block-grid__block--actions {
display: none;
}
- > .umb-block-grid__force-left,
- > .umb-block-grid__force-right {
- display: none;
- }
}
&.--block-ui-visible {
@@ -221,10 +206,6 @@ ng-form.ng-invalid-val-server-match-content > .umb-block-grid__block:not(.--acti
> .umb-block-grid__scale-handler {
opacity: var(--umb-block-grid--block-ui-opacity);
}
- > .umb-block-grid__force-left,
- > .umb-block-grid__force-right {
- opacity: var(--umb-block-grid--block-ui-opacity);
- }
}
}
@@ -372,106 +353,6 @@ ng-form.ng-invalid > .umb-block-grid__block:not(.--active) > .umb-block-grid__bl
}
}
-.umb-block-grid__force-left,
-.umb-block-grid__force-right {
- position: absolute;
- z-index: 2;
- top: 50%;
- height: 30px;
- width: 15px;
- margin-top:-15px;
- background-color: transparent;
- color: @blueDark;
- border: 1px solid rgba(255, 255, 255, .2);
- font-size: 12px;
- padding: 0;
- cursor: pointer;
- box-sizing: border-box;
- border-radius: 8px;
- display: var(--umb-block-grid--block-ui-display, flex);
- justify-content: center;
- align-items: center;
- pointer-events: all;
-
- opacity: 0;
- transition: background-color 120ms, border-color 120ms, color 120ms, opacity 120ms;
-
- .icon {
- position: relative;
- display: inline-block;
- pointer-events: none;
- opacity: 0;
- transition: transform 120ms ease-in-out, opacity 120ms;
- ::before {
- content: '';
- position: absolute;
- background-color:currentColor;
- width:2px;
- height: 8px;
- top: 2px;
- transition: transform 120ms ease-in-out;
- }
- }
-
- &:hover {
- opacity: 1;
- color: @blueDark;
- background-color: @white;
- }
- &:hover,
- &.--active {
- .icon {
- opacity: 1;
- transform: translateX(0);
- ::before {
- transform: translateX(0);
- }
- }
- }
-
- &.--active {
- background-color: @blueDark;
- color: white;
- &:hover {
- color: white;
- }
- }
-}
-
-.umb-block-grid__force-left {
- left: 0;
- border-top-left-radius: 0;
- border-bottom-left-radius: 0;
- .icon {
- transform: translateX(3px);
- ::before {
- left: 2px;
- transform: translateX(-3px);
- }
- }
- &:hover,
- &.--active {
- border-left-color: @blueDark;
- }
-}
-.umb-block-grid__force-right {
- right: 0;
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
- .icon {
- margin-right: 1px;
- transform: translateX(-3px);
- ::before {
- right: 2px;
- transform: translateX(3px);
- }
- }
- &:hover,
- &.--active {
- border-right-color: @blueDark;
- }
-}
-
.umb-block-grid__scale-handler {
cursor: nwse-resize;
@@ -745,36 +626,6 @@ ng-form.ng-invalid > .umb-block-grid__block:not(.--active) > .umb-block-grid__bl
100% { background-color: rgba(@blueMidLight, 0.22); }
}
}
-.umb-block-grid__layout-item-placeholder .indicateForceLeft,
-.umb-block-grid__layout-item-placeholder .indicateForceRight {
- position:absolute;
-
- z-index: 2;
- height: 100%;
- width: 15px;
-
- background-color: @blueDark;
-
- background-position: center center;
- background-repeat: no-repeat;
- display: block !important;
-
- animation: umb-block-grid__indicateForce__pulse 400ms ease-in-out alternate infinite;
-}
-
-.umb-block-grid__layout-item-placeholder .indicateForceLeft {
- left:0;
- background-image: url("data:image/svg+xml;utf8,");
-}
-.umb-block-grid__layout-item-placeholder .indicateForceRight {
- right:0;
- background-image: url("data:image/svg+xml;utf8,");
-}
-
-@keyframes umb-block-grid__indicateForce__pulse {
- 0% { background-color: rgba(@blueDark, 1); }
- 100% { background-color: rgba(@blueDark, 0.5); }
-}
.umb-block-grid__area {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/razorhtml.temp.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/razorhtml.temp.html
index 9c7a95a101..5c64d795d1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/razorhtml.temp.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/razorhtml.temp.html
@@ -14,8 +14,6 @@
data-element-udi="{{layoutEntry.contentUdi}}"
data-col-span="{{layoutEntry.columnSpan}}"
data-row-span="{{layoutEntry.rowSpan}}"
- ng-attr-data-force-left="{{layoutEntry.forceLeft || undefined}}"
- ng-attr-data-force-right="{{layoutEntry.forceRight || undefined}}"
style="
--umb-block-grid--item-column-span: {{layoutEntry.columnSpan}};
--umb-block-grid--item-row-span: {{layoutEntry.rowSpan}};
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-entries.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-entries.html
index 301208c6f2..4aed670ffd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-entries.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-entries.html
@@ -14,8 +14,6 @@
data-element-udi="{{layoutEntry.contentUdi}}"
data-col-span="{{layoutEntry.columnSpan}}"
data-row-span="{{layoutEntry.rowSpan}}"
- ng-attr-data-force-left="{{layoutEntry.forceLeft || undefined}}"
- ng-attr-data-force-right="{{layoutEntry.forceRight || undefined}}"
style="
--umb-block-grid--item-column-span: {{layoutEntry.columnSpan}};
--umb-block-grid--item-row-span: {{layoutEntry.rowSpan}};
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-entry.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-entry.html
index e3f439a891..0caebd35c2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-entry.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-entry.html
@@ -132,38 +132,6 @@