From 8d471ba5b8237cd8ca9eeaac2f8e519c7e22a821 Mon Sep 17 00:00:00 2001 From: Vladislav Ahmetvaliev Date: Wed, 6 Feb 2019 14:19:12 +0300 Subject: [PATCH] fix(setting-sidebar): Ie and firefox position bugs, linter (#2023) --- src/app/@theme/layouts/sample/sample.layout.scss | 13 +++++++------ .../interactive-progress-bar.component.ts | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/app/@theme/layouts/sample/sample.layout.scss b/src/app/@theme/layouts/sample/sample.layout.scss index ac70a3e3..b3cf2c22 100644 --- a/src/app/@theme/layouts/sample/sample.layout.scss +++ b/src/app/@theme/layouts/sample/sample.layout.scss @@ -13,15 +13,15 @@ transition: transform 0.3s ease; width: $sidebar-width; overflow: hidden; - @include nb-ltr(transform, translateX(100%)); - @include nb-rtl(transform, translateX(-100%)); + @include nb-ltr(transform, translate3d(100%, 0, 0)); + @include nb-rtl(transform, translate3d(-100%, 0, 0)); &.start { - @include nb-ltr(transform, translateX(-100%)); - @include nb-rtl(transform, translateX(100%)); + @include nb-ltr(transform, translate3d(-100%, 0, 0)); + @include nb-rtl(transform, translate3d(100%, 0, 0)); } &.expanded, &.expanded.start { - transform: translateX(0); + transform: translate3d(0, 0, 0); } /deep/ .scrollable { @@ -32,8 +32,9 @@ /deep/ .main-container { width: $sidebar-width; background: nb-theme(color-bg); - transition: width 0.3s ease; + transition: transform 0.3s ease; overflow: hidden; + position: relative; .scrollable { width: $sidebar-width; diff --git a/src/app/pages/extra-components/progress-bar/interactive-progress-bar/interactive-progress-bar.component.ts b/src/app/pages/extra-components/progress-bar/interactive-progress-bar/interactive-progress-bar.component.ts index fc39042e..11f6ac77 100644 --- a/src/app/pages/extra-components/progress-bar/interactive-progress-bar/interactive-progress-bar.component.ts +++ b/src/app/pages/extra-components/progress-bar/interactive-progress-bar/interactive-progress-bar.component.ts @@ -13,7 +13,7 @@ export class InteractiveProgressBarComponent { this.value = Math.min(Math.max(newValue, 0), 100); } - get status(){ + get status() { if (this.value <= 25) { return 'danger'; } else if (this.value <= 50) {