Skip to content

[stable18] Revert "Delete menu-sidebar-white.svg" #477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 1 commit into from
Apr 24, 2020
Merged

[stable18] Revert "Delete menu-sidebar-white.svg" #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cypress/integration/files-shares.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})

Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/image-small.png.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})

Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/image.gif.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})

Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/image.svg.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})

Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/images-custom-list-loadmore.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})

Expand Down
6 changes: 3 additions & 3 deletions cypress/integration/images-custom-list.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})

Expand Down Expand Up @@ -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')
})

Expand Down Expand Up @@ -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')
})

Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/images.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})

Expand Down
10 changes: 5 additions & 5 deletions cypress/integration/sidebar.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})

Expand All @@ -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
Expand Down Expand Up @@ -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() {
Expand All @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/video.mkv.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})

Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/video.mp4.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})

Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/video.ogv.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})

Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/video.webm.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})

Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/videos.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})

Expand Down
1 change: 0 additions & 1 deletion src/assets/info-white.svg
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions src/assets/menu-sidebar-white.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions src/views/Viewer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<template #actions>
<ActionButton
v-if="Sidebar && !isSidebarShown"
icon="icon-info-white-forced"
icon="icon-menu-sidebar-white-forced"
@click="showSidebar">
{{ t('viewer', 'Open sidebar') }}
</ActionButton>
Expand Down Expand Up @@ -694,8 +694,8 @@ export default {
}

// force white icon
.icon-info-white-forced {
background-image: url('~Assets/info-white.svg');
.icon-menu-sidebar-white-forced {
background-image: url('~Assets/menu-sidebar-white.svg');
}

.file-view {
Expand Down