amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into task/3756/landing_billing_page

Browse source
This commit is contained in:
Arvind Tiwari 2017-09-09 02:13:24 +05:30
commit d4e73f4c74
9 changed files with 153 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

24
datacenterlight/static/datacenterlight/css/landing-page.css
View file

@ -122,7 +122,7 @@ button, input, optgroup, select, textarea {
.navbar-default {
background: #fff;
border: none;
/* border: none; */
padding: 5px;
}
@ -143,15 +143,19 @@ button, input, optgroup, select, textarea {
.navbar-default .navbar-nav>li>a {
cursor: pointer;
/*font-family: 'Lato-Light', sans-serif;*/
font-weight: 300;
font-weight: 400;
}
.navbar-transparent .navbar-nav>li>a {
color: #fff;
cursor: pointer;
/*font-family: 'Lato-Light', sans-serif;*/
font-weight: 300;
}
@media (min-width: 768px) {
.navbar-default .navbar-nav>li>a,
.navbar-transparent .navbar-nav>li>a {
font-weight: 300;
}
}
.navbar-transparent .navbar-nav>li>a:hover {
@ -924,7 +928,7 @@ tech-sub-sec h2 {
border: 1px solid #fff;
-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);
box-shadow: -8px 14px 20px -5px rgba(77, 77, 77, 0.5);
display: none;
text-align: center;
border-radius: 4px !important;
@ -976,8 +980,12 @@ tech-sub-sec h2 {
.dropdown-menu>li>a {
font-size: 13px;
font-weight: 300;
/*font-family: 'Lato-Light', sans-serif;*/
}
@media (min-width: 768px) {
.dropdown-menu>li>a {
font-weight: 300;
}
}
.navbar-default .navbar-nav>.active>a,

15
datacenterlight/templates/datacenterlight/includes/_navbar.html
View file

@ -1,10 +1,12 @@
{% load staticfiles i18n%} {% load custom_tags %} {% get_current_language as LANGUAGE_CODE %}
{% load staticfiles i18n%}
{% load custom_tags %}
{% get_current_language as LANGUAGE_CODE %}
<nav class="navbar navbar-default navbar-fixed-top 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">
<span class="sr-only">Toggle navigation</span>
<span class="sr-only">{% trans "Toggle navigation" %}</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
@ -34,6 +36,15 @@
<a class="on-hover-border" href="{% change_lang 'de' %}">Deutsch&nbsp;&nbsp;<i class="fa fa-globe" aria-hidden="true"></i></a> {% else %}
<a class="on-hover-border" href="{% change_lang 'en-us' %}">English&nbsp;&nbsp;<i class="fa fa-globe" aria-hidden="true"></i></a> {% endif %}
</li>
{% if not request.user.is_authenticated %}
<li>
<a href="{% url 'hosting:login' %}">{% trans "Login" %}&nbsp;&nbsp;<span class="fa fa-sign-in"></span></a>
</li>
{% else %}
<li>
<a href="{% url 'hosting:dashboard' %}">{% trans "Dashboard" %}</a>
</li>
{% endif %}
{% comment %}
<!-- to be used when more than one option for language -->
<li class="nav-language">