Merge branch 'master' of https://github.com/ghiscoding/slickgrid-univ…

…ersal
ghiscoding · Aug 19, 2021 · 01158bb · 01158bb
2 parents d14a506 + 70415d6
commit 01158bb
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 1 deletion.
diff --git a/packages/common/src/styles/_variables-theme-salesforce.scss b/packages/common/src/styles/_variables-theme-salesforce.scss
@@ -122,7 +122,6 @@ $header-menu-button-icon-font-size:                     26px !default;
 $header-menu-button-icon-color:                         #706e6b !default;
 $header-menu-button-icon:                               url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" fill="#{encodecolor($header-menu-button-icon-color)}" viewBox="0 0 24 24"><path d="M22 8.2l-9.5 9.6c-.3.2-.7.2-1 0L2 8.2c-.2-.3-.2-.7 0-1l1-1c.3-.3.8-.3 1.1 0l7.4 7.5c.3.3.7.3 1 0l7.4-7.5c.3-.2.8-.2 1.1 0l1 1c.2.3.2.7 0 1z"></path></svg>') !default;
 $header-menu-button-margin-right:                       8px !default;
-$header-menu-display:                                   inline-block !default;
 $header-menu-icon-margin-right:                         6px !default;
 $header-menu-icon-font-size:                            $icon-width !default;
 $header-menu-icon-width:                                $icon-width !default;

diff --git a/packages/vanilla-bundle/dist-grid-bundle-zip/slickgrid-vanilla-bundle.zip b/packages/vanilla-bundle/dist-grid-bundle-zip/slickgrid-vanilla-bundle.zip
diff --git a/test/cypress/integration/example01.spec.js b/test/cypress/integration/example01.spec.js
@@ -44,6 +44,7 @@ describe('Example 01 - Basic Grids', { retries: 1 }, () => {
       .first()
       .trigger('mouseover')
       .children('.slick-header-menubutton')
+      .invoke('show')
       .click();
 
     cy.get('.slick-header-menu')

diff --git a/test/cypress/integration/example11.spec.js b/test/cypress/integration/example11.spec.js
@@ -594,6 +594,7 @@ describe('Example 11 - Batch Editing', { retries: 1 }, () => {
       .find('.slick-header-column:nth(2)')
       .trigger('mouseover')
       .children('.slick-header-menubutton')
+      .invoke('show')
       .click();
 
     cy.get('.slick-header-menu')