File tree Expand file tree Collapse file tree 3 files changed +15
-16
lines changed
app/code/Magento/PageBuilder
Test/Mftf/Test/AdminPageBuilderColumnGridTest
view/adminhtml/web/css/source/content-type Expand file tree Collapse file tree 3 files changed +15
-16
lines changed Original file line number Diff line number Diff line change 59
59
<actionGroup ref =" saveEditPanelSettings" stepKey =" saveEditPanelSettingsForGridSize12" />
60
60
<executeJS function =" return parseInt(document.querySelector('{{ColumnOnBackend.columnX('1')}}').clientWidth / 10, 10) * 10;" stepKey =" columnOneWidthGrid12Restored" />
61
61
<executeJS function =" return parseInt(document.querySelector('{{ColumnOnBackend.columnX('2')}}').clientWidth / 10, 10) * 10;" stepKey =" columnTwoWidthGrid12Restored" />
62
- <!-- Validate columns are equal again -->
63
- <comment userInput =" Validate columns are equal again" stepKey =" commentValidateColumnsEqual" />
64
- <assertEquals stepKey =" assertColumnsAreEqualAgain" >
65
- <expectedResult type =" variable" >columnOneWidthGrid12Restored</expectedResult >
66
- <actualResult type =" variable" >columnTwoWidthGrid12Restored</actualResult >
67
- </assertEquals >
68
- <assertEquals stepKey =" assertColumn1IsRestored" >
69
- <expectedResult type =" variable" >columnOneWidthGrid12</expectedResult >
70
- <actualResult type =" variable" >columnOneWidthGrid12Restored</actualResult >
71
- </assertEquals >
72
- <assertEquals stepKey =" assertColumn2IsRestored" >
73
- <expectedResult type =" variable" >columnTwoWidthGrid12</expectedResult >
74
- <actualResult type =" variable" >columnTwoWidthGrid12Restored</actualResult >
75
- </assertEquals >
62
+ <!-- Validate columns are now 7/12 and 5/12 - see PB-1194 -->
63
+ <comment userInput =" Validate columns are restored back" stepKey =" commentValidateColumnsRestored" />
64
+ <seeNumberOfElements selector =" {{ColumnOnBackend.allColumns}}" userInput =" 2" stepKey =" seeNumberOfColumns2" />
65
+ <waitForElementVisible selector =" {{ColumnOnBackend.displayLabel('1','7/12')}}" stepKey =" validateLeftColumnWidth" />
66
+ <waitForElementVisible selector =" {{ColumnOnBackend.displayLabel('2','5/12')}}" stepKey =" validateRightColumnWidth" />
76
67
</test >
77
68
</tests >
Original file line number Diff line number Diff line change 196
196
box-shadow : @pagebuilder-affordance-box-shadow ; // #ebebeb
197
197
padding : 0 ;
198
198
199
- & :not (.pagebuilder-column ):not (.pagebuilder-column-group ):before {
200
- display : none ;
199
+ & :not (
200
+ .pagebuilder-column ,
201
+ .pagebuilder-column-group ) {
202
+ & :before {
203
+ display : none ;
204
+ }
201
205
}
202
206
203
207
> .pagebuilder-content-type.type-container.pagebuilder-row {
Original file line number Diff line number Diff line change 252
252
width : 18px ;
253
253
z-index : 11 ;
254
254
255
+ /* *
256
+ * @codingStandardsIgnoreStart
257
+ */
255
258
.admin__control-text {
256
259
height : 89% ;
257
260
margin : 0 ;
264
267
text-align : left ;
265
268
width : 135px ;
266
269
}
270
+ // @codingStandardsIgnoreEnd
267
271
268
272
.grid-panel-field-error {
269
273
border : 1px solid @error_color ;
You can’t perform that action at this time.
0 commit comments