Merge branch 'master' into task/3713/clean_up_css

ungleich_page/static/ungleich_page/css/agency.css

@@ -209,11 +209,6 @@ fieldset[disabled] .btn-xl.active {
     border-color: rgba(255,255,255,.02);
 }
 
-.navbar-default .navbar-toggle {
-    /*border-color: #fed136;
-    background-color: #fed136;*/
-}
-
 .navbar-default .navbar-toggle .icon-bar {
     background-color: #fff;
 }
@@ -280,7 +275,7 @@ fieldset[disabled] .btn-xl.active {
     }
 
     .navbar-default .navbar-brand {
-       padding: 4px 8px 12px;
+       padding: 8px 8px;
     }
     .navbar-default.navbar-shrink .navbar-brand {
        padding: 6px 8px 10px;
@@ -345,6 +340,7 @@ header .intro-text .intro-heading {
 
 section {
     padding: 75px 0;
+    border-bottom: 1px solid #f3f4f5;
 }
 
 @media(max-width:767px) {
@@ -353,6 +349,16 @@ section {
     }
 }
 
+section .section-heading-contain {
+    margin-bottom: 50px;
+}
+
+@media(min-width:767px) {
+    section .section-heading-contain {
+        margin-bottom: 75px;
+    }
+}
+
 section h2.section-heading {
 	margin-top: 0;
 	margin-bottom: 15px;
@@ -361,7 +367,6 @@ section h2.section-heading {
 }
 
 section h3.section-subheading {
-	margin-bottom: 50px;
 	text-transform: none;
 	font-family: 'Raleway', "Helvetica Neue", "Open Sans", "Droid Serif", Helvetica, Arial, sans-serif;
 	font-size: 16px;
@@ -371,15 +376,11 @@ section h3.section-subheading {
 }
 
 @media(min-width:768px) {
-    section {
-	   padding: 80px 0;
-    }
     section h2.section-heading {
         font-size: 40px;
     }
     section h3.section-subheading {
         font-size: 18px;
-        margin-bottom: 75px;
     }
 }
 
@@ -699,9 +700,6 @@ section h3.section-subheading {
 }
 
 @media(min-width:768px) {
-    .team-member {
-        margin-bottom: 50px;
-    }
     .team-member h4 {
         margin-top: 20px;
         margin-bottom: 20px;

ungleich_page/static/ungleich_page/css/glasfaser.css

@@ -135,7 +135,7 @@
     overflow: hidden;
 }
 .split-section.right {
-    padding: 100px 0;
+    /* padding: 100px 0; */
     background: rgba(0,0,0,0.03);
 }
 .split-section.right .split-description {

ungleich_page/static/ungleich_page/js/ungleich.js

@@ -15,3 +15,30 @@ function toggleImage(e) {
 	$this.fadeIn(300);
     });
 };
+
+/*!
+ * Start Bootstrap - Agnecy Bootstrap Theme (http://startbootstrap.com)
+ * Code licensed under the Apache License v2.0.
+ * For details, see http://www.apache.org/licenses/LICENSE-2.0.
+ */
+
+// jQuery for page scrolling feature - requires jQuery Easing plugin
+$(function() {
+    $('a.page-scroll').bind('click', function(event) {
+        var $anchor = $(this);
+        $('html, body').stop().animate({
+            scrollTop: $($anchor.attr('href')).offset().top
+        }, 1500, 'easeInOutExpo');
+        event.preventDefault();
+    });
+});
+
+// Highlight the top nav as scrolling occurs
+$('body').scrollspy({
+    target: '.navbar-fixed-top'
+})
+
+// Closes the Responsive Menu on Menu Item Click
+$('.navbar-collapse ul li a').click(function() {
+    $('.navbar-toggle:visible').click();
+});