merge master
This commit is contained in:
		
				commit
				
					
						3bb64478ed
					
				
			
		
					 3 changed files with 47 additions and 31 deletions
				
			
		| 
						 | 
					@ -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"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -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;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -41,6 +41,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<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">
 | 
				
			||||||
 | 
					      <div class="topnav">
 | 
				
			||||||
        <!-- Brand and toggle get grouped for better mobile display -->
 | 
					        <!-- Brand and toggle get grouped for better mobile display -->
 | 
				
			||||||
        <div class="navbar-header">
 | 
					        <div class="navbar-header">
 | 
				
			||||||
            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
 | 
					            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
 | 
				
			||||||
| 
						 | 
					@ -56,17 +57,18 @@
 | 
				
			||||||
          <!-- Start Navbar collapse-->
 | 
					          <!-- Start Navbar collapse-->
 | 
				
			||||||
          <ul class="nav navbar-nav navbar-right">
 | 
					          <ul class="nav navbar-nav navbar-right">
 | 
				
			||||||
            <li>
 | 
					            <li>
 | 
				
			||||||
            <a class="page-scroll" href="#services">Technische Details</a>
 | 
					              <a class="url-init" href="#services">Technische Details</a>
 | 
				
			||||||
            </li>
 | 
					            </li>
 | 
				
			||||||
            <li>
 | 
					            <li>
 | 
				
			||||||
            <a class="page-scroll" href="#about">Wie funktioniert es?</a>
 | 
					              <a class="url-init" href="#about">Wie funktioniert es?</a>
 | 
				
			||||||
            </li>
 | 
					            </li>
 | 
				
			||||||
            <li>
 | 
					            <li>
 | 
				
			||||||
            <a class="page-scroll" href="#contact">{% trans "CONTACT" %}</a>
 | 
					              <a class="url-init" href="#contact">{% trans "CONTACT" %}</a>
 | 
				
			||||||
            </li>
 | 
					            </li>
 | 
				
			||||||
          </ul>
 | 
					          </ul>
 | 
				
			||||||
          <!-- /.navbar-collapse -->
 | 
					          <!-- /.navbar-collapse -->
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
 | 
					      </div>
 | 
				
			||||||
    </nav>
 | 
					    </nav>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <!-- Header -->
 | 
					    <!-- Header -->
 | 
				
			||||||
| 
						 | 
					@ -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 -->
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue