diff --git a/e2e/paths/04-item/12_descriptor.spec.js b/e2e/paths/04-item/12_descriptor.spec.js index 7c6fa074c..eb9ed2573 100644 --- a/e2e/paths/04-item/12_descriptor.spec.js +++ b/e2e/paths/04-item/12_descriptor.spec.js @@ -16,14 +16,6 @@ describe('Item descriptor path', () => { await browser.close(); }); - it('should check the descriptor inactive icon is dark as the item is active', async() => { - await page.waitForSelector(selectors.itemDescriptor.inactiveIcon); - await page.waitForClassNotPresent(selectors.itemDescriptor.inactiveIcon, 'bright'); - const darkIcon = await page.isVisible(selectors.itemDescriptor.inactiveIcon); - - expect(darkIcon).toBeTruthy(); - }); - it('should set the item to inactive', async() => { await page.waitToClick(selectors.itemBasicData.isActiveCheckbox); await page.waitToClick(selectors.itemBasicData.submitBasicDataButton); @@ -32,12 +24,11 @@ describe('Item descriptor path', () => { expect(message.text).toContain('Data saved!'); }); - it('should reload the section and check the inactive icon is bright', async() => { + it('should reload the section and check the inactive icon is visible', async() => { await page.reloadSection('item.card.basicData'); - await page.waitForClassPresent(selectors.itemDescriptor.inactiveIcon, 'bright'); - const brightIcon = await page.isVisible(selectors.itemDescriptor.inactiveIcon); + const visibleIcon = await page.isVisible(selectors.itemDescriptor.inactiveIcon); - expect(brightIcon).toBeTruthy(); + expect(visibleIcon).toBeTruthy(); }); it('should set the item back to active', async() => { diff --git a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js index 248f38927..d0c0cfeda 100644 --- a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js +++ b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js @@ -397,6 +397,5 @@ describe('Ticket Edit sale path', () => { it(`should check the ticket is deleted`, async() => { await page.waitForSelector(selectors.ticketDescriptor.isDeletedIcon); - await page.waitForClassPresent(selectors.ticketDescriptor.isDeletedIcon, 'bright'); }); }); diff --git a/e2e/paths/05-ticket/12_descriptor.spec.js b/e2e/paths/05-ticket/12_descriptor.spec.js index c426f7d7f..1c7895382 100644 --- a/e2e/paths/05-ticket/12_descriptor.spec.js +++ b/e2e/paths/05-ticket/12_descriptor.spec.js @@ -56,7 +56,7 @@ describe('Ticket descriptor path', () => { await page.write(selectors.ticketsIndex.topbarSearch, '18'); await page.waitToClick(selectors.globalItems.searchButton); await page.waitForState('ticket.card.summary'); - await page.waitForClassPresent(selectors.ticketDescriptor.isDeletedIcon, 'bright'); + await page.isVisible(selectors.ticketDescriptor.isDeletedIcon); const result = await page.waitToGetProperty(selectors.ticketsIndex.searchResultDate, 'innerText'); expect(result).toContain(2000); @@ -73,10 +73,6 @@ describe('Ticket descriptor path', () => { expect(message.text).toContain('Data saved!'); }); - - it('should make sure the ticketDeleted icon is no longer bright', async() => { - await page.waitForClassNotPresent(selectors.ticketDescriptor.isDeletedIcon, 'bright'); - }); }); describe('Add stowaway', () => { diff --git a/front/core/styles/icons/salixfont.css b/front/core/styles/icons/salixfont.css index aafc549a1..bdd37b290 100644 --- a/front/core/styles/icons/salixfont.css +++ b/front/core/styles/icons/salixfont.css @@ -22,10 +22,18 @@ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } +.icon-invoiceIn:before { + content: "\e960"; + color: #5f5f5f; +} +.icon-invoiceOut:before { + content: "\e961"; + color: #5f5f5f; +} .icon-supplier:before { content: "\e936"; } -.icon-latestBuys:before { +.icon-latestBuy:before { content: "\e95f"; } .icon-zone:before { @@ -99,6 +107,7 @@ } .icon-invoices:before { content: "\e91c"; + color: #5f5f5f; } .icon-pets:before { content: "\e94e"; @@ -295,9 +304,6 @@ .icon-stowaway:before { content: "\e92c"; } -.icon-supplier:before { - content: "\e936"; -} .icon-tags:before { content: "\e937"; } diff --git a/front/core/styles/icons/salixfont.svg b/front/core/styles/icons/salixfont.svg index ee14609a4..ca547518d 100644 --- a/front/core/styles/icons/salixfont.svg +++ b/front/core/styles/icons/salixfont.svg @@ -35,7 +35,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -103,6 +103,8 @@ + + diff --git a/front/core/styles/icons/salixfont.ttf b/front/core/styles/icons/salixfont.ttf index 6958c0e3d..2d986be41 100644 Binary files a/front/core/styles/icons/salixfont.ttf and b/front/core/styles/icons/salixfont.ttf differ diff --git a/front/core/styles/icons/salixfont.woff b/front/core/styles/icons/salixfont.woff index a9e083c83..f70a71a62 100644 Binary files a/front/core/styles/icons/salixfont.woff and b/front/core/styles/icons/salixfont.woff differ diff --git a/front/salix/components/descriptor/style.scss b/front/salix/components/descriptor/style.scss index 814df2ca5..f7055c0fc 100644 --- a/front/salix/components/descriptor/style.scss +++ b/front/salix/components/descriptor/style.scss @@ -71,13 +71,9 @@ vn-descriptor-content { & > vn-icon { padding: $spacing-xs $spacing-sm; - color: $color-marginal; font-size: 1.5rem; - - &.bright { - color: $color-main; - opacity: 1; - } + color: $color-main; + opacity: 1; } } & > .quicklinks { diff --git a/modules/account/front/descriptor/index.html b/modules/account/front/descriptor/index.html index 50e4d2177..a1ce252a6 100644 --- a/modules/account/front/descriptor/index.html +++ b/modules/account/front/descriptor/index.html @@ -78,12 +78,12 @@ + ng-if="!$ctrl.user.active"> + ng-if="$ctrl.hasAccount"> diff --git a/modules/client/front/descriptor/index.html b/modules/client/front/descriptor/index.html index 634436395..dc79d224b 100644 --- a/modules/client/front/descriptor/index.html +++ b/modules/client/front/descriptor/index.html @@ -47,27 +47,27 @@ + ng-if="$ctrl.client.isActive == false"> + ng-if="$ctrl.client.isFreezed == true"> + ng-if="$ctrl.client.account.active == false"> + ng-if="$ctrl.client.debt > $ctrl.client.credit"> + ng-if="$ctrl.client.isTaxDataChecked == false">