moep/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
parent 7692997c82 a2d79cfab3
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."
msgid "Our services run on"
msgstr "Unsere Dienste läuft auf"
msgstr "Unsere Dienste läufen auf"
msgid "Our monitoring"
msgstr "Unser Monitoring"

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

@ -26,10 +26,19 @@
color: #fff;
}
.navbar-transparent .navbar-nav>li>a:hover,
.navbar-transparent .navbar-nav>li>a:focus,
.navbar-transparent .navbar-nav>li>a:focus:active {
color: #fed136;
.navbar-default .navbar-nav>li>a:focus,
.navbar-default .navbar-nav>li>a:hover,
.navbar-default .navbar-nav>li>a:active {
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 {
@ -37,6 +46,12 @@
}
@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 {
border-color: transparent;
}

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

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