Skip to content

Commit d01ceda

Browse files
skjnldsvskjnldsv
authored
Merge pull request #476 from nextcloud/revert/icon
Revert "Delete menu-sidebar-white.svg"
2 parents 4f9964d + 5b96538 commit d01ceda

17 files changed

Lines changed: 24 additions & 24 deletions

‎apps/viewer/apps/viewer/apps/viewer/cypress/integration/files-shares.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ describe('See shared folder with link share', function() {
9898

9999
it('See the menu icon and title on the viewer header', function() {
100100
cy.get('#viewer-content .modal-title').should('contain', 'image1.jpg')
101-
cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('not.be.visible')
101+
cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('not.be.visible')
102102
cy.get('#viewer-content .modal-header button.icon-close').should('be.visible')
103103
})
104104

‎apps/viewer/apps/viewer/apps/viewer/cypress/integration/image-small.png.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ describe('Open image-small.png in viewer', function() {
5959

6060
it('See the menu icon and title on the viewer header', function() {
6161
cy.get('#viewer-content .modal-title').should('contain', 'image-small.png')
62-
cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible')
62+
cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible')
6363
cy.get('#viewer-content .modal-header button.icon-close').should('be.visible')
6464
})
6565

‎apps/viewer/apps/viewer/apps/viewer/cypress/integration/image.gif.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ describe('Open image.gif in viewer', function() {
6060

6161
it('See the menu icon and title on the viewer header', function() {
6262
cy.get('#viewer-content .modal-title').should('contain', 'image.gif')
63-
cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible')
63+
cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible')
6464
cy.get('#viewer-content .modal-header button.icon-close').should('be.visible')
6565
})
6666

‎apps/viewer/apps/viewer/apps/viewer/cypress/integration/image.png.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ describe('Open image.png in viewer', function() {
6363

6464
it('See the menu icon and title on the viewer header', function() {
6565
cy.get('#viewer-content .modal-title').should('contain', 'image.png')
66-
cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible')
66+
cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible')
6767
cy.get('#viewer-content .modal-header button.icon-close').should('be.visible')
6868
})
6969

‎apps/viewer/apps/viewer/apps/viewer/cypress/integration/image.svg.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ describe('Open image.svg in viewer', function() {
6060

6161
it('See the menu icon and title on the viewer header', function() {
6262
cy.get('#viewer-content .modal-title').should('contain', 'image.svg')
63-
cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible')
63+
cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible')
6464
cy.get('#viewer-content .modal-header button.icon-close').should('be.visible')
6565
})
6666

‎apps/viewer/apps/viewer/apps/viewer/cypress/integration/images-custom-list-loadmore.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ describe('Open custom list of images in viewer with pagination', function() {
131131

132132
it('See the menu icon and title on the viewer header', function() {
133133
cy.get('#viewer-content .modal-title').should('contain', 'image1.jpg')
134-
cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible')
134+
cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible')
135135
cy.get('#viewer-content .modal-header button.icon-close').should('be.visible')
136136
})
137137

‎apps/viewer/apps/viewer/apps/viewer/cypress/integration/images-custom-list.spec.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ describe('Open custom images list in viewer', function() {
9898

9999
it('See the menu icon and title on the viewer header', function() {
100100
cy.get('#viewer-content .modal-title').should('contain', 'image1.jpg')
101-
cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible')
101+
cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible')
102102
cy.get('#viewer-content .modal-header button.icon-close').should('be.visible')
103103
})
104104

@@ -139,7 +139,7 @@ describe('Open custom images list in viewer', function() {
139139

140140
it('See the menu icon and title on the viewer header', function() {
141141
cy.get('#viewer-content .modal-title').should('contain', 'image3.jpg')
142-
cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible')
142+
cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible')
143143
cy.get('#viewer-content .modal-header button.icon-close').should('be.visible')
144144
})
145145

@@ -173,7 +173,7 @@ describe('Open custom images list in viewer', function() {
173173

174174
it('See the menu icon and title on the viewer header', function() {
175175
cy.get('#viewer-content .modal-title').should('contain', 'image1.jpg')
176-
cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible')
176+
cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible')
177177
cy.get('#viewer-content .modal-header button.icon-close').should('be.visible')
178178
})
179179

‎apps/viewer/apps/viewer/apps/viewer/cypress/integration/images.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ describe('Open images in viewer', function() {
6868

6969
it('See the menu icon and title on the viewer header', function() {
7070
cy.get('#viewer-content .modal-title').should('contain', 'image1.jpg')
71-
cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible')
71+
cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible')
7272
cy.get('#viewer-content .modal-header button.icon-close').should('be.visible')
7373
})
7474

‎apps/viewer/apps/viewer/apps/viewer/cypress/integration/sidebar.spec.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ describe('Open the sidebar from the viewer and open viewer with sidebar already
6969

7070
it('See the menu icon and title on the viewer header', function() {
7171
cy.get('#viewer-content .modal-title').should('contain', 'image1.jpg')
72-
cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible')
72+
cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible')
7373
cy.get('#viewer-content .modal-header button.icon-close').should('be.visible')
7474
})
7575

@@ -78,10 +78,10 @@ describe('Open the sidebar from the viewer and open viewer with sidebar already
7878
})
7979

8080
it('Open the sidebar', function() {
81-
cy.get('#viewer-content .modal-header button.icon-info-white-forced').click()
81+
cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').click()
8282
cy.get('aside#app-sidebar').should('be.visible')
8383
// we hide the sidebar button if opened
84-
cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('not.be.visible')
84+
cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('not.be.visible')
8585
// check the sidebar is opened for the correct file
8686
cy.get('aside#app-sidebar .app-sidebar-header .app-sidebar-header__title').should('contain', 'image1.jpg')
8787
// check we indeed have a preview
@@ -141,7 +141,7 @@ describe('Open the sidebar from the viewer and open viewer with sidebar already
141141
it('Close the sidebar', function() {
142142
cy.get('aside#app-sidebar .app-sidebar-header .app-sidebar__close').click()
143143
cy.get('aside#app-sidebar').should('not.be.visible')
144-
cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible')
144+
cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible')
145145
})
146146

147147
it('Open the viewer with the sidebar open', function() {
@@ -161,7 +161,7 @@ describe('Open the sidebar from the viewer and open viewer with sidebar already
161161
// close the sidebar again
162162
cy.get('aside#app-sidebar .app-sidebar-header .app-sidebar__close').click()
163163
cy.get('aside#app-sidebar').should('not.be.visible')
164-
cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible')
164+
cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible')
165165
})
166166

167167
it('Does not have any visual regression 5', function() {

‎apps/viewer/apps/viewer/apps/viewer/cypress/integration/video.mkv.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ describe('Open video.mkv in viewer', function() {
5959

6060
it('See the menu icon and title on the viewer header', function() {
6161
cy.get('#viewer-content .modal-title').should('contain', 'video.mkv')
62-
cy.get('#viewer-content .modal-header button.icon-info-white-forced').should('be.visible')
62+
cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('be.visible')
6363
cy.get('#viewer-content .modal-header button.icon-close').should('be.visible')
6464
})
6565

0 commit comments

Comments
 (0)