From c1b48e2c9c3dc6f70970e19369b2e428e65b6fe2 Mon Sep 17 00:00:00 2001 From: Kia Lam Date: Mon, 28 Jan 2019 13:25:44 -0500 Subject: [PATCH] Some sidebar nav fixes. - Set isExpanded state to false when window width is < 700px. - Set `pointer-events` to `none` for logo to allow users to easily click on hamburger icon. --- awx/ui/client/lib/components/layout/_index.less | 1 + awx/ui/client/lib/components/layout/side-nav.directive.js | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/awx/ui/client/lib/components/layout/_index.less b/awx/ui/client/lib/components/layout/_index.less index eaeb617379..ea667034bb 100644 --- a/awx/ui/client/lib/components/layout/_index.less +++ b/awx/ui/client/lib/components/layout/_index.less @@ -49,6 +49,7 @@ width: @main-menu-width; margin: @main-menu-margin; flex: initial; + pointer-events: none; } } diff --git a/awx/ui/client/lib/components/layout/side-nav.directive.js b/awx/ui/client/lib/components/layout/side-nav.directive.js index 40950152d5..6edd96869d 100644 --- a/awx/ui/client/lib/components/layout/side-nav.directive.js +++ b/awx/ui/client/lib/components/layout/side-nav.directive.js @@ -44,6 +44,14 @@ function AtSideNavController ($scope, $window) { vm.isExpanded = false; } }); + + $(window).resize(() => { + if ($window.innerWidth <= breakpoint) { + vm.isExpanded = false; + } else { + vm.isExpanded = true; + } + }); } AtSideNavController.$inject = ['$scope', '$window'];