From 7ed8a9f6382804a66a351436ae9136b00d11b5f5 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Thu, 26 Oct 2017 17:37:13 +0000
Subject: [PATCH] =?UTF-8?q?N=C2=B01138=20Portal:=20Scrollbar=20appeared=20?=
 =?UTF-8?q?sometimes=20in=20navigation=20menu=20when=20on=20the=20last=20b?=
 =?UTF-8?q?rick.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

SVN:trunk[5097]
---
 .../portal/web/css/bootstrap-theme-combodo.css        |  4 ++++
 .../portal/web/css/bootstrap-theme-combodo.scss       | 11 +++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.css b/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.css
index 854d9c26be..40e6aacf59 100644
--- a/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.css
+++ b/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.css
@@ -2744,6 +2744,10 @@ textarea.input-group-sm > .form-control, textarea.input-group-sm > .input-group-
     /* To mask border from previous li item */
     box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.8) inset;
   }
+  .navbar-nav > li:last-child.active > a {
+    margin-top: 0px;
+    /* Overflow hack */
+  }
   .navbar-nav > li > a {
     padding-top: 11px;
     padding-bottom: 11px;
diff --git a/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss b/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss
index d57a3ee67b..70157b3538 100644
--- a/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss
+++ b/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss
@@ -3470,10 +3470,13 @@ select[multiple].input-group-sm>.input-group-btn>.btn {
 		border-right-width: 20px;
 		border-right-color: $body-bg;
 	}
-	.navbar-nav>li.active>a{
-		margin-top: -1px; /* To mask border from previous li item */
-		box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.8) inset;
-	}
+    .navbar-nav>li.active>a{
+        margin-top: -1px; /* To mask border from previous li item */
+        box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.8) inset;
+    }
+    .navbar-nav>li:last-child.active>a{
+        margin-top: 0px; /* Overflow hack */
+    }
     .navbar-nav>li>a {
         padding-top: 11px;
         padding-bottom: 11px;