diff --git a/e2e/paths/05-ticket/02_expeditions_and_log.spec.js b/e2e/paths/05-ticket/02_expeditions_and_log.spec.js index f0accedaf..2d046e3a9 100644 --- a/e2e/paths/05-ticket/02_expeditions_and_log.spec.js +++ b/e2e/paths/05-ticket/02_expeditions_and_log.spec.js @@ -30,7 +30,7 @@ describe('Ticket expeditions and log path', () => { }); it(`should confirm the expedition deleted is shown now in the ticket log`, async() => { - await page.waitToClick(selectors.ticketLog.logButton); + await page.accessToSection('ticket.card.log'); const changedBy = await page .waitToGetProperty(selectors.ticketLog.changedBy, 'innerText'); diff --git a/front/core/components/button/style.scss b/front/core/components/button/style.scss index f799a21ae..25554176f 100644 --- a/front/core/components/button/style.scss +++ b/front/core/components/button/style.scss @@ -4,19 +4,19 @@ display: inline-flex; align-items: center; justify-content: center; - height: 36px; + height: 2.8em; border: none; border-radius: .1em; font-family: vn-font-bold; text-transform: uppercase; - font-size: 14px; + font-size: .87rem; cursor: pointer; box-sizing: border-box; outline: none; & > button { width: 100%; - padding: 0 12px; + padding: 0 1em; box-sizing: border-box; background-color: transparent; border: none; @@ -88,15 +88,15 @@ } &.xs { - font-size: 0.5em; + font-size: .5em; } &.sm { - font-size: 0.7em; + font-size: .7em; } &.md { - font-size: 0.9em; + font-size: .9em; } &.lg { diff --git a/front/core/components/calendar/style.scss b/front/core/components/calendar/style.scss index 8492d09f1..a4e98fb94 100644 --- a/front/core/components/calendar/style.scss +++ b/front/core/components/calendar/style.scss @@ -6,14 +6,14 @@ & > div { & > .header { display: flex; - margin-bottom: 0.5em; + margin-bottom: .5em; align-items: center; height: 2.4em; & > .title { flex: 1; text-align: center; - padding: 0.2em 0; + padding: .2em 0; } & > .vn-button { color: inherit; @@ -22,10 +22,10 @@ & > .weekdays { display: flex; color: $color-font-secondary; - margin-bottom: 0.5em; - padding: 0.5em 0; + margin-bottom: .5em; + padding: .5em 0; font-weight: bold; - font-size: 0.8em; + font-size: .8em; text-align: center; & > section { @@ -41,7 +41,7 @@ & > .day { width: 14.28%; - height: 40px; + height: 2.5em; display: flex; justify-content: center; align-items: center; @@ -62,7 +62,7 @@ justify-content: center; align-items: center; border-radius: 50%; - font-size: 14px; + font-size: .87em; width: 2.2em; height: 2.2em; cursor: pointer; diff --git a/front/core/components/chip/style.scss b/front/core/components/chip/style.scss index 974a55a82..b82c57fff 100644 --- a/front/core/components/chip/style.scss +++ b/front/core/components/chip/style.scss @@ -16,8 +16,8 @@ vn-chip { height: 1.5em; & > div { - padding: 0.6em; - font-size: 0.8rem; + padding: .6em; + font-size: .8rem; } } diff --git a/front/core/components/multi-check/style.scss b/front/core/components/multi-check/style.scss index bc6a0e8c5..36f3dff60 100644 --- a/front/core/components/multi-check/style.scss +++ b/front/core/components/multi-check/style.scss @@ -1,5 +1,5 @@ vn-multi-check { .vn-check { - margin-bottom: 0.8em + margin-bottom: .8em } } \ No newline at end of file diff --git a/front/core/components/snackbar/style.scss b/front/core/components/snackbar/style.scss index deaf010fc..0a72a1a9b 100644 --- a/front/core/components/snackbar/style.scss +++ b/front/core/components/snackbar/style.scss @@ -11,7 +11,7 @@ vn-snackbar #shapes { } vn-snackbar .shape { - background-color: rgba(0, 0, 0, 0.8); + background-color: rgba(0, 0, 0, .8); box-shadow: 0 0 .4em $color-shadow; transition: transform 300ms ease-in-out; transform: translateY(20em); @@ -19,7 +19,7 @@ vn-snackbar .shape { border-radius: .2em; margin-bottom: 15px; color: white; - padding: 0.8em; + padding: .8em; & > .text { text-align: center; @@ -36,19 +36,19 @@ vn-snackbar .shape { } &.success { - background-color: rgba(163, 209, 49, 0.8); + background-color: rgba(163, 209, 49, .8); color: #445911; & > button { - color: rgba(1, 1, 1, 0.6); + color: rgba(1, 1, 1, .6); } } &.error { - background-color: rgba(198, 40, 40, 0.8); + background-color: rgba(198, 40, 40, .8); & > button { - color: rgba(1, 1, 1, 0.6); + color: rgba(1, 1, 1, .6); } } diff --git a/front/core/components/step-control/style.scss b/front/core/components/step-control/style.scss index 9acc1f314..b4d0d5afe 100644 --- a/front/core/components/step-control/style.scss +++ b/front/core/components/step-control/style.scss @@ -22,11 +22,11 @@ vn-step-control { border: 2px solid $color-main; background-color: white; align-content: center; - margin-top: -9.5px; + margin-top: -10px; border-radius: 50%; cursor: pointer; height: 15px; - width: 15px + width: 15px; } & > .steps > .step .circle.active { background-color: $color-main; @@ -36,7 +36,7 @@ vn-step-control { flex: auto; flex-direction: row; justify-content: space-between; - margin-top: 10px + margin-top: 10px; } & > .buttons > .step { display: flex diff --git a/front/core/directives/droppable.scss b/front/core/directives/droppable.scss index f2e18a3ad..049310037 100644 --- a/front/core/directives/droppable.scss +++ b/front/core/directives/droppable.scss @@ -5,8 +5,8 @@ .vn-draggable, [vn-droppable] { border: 2px dashed transparent; - border-radius: 0.5em; - transition: all 0.5s; + border-radius: .5em; + transition: all .5s; } .vn-droppable, diff --git a/front/core/directives/zoom-image.scss b/front/core/directives/zoom-image.scss index e075ff3a1..5628e6f1d 100644 --- a/front/core/directives/zoom-image.scss +++ b/front/core/directives/zoom-image.scss @@ -5,7 +5,7 @@ position: fixed; top: 0; z-index: 25; - background-color: rgba(1, 1, 1, 0.6); + background-color: rgba(1, 1, 1, .6); & > div { display: flex; diff --git a/front/core/styles/global.scss b/front/core/styles/global.scss index 8b3d465f1..a4a013536 100644 --- a/front/core/styles/global.scss +++ b/front/core/styles/global.scss @@ -44,4 +44,4 @@ a { .ng-leave, .ng-enter { transition: none; -} \ No newline at end of file +} diff --git a/front/core/styles/layout.scss b/front/core/styles/layout.scss index 925526dca..85088db6a 100644 --- a/front/core/styles/layout.scss +++ b/front/core/styles/layout.scss @@ -40,7 +40,7 @@ html [vn-nine], html [vn-ten], html [vn-eleven], html [vn-twelve]{ - flex-basis: 0.000000001px; + flex-basis: .1px; } html [vn-auto], vn-auto, .vn-auto { flex-basis: auto; diff --git a/front/core/styles/responsive.scss b/front/core/styles/responsive.scss index 9cc58dd12..14053086b 100644 --- a/front/core/styles/responsive.scss +++ b/front/core/styles/responsive.scss @@ -1,12 +1,16 @@ @import "variables"; -/* Desktop - Laptop 1360x768 */ +// XXX: For testing +body { font-size: 8pt; } + +/* +// Desktop - Laptop 1360x768 @media (max-resolution: 119dpi) and (min-device-width: 1340px) and (max-device-width: 1899px) { body { font-size: 10pt; } } -/* Mobile - Low DPI */ +// Mobile - Low DPI @media (min-resolution: 120dpi), (-webkit-min-device-pixel-ratio: 1.5) @@ -20,7 +24,7 @@ body { font-size: 11pt; } } -/* Mobile - Normal DPI */ +// Mobile - Normal DPI @media (max-device-width: 383px) and (min-resolution: 192dpi), (max-device-width: 383px) and (-webkit-min-device-pixel-ratio: 2) @@ -34,7 +38,7 @@ body { font-size: 11pt; } } -/* Mobile - High DPI */ +// Mobile - High DPI @media (max-device-width: 411px) and (min-resolution: 249dpi), (max-device-width: 411px) and (-webkit-min-device-pixel-ratio: 3) @@ -47,7 +51,7 @@ { body { font-size: 11pt; } } - +*/ .vn-hide-narrow { @media (max-width: $mobile-width) { display: none; diff --git a/front/salix/components/home/style.scss b/front/salix/components/home/style.scss index 268260bbd..cd3c1f31d 100644 --- a/front/salix/components/home/style.scss +++ b/front/salix/components/home/style.scss @@ -45,7 +45,7 @@ vn-home { } } & > span { - font-size: 0.9em; + font-size: .9em; text-align: center; } & > h4 { diff --git a/front/salix/styles/misc.scss b/front/salix/styles/misc.scss index b2f28032e..c081121a6 100644 --- a/front/salix/styles/misc.scss +++ b/front/salix/styles/misc.scss @@ -104,7 +104,7 @@ vn-tool-bar { html [scrollable] { min-height: 1px; flex: 1; - flex-basis: 0.000000001px; + flex-basis: .1px; } .ellipsize { text-overflow: ellipsis; @@ -115,7 +115,7 @@ html [scrollable] { @extend %active; &.small { - font-size: 0.7em + font-size: .7em } } diff --git a/front/salix/styles/photo-list.scss b/front/salix/styles/photo-list.scss index b0c926def..0423c5793 100644 --- a/front/salix/styles/photo-list.scss +++ b/front/salix/styles/photo-list.scss @@ -8,7 +8,7 @@ .photo { box-sizing: border-box; - transition: all 0.5s; + transition: all .5s; padding: $spacing-sm; position: relative; width: 28em; diff --git a/modules/claim/front/action/style.scss b/modules/claim/front/action/style.scss index aef8d2cfd..bac316287 100644 --- a/modules/claim/front/action/style.scss +++ b/modules/claim/front/action/style.scss @@ -36,7 +36,7 @@ vn-claim-action { div.ticketList { overflow: auto; - max-height: 350px + max-height: 350px; } } } \ No newline at end of file diff --git a/modules/claim/front/detail/style.scss b/modules/claim/front/detail/style.scss index 6229e56fb..74f3ed674 100644 --- a/modules/claim/front/detail/style.scss +++ b/modules/claim/front/detail/style.scss @@ -13,7 +13,7 @@ } } .simulatorTitle { - margin-bottom: 0px; + margin-bottom: 0; font-size: 12px; color: $color-main; } diff --git a/modules/claim/front/photos/style.scss b/modules/claim/front/photos/style.scss index 35f548560..c0b053e05 100644 --- a/modules/claim/front/photos/style.scss +++ b/modules/claim/front/photos/style.scss @@ -6,7 +6,7 @@ vn-claim-photos { .drop-zone { color: $color-font-secondary; box-sizing: border-box; - border-radius: 0.5em; + border-radius: .5em; text-align: center; min-height: 100%; diff --git a/modules/claim/front/summary/style.scss b/modules/claim/front/summary/style.scss index afd3838be..b108b0c8d 100644 --- a/modules/claim/front/summary/style.scss +++ b/modules/claim/front/summary/style.scss @@ -5,6 +5,6 @@ vn-claim-summary { height: 15.5em } .photo .image { - border-radius: 0.2em + border-radius: .2em } } \ No newline at end of file diff --git a/modules/client/front/sample/create/style.scss b/modules/client/front/sample/create/style.scss index fdd01f729..cd9764bf3 100644 --- a/modules/client/front/sample/create/style.scss +++ b/modules/client/front/sample/create/style.scss @@ -17,7 +17,7 @@ div.vn-dialog { footer p { font-size: 10px !important; - line-height: 10px + line-height: 10px; } } diff --git a/modules/item/front/index/style.scss b/modules/item/front/index/style.scss index 1cbc88124..b5f700818 100644 --- a/modules/item/front/index/style.scss +++ b/modules/item/front/index/style.scss @@ -6,7 +6,7 @@ vn-item-product { .id { background-color: $color-main; color: $color-font-dark; - margin-bottom: 0em; + margin-bottom: 0; } .image { height: 7em; @@ -19,10 +19,10 @@ vn-item-product { } } vn-label-value:first-of-type section{ - margin-top: 0.6em; + margin-top: .6em; } vn-fetched-tags vn-horizontal{ - margin-top: 0.9em; + margin-top: .9em; } } diff --git a/modules/item/front/waste/style.scss b/modules/item/front/waste/style.scss index 59e9a3b68..7e9f9a941 100644 --- a/modules/item/front/waste/style.scss +++ b/modules/item/front/waste/style.scss @@ -11,7 +11,7 @@ vn-item-waste { padding-bottom: 4px; font-weight: lighter; background-color: #fde6ca; - border-bottom: 0.1em solid #f7931e; + border-bottom: .1em solid #f7931e; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/modules/ticket/front/sale/style.scss b/modules/ticket/front/sale/style.scss index 1eb7556e9..8d3fd8ce4 100644 --- a/modules/ticket/front/sale/style.scss +++ b/modules/ticket/front/sale/style.scss @@ -69,7 +69,7 @@ vn-ticket-sale { } } vn-table, table { - margin-bottom: 10px + margin-bottom: 10px; } vn-table { overflow-x: hidden; @@ -96,7 +96,7 @@ vn-ticket-sale { } p.simulatorTitle { - margin-bottom: 0px; + margin-bottom: 0; font-size: 12px; color: $color-main; } diff --git a/modules/ticket/front/summary/style.scss b/modules/ticket/front/summary/style.scss index 4502c5dca..ab5ce7885 100644 --- a/modules/ticket/front/summary/style.scss +++ b/modules/ticket/front/summary/style.scss @@ -54,7 +54,7 @@ vn-ticket-summary .summary { .vn-table > vn-thead .tax-class, .vn-table > vn-tbody .tax-class { min-width: 11em; - width: 1px + width: 1px; } .vn-table > vn-tbody vn-td:first-child {