From 8e59c3506a07e4e2ac0f5be3ce338ca947855325 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Fri, 29 May 2015 10:49:13 -0400 Subject: [PATCH] fixed width of dashboard and nav menu to match rest of app --- awx/ui/static/js/main-menu/main-menu.block.less | 2 +- awx/ui/static/js/setup-menu/setup-menu.block.less | 7 ++++++- awx/ui/static/partials/home.html | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/awx/ui/static/js/main-menu/main-menu.block.less b/awx/ui/static/js/main-menu/main-menu.block.less index 57d9b91fb3..038b98b5a9 100644 --- a/awx/ui/static/js/main-menu/main-menu.block.less +++ b/awx/ui/static/js/main-menu/main-menu.block.less @@ -28,7 +28,7 @@ } @media screen and (min-width: (@menu-breakpoint + 1px)) { - padding: 0 1rem; + padding: 0 20px; } &-menuContainer { diff --git a/awx/ui/static/js/setup-menu/setup-menu.block.less b/awx/ui/static/js/setup-menu/setup-menu.block.less index 080f54963e..04157d0c48 100644 --- a/awx/ui/static/js/setup-menu/setup-menu.block.less +++ b/awx/ui/static/js/setup-menu/setup-menu.block.less @@ -1,6 +1,7 @@ /** @define SetupMenu */ @import "shared/branding/colors.less"; +@menu-breakpoint: 710px; .SetupMenu { display: flex; @@ -8,5 +9,9 @@ flex-direction: row; justify-content: flex-start; flex-wrap: wrap; - margin-left: -1rem; + margin-left: 0; + + @media screen and (max-width: @menu-breakpoint) { + margin-left: -1rem; + } } diff --git a/awx/ui/static/partials/home.html b/awx/ui/static/partials/home.html index c1c9c849db..6ff4feee70 100644 --- a/awx/ui/static/partials/home.html +++ b/awx/ui/static/partials/home.html @@ -1,6 +1,6 @@
-
+