diff --git a/cypress/integration/files-shares.spec.js b/cypress/integration/files-shares.spec.js index d803f36a1..32d95bf7f 100644 --- a/cypress/integration/files-shares.spec.js +++ b/cypress/integration/files-shares.spec.js @@ -98,7 +98,7 @@ describe('Files default view', function() { it('See the menu icon and title on the viewer header', function() { cy.get('#viewer-content .modal-title').should('contain', 'image1.jpg') - cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('not.be.visible') + cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('not.be.visible') cy.get('#viewer-content .modal-header button.icon-close').should('be.visible') }) diff --git a/cypress/integration/image-small.png.spec.js b/cypress/integration/image-small.png.spec.js index e5b73b79e..f5effdc5f 100644 --- a/cypress/integration/image-small.png.spec.js +++ b/cypress/integration/image-small.png.spec.js @@ -59,7 +59,7 @@ describe('Open image-small.png in viewer', function() { it('See the menu icon and title on the viewer header', function() { cy.get('#viewer-content .modal-title').should('contain', 'image-small.png') - cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible') + cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible') cy.get('#viewer-content .modal-header button.icon-close').should('be.visible') }) diff --git a/cypress/integration/image.gif.spec.js b/cypress/integration/image.gif.spec.js index 1bf517055..f872465fa 100644 --- a/cypress/integration/image.gif.spec.js +++ b/cypress/integration/image.gif.spec.js @@ -60,7 +60,7 @@ describe('Open image.gif in viewer', function() { it('See the menu icon and title on the viewer header', function() { cy.get('#viewer-content .modal-title').should('contain', 'image.gif') - cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible') + cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible') cy.get('#viewer-content .modal-header button.icon-close').should('be.visible') }) diff --git a/cypress/integration/image.svg.spec.js b/cypress/integration/image.svg.spec.js index 27b90b371..dbd309779 100644 --- a/cypress/integration/image.svg.spec.js +++ b/cypress/integration/image.svg.spec.js @@ -60,7 +60,7 @@ describe('Open image.svg in viewer', function() { it('See the menu icon and title on the viewer header', function() { cy.get('#viewer-content .modal-title').should('contain', 'image.svg') - cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible') + cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible') cy.get('#viewer-content .modal-header button.icon-close').should('be.visible') }) diff --git a/cypress/integration/images-custom-list-loadmore.spec.js b/cypress/integration/images-custom-list-loadmore.spec.js index 79663c7a7..961fd1926 100644 --- a/cypress/integration/images-custom-list-loadmore.spec.js +++ b/cypress/integration/images-custom-list-loadmore.spec.js @@ -131,7 +131,7 @@ describe('Open custom list of images in viewer', function() { it('See the menu icon and title on the viewer header', function() { cy.get('#viewer-content .modal-title').should('contain', 'image1.jpg') - cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible') + cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible') cy.get('#viewer-content .modal-header button.icon-close').should('be.visible') }) diff --git a/cypress/integration/images-custom-list.spec.js b/cypress/integration/images-custom-list.spec.js index 4c6f7eaff..1382483a4 100644 --- a/cypress/integration/images-custom-list.spec.js +++ b/cypress/integration/images-custom-list.spec.js @@ -98,7 +98,7 @@ describe('Open images in viewer', function() { it('See the menu icon and title on the viewer header', function() { cy.get('#viewer-content .modal-title').should('contain', 'image1.jpg') - cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible') + cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible') cy.get('#viewer-content .modal-header button.icon-close').should('be.visible') }) @@ -139,7 +139,7 @@ describe('Open images in viewer', function() { it('See the menu icon and title on the viewer header', function() { cy.get('#viewer-content .modal-title').should('contain', 'image3.jpg') - cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible') + cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible') cy.get('#viewer-content .modal-header button.icon-close').should('be.visible') }) @@ -173,7 +173,7 @@ describe('Open images in viewer', function() { it('See the menu icon and title on the viewer header', function() { cy.get('#viewer-content .modal-title').should('contain', 'image1.jpg') - cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible') + cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible') cy.get('#viewer-content .modal-header button.icon-close').should('be.visible') }) diff --git a/cypress/integration/images.spec.js b/cypress/integration/images.spec.js index 0eaab633e..165f24616 100644 --- a/cypress/integration/images.spec.js +++ b/cypress/integration/images.spec.js @@ -68,7 +68,7 @@ describe('Open images in viewer', function() { it('See the menu icon and title on the viewer header', function() { cy.get('#viewer-content .modal-title').should('contain', 'image1.jpg') - cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible') + cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible') cy.get('#viewer-content .modal-header button.icon-close').should('be.visible') }) diff --git a/cypress/integration/sidebar.spec.js b/cypress/integration/sidebar.spec.js index 1699a7f9f..a6346cc8f 100644 --- a/cypress/integration/sidebar.spec.js +++ b/cypress/integration/sidebar.spec.js @@ -69,7 +69,7 @@ describe('Open the sidebar', function() { it('See the menu icon and title on the viewer header', function() { cy.get('#viewer-content .modal-title').should('contain', 'image1.jpg') - cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible') + cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible') cy.get('#viewer-content .modal-header button.icon-close').should('be.visible') }) @@ -78,10 +78,10 @@ describe('Open the sidebar', function() { }) it('Open the sidebar', function() { - cy.get('#viewer-content .modal-header button.icon-info-white-forced').click() + cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').click() cy.get('aside#app-sidebar').should('be.visible') // we hide the sidebar button if opened - cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('not.be.visible') + cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('not.be.visible') // check the sidebar is opened for the correct file cy.get('aside#app-sidebar .app-sidebar-header .app-sidebar-header__title').should('contain', 'image1.jpg') // check we indeed have a preview @@ -141,7 +141,7 @@ describe('Open the sidebar', function() { it('Close the sidebar', function() { cy.get('aside#app-sidebar .app-sidebar-header .app-sidebar__close').click() cy.get('aside#app-sidebar').should('not.be.visible') - cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible') + cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible') }) it('Open the viewer with the sidebar open', function() { @@ -161,7 +161,7 @@ describe('Open the sidebar', function() { // close the sidebar again cy.get('aside#app-sidebar .app-sidebar-header .app-sidebar__close').click() cy.get('aside#app-sidebar').should('not.be.visible') - cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible') + cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible') }) it('Does not have any visual regression 5', function() { diff --git a/cypress/integration/video.mkv.spec.js b/cypress/integration/video.mkv.spec.js index 81c13c8c3..1a5376b96 100644 --- a/cypress/integration/video.mkv.spec.js +++ b/cypress/integration/video.mkv.spec.js @@ -59,7 +59,7 @@ describe('Open video.mkv in viewer', function() { it('See the menu icon and title on the viewer header', function() { cy.get('#viewer-content .modal-title').should('contain', 'video.mkv') - cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible') + cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible') cy.get('#viewer-content .modal-header button.icon-close').should('be.visible') }) diff --git a/cypress/integration/video.mp4.spec.js b/cypress/integration/video.mp4.spec.js index 291b496b1..6c286eb58 100644 --- a/cypress/integration/video.mp4.spec.js +++ b/cypress/integration/video.mp4.spec.js @@ -59,7 +59,7 @@ describe('Open video1.mp4 in viewer', function() { it('See the menu icon and title on the viewer header', function() { cy.get('#viewer-content .modal-title').should('contain', 'video1.mp4') - cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible') + cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible') cy.get('#viewer-content .modal-header button.icon-close').should('be.visible') }) diff --git a/cypress/integration/video.ogv.spec.js b/cypress/integration/video.ogv.spec.js index 0f4f9679e..932ac2770 100644 --- a/cypress/integration/video.ogv.spec.js +++ b/cypress/integration/video.ogv.spec.js @@ -59,7 +59,7 @@ describe('Open video.ogv in viewer', function() { it('See the menu icon and title on the viewer header', function() { cy.get('#viewer-content .modal-title').should('contain', 'video.ogv') - cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible') + cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible') cy.get('#viewer-content .modal-header button.icon-close').should('be.visible') }) diff --git a/cypress/integration/video.webm.spec.js b/cypress/integration/video.webm.spec.js index 5c590be6e..1b6672077 100644 --- a/cypress/integration/video.webm.spec.js +++ b/cypress/integration/video.webm.spec.js @@ -59,7 +59,7 @@ describe('Open video.webm in viewer', function() { it('See the menu icon and title on the viewer header', function() { cy.get('#viewer-content .modal-title').should('contain', 'video.webm') - cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible') + cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible') cy.get('#viewer-content .modal-header button.icon-close').should('be.visible') }) diff --git a/cypress/integration/videos.spec.js b/cypress/integration/videos.spec.js index 4460d82e2..bbc2e0b9d 100644 --- a/cypress/integration/videos.spec.js +++ b/cypress/integration/videos.spec.js @@ -55,7 +55,7 @@ describe('Open mp4 videos in viewer', function() { it('See the menu icon and title on the viewer header', function() { cy.get('#viewer-content .modal-title').should('contain', 'video1.mp4') - cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible') + cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible') cy.get('#viewer-content .modal-header button.icon-close').should('be.visible') }) diff --git a/src/assets/info-white.svg b/src/assets/info-white.svg deleted file mode 100644 index 5c3573b19..000000000 --- a/src/assets/info-white.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/assets/menu-sidebar-white.svg b/src/assets/menu-sidebar-white.svg new file mode 100644 index 000000000..fdc4c8cb3 --- /dev/null +++ b/src/assets/menu-sidebar-white.svg @@ -0,0 +1 @@ + diff --git a/src/views/Viewer.vue b/src/views/Viewer.vue index 658f53b8c..72fb5a543 100644 --- a/src/views/Viewer.vue +++ b/src/views/Viewer.vue @@ -43,7 +43,7 @@