Merge pull request #424 from tiwariav/bugfix/3629/navbar_lang
bugix #3629 navbar language consistency
This commit is contained in:
commit
999dad405d
3 changed files with 95 additions and 65 deletions
|
@ -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;
|
||||
|
@ -1188,8 +1213,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;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
{% load staticfiles i18n%}
|
||||
{% get_current_language as LANGUAGE_CODE %}
|
||||
{% load custom_tags %}
|
||||
{% load staticfiles i18n%} {% get_current_language as LANGUAGE_CODE %} {% load custom_tags %}
|
||||
<nav class="navbar navbar-default navbar-fixed-top topnav">
|
||||
<div class="topnav">
|
||||
<div class="topnav">
|
||||
<!-- Brand and toggle get grouped for better mobile display -->
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
|
||||
|
@ -33,14 +31,25 @@
|
|||
</ul>
|
||||
</li>
|
||||
<li>
|
||||
<a href="{% url 'datacenterlight:index' %}/whydatacenterlight" >{% trans "Why Data Center Light?" %}</a>
|
||||
<a href="{% url 'datacenterlight:whydatacenterlight' %}" >{% trans "Why Data Center Light?" %}</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="url" href="{% url 'datacenterlight:index' %}#contact" data-url="#contact" >{% trans "Contact" %}</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
|
||||
<li>
|
||||
{% if LANGUAGE_CODE == 'en-us'%}
|
||||
<a class="on-hover-border" href="{% change_lang 'de' %}">Deutsch <i class="fa fa-globe" aria-hidden="true"></i></a>
|
||||
{% else %}
|
||||
<a class="on-hover-border" href="{% change_lang 'en-us' %}">English <i class="fa fa-globe" aria-hidden="true"></i></a>
|
||||
{% endif %}
|
||||
</li>
|
||||
{% comment %}
|
||||
<!-- to be used when more than one option for language -->
|
||||
<li class="nav-language">
|
||||
<div class="select-language">
|
||||
<div class="dropdown">
|
||||
<div class="dropdown-toggle select-language" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
|
||||
{% if LANGUAGE_CODE == 'en-us'%}
|
||||
<span>English</span>
|
||||
{% else %}
|
||||
|
@ -48,18 +57,18 @@
|
|||
{% endif %}
|
||||
<i class="fa fa-globe" aria-hidden="true"></i>
|
||||
</div>
|
||||
|
||||
<div class="drop-language">
|
||||
<ul class="dropdown-menu drop-language dropdown-menu-right">
|
||||
{% if LANGUAGE_CODE == 'en-us'%}
|
||||
<a href="{% change_lang 'de' %}">Deutsch</a>
|
||||
<li><a class="url" href="{% change_lang 'de' %}">Deutsch</a></li>
|
||||
{% else %}
|
||||
<a href="{% change_lang 'en-us' %}" >English</a>
|
||||
<li><a class="url" href="{% change_lang 'en-us' %}">English</a></li>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
</li>
|
||||
</ul>
|
||||
</div><!-- /.navbar-collapse -->
|
||||
</div>
|
||||
</li>
|
||||
{% endcomment %}
|
||||
</ul>
|
||||
</div>
|
||||
<!-- /.navbar-collapse -->
|
||||
</div>
|
||||
</nav>
|
Loading…
Reference in a new issue