Web components grid

test/e2e-test-application/e2e/tests/1-angular/luigi-client-link-manager-features.spec.js

@@ -86,7 +86,7 @@ describe('Luigi client linkManager', () => {
         cy.wrap($iframeBody)
           .contains('Open webcomponent in splitView')
           .click();
-        cy.get('.iframeSplitViewCnt>div>').then(container => {
+        cy.get('.iframeSplitViewCnt>').then(container => {
           const root = container.children().prevObject[0].shadowRoot;
           const wcContent = root.querySelector('p').innerText;
           expect(wcContent).to.equal('Hello WebComponent!');

test/e2e-test-application/src/app/project/project.component.html

@@ -503,32 +503,22 @@ <h3 class="fd-layout-panel__title">Navigate</h3>
                   title: 'Webcomponent in a modal',
                   size: 'm'
                 })
-              "
-              >Open webcomponent in a modal</a
-            >
-            <app-code-snippet
-              data="linkManager()
+              ">Open webcomponent in a modal</a>
+            <app-code-snippet data="linkManager()
               .openAsModal('/projects/pr2/webcomponent', {
                 title: 'Webcomponent in a modal',
                 size: 'm'
-              })"
-            >
+              })">
             </app-code-snippet>
           </li>
           <li class="fd-list__item">
-            <a
-              href="javascript:void(0)"
-              class="fd-link"
-              (click)="
+            <a href="javascript:void(0)" class="fd-link" (click)="
                 linkManager().openAsSplitView('/projects/pr2/webcomponent', {
                   title: 'Webcomponent in a split view',
                   size: '25'
                 })
-              "
-              >Open webcomponent in splitView</a
-            >
-            <app-code-snippet
-              data="linkManager().openAsSplitView('/projects/pr2/webcomponent', {
+              ">Open webcomponent in splitView</a>
+            <app-code-snippet data="linkManager().openAsSplitView('/projects/pr2/webcomponent', {
                 title: 'Webcomponent in a split view',
                 size: '25'
               })"
@@ -859,17 +849,4 @@ <h3 class="fd-layout-panel__title">Demo time</h3>
   </div>
 </section>
 
-<<<<<<< HEAD
-<app-modal
-  *ngIf="projectId === 'pr1'"
-  [modalActive]="modalActive"
-  (modalClosed)="toggleModal()"
->
-</app-modal>
-=======
-<app-modal
-  *ngIf="projectId === 'pr1'"
-  [modalActive]="modalActive"
-  (modalClosed)="toggleModal()"
-></app-modal>
->>>>>>> master
+<app-modal *ngIf="projectId === 'pr1'" [modalActive]="modalActive" (modalClosed)="toggleModal()"></app-modal>