Merge branch 'master' into task/3553

datacenterlight/static/datacenterlight/css/landing-page.css

@@ -156,6 +156,14 @@ h6 {
     background-color: transparent;
 }
 
+.navbar-transparent .navbar-nav>li>.on-hover-border {
+	transition: all 0.3s linear;
+	box-shadow: none;
+}
+.navbar-transparent .navbar-nav>li>.on-hover-border:hover {
+	box-shadow: 0 0 0 1px #eee;
+	border-radius: 5px;
+}
 .navbar-default .btn-link {
     box-shadow: none;
 }
@@ -196,44 +204,61 @@ h6 {
     margin-right: 5px;
     font-family: 'Lato', sans-serif;
 }
-
-.nav-language .drop-language {
-    position: absolute;
+.nav-language .drop-language{
+    /*position: absolute;*/
     top: 45px;
-    left: -8px;
-    background: #fff;
+    left: auto !important;
+    /*     background: #fff; */
     width: 100px;
+    min-width: 100px;
     height: 40px;
     padding: 9px 10px;
-    -webkit-box-shadow: -8px 13px 31px -8px rgba(77, 77, 77, 1);
-    -moz-box-shadow: -8px 13px 31px -8px rgba(77, 77, 77, 1);
-    box-shadow: -8px 13px 31px -8px rgba(77, 77, 77, 1);
-    display: none;
+    -webkit-box-shadow: -8px 13px 31px -8px rgba(77,77,77,1);
+    -moz-box-shadow: -8px 13px 31px -8px rgba(77,77,77,1);
+    box-shadow: -8px 13px 31px -8px rgba(77,77,77,1);
+    /*display: none;*/
     z-index: 100;
     /* margin-left: 10px; */
     text-align: center;
     border-radius: 4px;
 }
 
-.nav-language .drop-language a {
-    cursor: pointer;
-    font-family: 'Lato', sans-serif;
+.nav-language .open .drop-language{
+	width: 100px;
+	min-width: 100px;
 }
 
-.navbar-transparent .nav-language .drop-language {
+.nav-language .drop-language a{
+   cursor: pointer;
+   padding: 5px 10px !important;
+   font-family: 'Lato-Light', sans-serif;
+}
+
+/* Show the dropdown menu on hover */
+@media (min-width: 769px) {
+	.nav-language .dropdown:hover .dropdown-menu {
+		display: block;
+	}
+}
+@media (max-width: 767px){
+	.nav-language .open .dropdown-menu>li>a {
+    	line-height: 1.42857143;
+	}
+}
+
+.navbar-transparent .nav-language .drop-language{
     background: transparent;
     border: 1px solid #fff;
 }
 
 .navbar-transparent .nav-language .drop-language a {
     color: #fff;
+    padding: 5px 10px !important;
     font-family: 'Lato-Light', sans-serif;
 }
-
-.nav-language:hover .drop-language {
+/* .nav-language:hover .drop-language{
     display: block;
-}
-
+} */
 .intro-header {
     height: 100vh;
     text-align: center;
@@ -1192,8 +1217,8 @@ tech-sub-sec h2 {
         font-size: 14px;
         color: #777;
     }
-    .nav-language:hover {
-        height: 80px;
+    .nav-language:hover{
+        /*height: 80px;*/
     }
     .navbar-transparent .nav-language .select-language {
         color: #777;

datacenterlight/static/datacenterlight/js/main.js

@@ -91,16 +91,12 @@
             var href = $(this).attr('data-url');
             $('.navbar-collapse').removeClass('in');
             $('.navbar-collapse').addClass('collapsing');
-            var url = window.location.pathname;
-            var urlSplit = url.split('/');
-            if (urlSplit.length === 3 && urlSplit[2] === 'datacenterlight') {
+            if ($(href).length) {
                 $('html, body').animate({
                     scrollTop: $(href).offset().top
                 }, 1000);
             } else {
-                var allUrl = window.location.href;
-                var redirect = allUrl.split('whydatacenterlight')
-                window.location.href = '/en-us/datacenterlight' + href;
+                window.location.href = '/datacenterlight' + href;
             }
         });
     }