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

merge master

Browse source
This commit is contained in:
Arvind Tiwari 2018-02-19 02:34:23 +05:30
commit 3bb64478ed
3 changed files with 47 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
datacenterlight/locale/de/LC_MESSAGES/django.po
View file

@ -429,7 +429,7 @@ msgstr ""
"nicht Open-Source ist.<br/>Yep, so cool sind wir." "nicht Open-Source ist.<br/>Yep, so cool sind wir."
msgid "Our services run on" msgid "Our services run on"
msgstr "Unsere Dienste läuft auf" msgstr "Unsere Dienste läufen auf"
msgid "Our monitoring" msgid "Our monitoring"
msgstr "Unser Monitoring" msgstr "Unser Monitoring"

23
ungleich_page/static/ungleich_page/css/glasfaser.css
View file

@ -26,10 +26,19 @@
color: #fff; color: #fff;
} }
.navbar-transparent .navbar-nav>li>a:hover, .navbar-default .navbar-nav>li>a:focus,
.navbar-transparent .navbar-nav>li>a:focus, .navbar-default .navbar-nav>li>a:hover,
.navbar-transparent .navbar-nav>li>a:focus:active { .navbar-default .navbar-nav>li>a:active {
color: #fed136; color: #333;
}
.navbar-default .navbar-toggle .icon-bar {
background-color: #888;
}
.navbar-default .navbar-toggle:hover,
.navbar-default .navbar-toggle:focus {
background: #ddd;
} }
.navbar-default .navbar-toggle .icon-bar { .navbar-default .navbar-toggle .icon-bar {
@ -37,6 +46,12 @@
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.navbar-transparent .navbar-nav>li>a:focus,
.navbar-transparent .navbar-nav>li>a:hover,
.navbar-transparent .navbar-nav>li>a:active {
color: #e5e6e7;
}
.navbar-transparent { .navbar-transparent {
border-color: transparent; border-color: transparent;
} }

53
ungleich_page/templates/ungleich_page/glasfaser.html
View file

@ -41,31 +41,33 @@
<body id="page-top" class="index"> <body id="page-top" class="index">
<nav class="navbar navbar-default navbar-fixed-top topnav navbar-transparent"> <nav class="navbar navbar-default navbar-fixed-top topnav navbar-transparent">
<!-- Brand and toggle get grouped for better mobile display --> <div class="topnav">
<div class="navbar-header"> <!-- Brand and toggle get grouped for better mobile display -->
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1"> <div class="navbar-header">
<span class="sr-only">{% trans "Toggle navigation" %}</span> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="icon-bar"></span> <span class="sr-only">{% trans "Toggle navigation" %}</span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> <span class="icon-bar"></span>
<a href="{% url 'ungleich_page:landing' %}" id="logoBlack" class="navbar-brand topnav"><img src="{% static 'ungleich_page/img/logo_black.svg' %}"></a> </button>
<a href="{% url 'ungleich_page:landing' %}" id="logoWhite" class="navbar-brand topnav"><img src="{% static 'ungleich_page/img/logo_white.svg' %}"></a> <a href="{% url 'ungleich_page:landing' %}" id="logoBlack" class="navbar-brand topnav"><img src="{% static 'ungleich_page/img/logo_black.svg' %}"></a>
</div> <a href="{% url 'ungleich_page:landing' %}" id="logoWhite" class="navbar-brand topnav"><img src="{% static 'ungleich_page/img/logo_white.svg' %}"></a>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> </div>
<!-- Start Navbar collapse--> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right"> <!-- Start Navbar collapse-->
<li> <ul class="nav navbar-nav navbar-right">
<a class="page-scroll" href="#services">Technische Details</a> <li>
</li> <a class="url-init" href="#services">Technische Details</a>
<li> </li>
<a class="page-scroll" href="#about">Wie funktioniert es?</a> <li>
</li> <a class="url-init" href="#about">Wie funktioniert es?</a>
<li> </li>
<a class="page-scroll" href="#contact">{% trans "CONTACT" %}</a> <li>
</li> <a class="url-init" href="#contact">{% trans "CONTACT" %}</a>
</ul> </li>
<!-- /.navbar-collapse --> </ul>
<!-- /.navbar-collapse -->
</div>
</div> </div>
</nav> </nav>
@ -310,7 +312,6 @@
<script src="//cdnjs.cloudflare.com/ajax/libs/wow/1.1.2/wow.min.js" type="text/javascript"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/wow/1.1.2/wow.min.js" type="text/javascript"></script>
<!-- Custom Theme JavaScript --> <!-- Custom Theme JavaScript -->
<script src="{% static 'ungleich_page/js/ungleich.js' %}" type="text/javascript"></script>
<script src="{% static 'datacenterlight/js/main.js' %}"></script> <script src="{% static 'datacenterlight/js/main.js' %}"></script>
<!-- Custom Fonts --> <!-- Custom Fonts -->