diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/auditor-backoffice-ui/src/scss/_aside.scss | 7 | ||||
| -rw-r--r-- | packages/merchant-backoffice-ui/src/scss/_aside.scss | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/packages/auditor-backoffice-ui/src/scss/_aside.scss b/packages/auditor-backoffice-ui/src/scss/_aside.scss index b7b59516b..719da7d2c 100644 --- a/packages/auditor-backoffice-ui/src/scss/_aside.scss +++ b/packages/auditor-backoffice-ui/src/scss/_aside.scss @@ -130,7 +130,11 @@ aside.aside { @include touch { nav.navbar { - @include transition(margin-left); + // @include transition(margin-left); + // TODO: adapt above transition mixin to work with multiple transitions + transition: + margin-left 250ms ease-in-out 50ms, + width 250ms ease-in-out 50ms; } aside.aside { @include transition(left); @@ -173,6 +177,7 @@ aside.aside { div.has-aside-mobile-expanded { nav.navbar { margin-left: $aside-mobile-width; + width: calc(100vw - $aside-mobile-width); } aside.aside { left: 0; diff --git a/packages/merchant-backoffice-ui/src/scss/_aside.scss b/packages/merchant-backoffice-ui/src/scss/_aside.scss index b7b59516b..719da7d2c 100644 --- a/packages/merchant-backoffice-ui/src/scss/_aside.scss +++ b/packages/merchant-backoffice-ui/src/scss/_aside.scss @@ -130,7 +130,11 @@ aside.aside { @include touch { nav.navbar { - @include transition(margin-left); + // @include transition(margin-left); + // TODO: adapt above transition mixin to work with multiple transitions + transition: + margin-left 250ms ease-in-out 50ms, + width 250ms ease-in-out 50ms; } aside.aside { @include transition(left); @@ -173,6 +177,7 @@ aside.aside { div.has-aside-mobile-expanded { nav.navbar { margin-left: $aside-mobile-width; + width: calc(100vw - $aside-mobile-width); } aside.aside { left: 0; |