Merge pull request #360 from RRZE-Webteam/dev1-8

Dev1 8
RRZE-Webteam · Oct 18, 2017 · 4a2fac3 · 4a2fac3
2 parents b094717 + 3de661d
commit 4a2fac3
Show file tree

Hide file tree

Showing 15 changed files with 165 additions and 112 deletions.
diff --git a/css/base.css b/css/base.css
diff --git a/css/editor-style.css b/css/editor-style.css
diff --git a/css/sass/_variables.scss b/css/sass/_variables.scss
@@ -7,7 +7,6 @@
 
  // DEBUGMODE
  // (Sets border around container and main regions)
-
 $debugmode: 'false';
 
 
@@ -160,7 +159,7 @@ $font-size-base:		15;
 $font-size-meta:		13;
 $font-size-sidebar:		13;
 
-
+$font-size-footer:		13;
 $font-size-breadcrumb:		13;
 $font-size-herosearch:		16;
 $font-size-header-branding:	19;
@@ -189,10 +188,12 @@ $font-size-nav-blockquote:	16;
 $font-size-nav-blockquote-cite:	14;
 $font-size-nav-introtext:	15;
 $font-size-nav-flyout-items:	15;
-
+$font-size-nav-mainlinks:	17;
 
 $font-size-h1:			32;
 $font-size-h1-mobilebranding:	24;
+$font-size-h1-desktopbranding:	20;
+$font-size-h1-desktopbranding-longtitle:    17;
 $font-size-h1-banner:		28;
 
 $font-size-h2:			24;

diff --git a/css/sass/elements/_headlines.scss b/css/sass/elements/_headlines.scss
@@ -36,10 +36,7 @@ h1 {
     .sidebar-inline+& {
 	    margin-top: 0;
     }
-    #logo & {
-	@include px2rem($font-size-h1-mobilebranding);
-
-    }
+
     .banner-text & {
 	@include px2rem($font-size-h1-banner);
     }

diff --git a/css/sass/structure/_footer.scss b/css/sass/structure/_footer.scss
@@ -10,8 +10,7 @@
 
 	p {
 		color: #fff;
-		font-size: 13px;
-		line-height: 18px;
+		@include px2rem($font-size-footer);
 	}
 
 	a {
@@ -20,7 +19,7 @@
 	}
 
 	li {
-		font-size: 13px;
+		@include px2rem($font-size-footer);
 	}
 
 	a:hover, a:focus {
@@ -72,6 +71,7 @@
 @media (max-width: $screen-xs - 1) {
     .footer-logo {
 	width: 100%;
+	padding-top: 10px;
     }
     .footer-address {
 	width: 100%;

diff --git a/css/sass/structure/_header.scss b/css/sass/structure/_header.scss
@@ -81,7 +81,13 @@
 		float: none;
 		width: 240px;
 		vertical-align: bottom;
+
+
+		.nologo.longtitle & {
+		    width: 300px;
+		}
 	    } 
+
 	    .header-menu {
 		float: none;
 		display: table-cell;
@@ -107,7 +113,12 @@
 	h1 {
 	    color: $colorPrimary;
 	    overflow: hidden;
-	    margin: 0;
+	    margin: 0 0 10px 0;
+
+	    max-height: inherit; 
+	    @media (min-width: $screen-sm ) {
+		  max-height: 65px;
+	    }
 
 	    a, span {
 		display: table-cell;
@@ -116,7 +127,22 @@
 	    a {
 		color: $colorPrimary;
 		text-decoration: none;	
-	    } 		
+	    } 
+
+
+	    @include px2rem($font-size-h1-mobilebranding);
+	    @media (min-width: $screen-sm) {
+		@include px2rem($font-size-h1-desktopbranding);
+
+		.nologo.longtitle & {
+		   @include px2rem($font-size-h1-desktopbranding-longtitle, $font-size-gridbase, $font-size-h1-desktopbranding-longtitle + 2);
+
+		   hyphens: auto;
+		}
+
+	    }
+
+
 	    @media (max-width: $screen-sm - 1) {
 		color: #fff;
 		a {
@@ -125,15 +151,14 @@
 	    } 
 	}
 	.nologo &.branding {
-		padding-bottom: 3px;
+		padding: 0 0 3px 15px;
 
 	}
 	img {
-	   max-height: 85px;
-	   width: 240px;
-	   max-width: inherit;
-	   margin-bottom: 10px;
-
+	   max-width: 240px;
+	   max-height: 65px;
+	   width: auto;
+	   height: auto; 		
 	}
 }
 

diff --git a/css/sass/structure/_layout.scss b/css/sass/structure/_layout.scss
@@ -62,16 +62,7 @@ html, body, button {
     .search-input {
 	@extend .col-sm-8;
     }
-    .hero-navigation {
-	.quicklinks {
-	    @extend .col-xs-12;
-	    @extend .col-sm-3;
-	}
-	.infobar {
-	    @extend .col-xs-12;
-	    @extend .col-sm-6;
-	}
-    }
+
 
 }
 

diff --git a/css/sass/structure/hero/_linkregion.scss b/css/sass/structure/hero/_linkregion.scss
@@ -4,58 +4,78 @@
 
 
 .hero-navigation {
+
+
     ul {
 		@include no-list;
+    }
+    li {
+	display: table;
+	padding-left: 0;
+
+	@include px2rem($font-size-hero-links);
+
+	&:before {
+	    @extend .fa;
+	    @extend .fa-angle-right;	
+	    font-weight: bold;
+	    display: table-cell;
+	    color: #fff;
+	    width: 20px;
+	} 
+
+
+    }
+    .infobar {
+	padding-top: 5px;
+
+	p.description {
+	    font-weight: normal;
+	    color: #fff;
+	    @include px2rem($font-size-hero-bannertext);
+	    padding: 0;
+	    margin: 10px 0 0 0; 
 	}
-	li {
-	    display: table;
-	    padding-left: 0;
-
-	    @include px2rem($font-size-hero-links);
-
-	    &:before {
-		@extend .fa;
-		@extend .fa-angle-right;	
-		font-weight: bold;
-		display: table-cell;
-		color: #fff;
-		width: 20px;
-	    } 
-
-
-	}
+    }
+    .ismobile & {
+	display: none;
+    }
+    #footer & {
+	display: block;
+	padding-left: 15px;
+	padding-right: 15px;
+
 	.infobar {
-	    padding-top: 5px;
-
-	    p.description {
-		font-weight: normal;
-		color: #fff;
-		@include px2rem($font-size-hero-bannertext);
-		padding: 0;
-		margin: 10px 0 0 0; 
-	    }
-	}
-	.ismobile & {
 	    display: none;
 	}
-	#footer & {
-	    display: block;
-	    padding-left: 15px;
-	    padding-right: 15px;
+	li {
+	    padding: 3px 0 4px 4px;
+	}
 
-	    .infobar {
-		display: none;
-	    }
-	    li {
-		padding: 3px 0 4px 4px;
-	    }
+	>*, h1, h2, h3 {
+			color: $colorMeta;
+	}
 
-	    >*, h1, h2, h3 {
-			    color: $colorMeta;
-	    }
+    }
+}
+#hero .hero-navigation {
+    display: none;
+	@media (min-width: $screen-sm) {
+	    display: block;
+	}
+}
 
+.hero-navigation {
+	.quicklinks {
+	    @extend .col-xs-12;
+	    @extend .col-sm-3;
+	}
+	.infobar {
+	    @extend .col-xs-12;
+	    @extend .col-sm-6;
 	}
 }
+
 .hero-jumplink-content {
 		position: absolute;
 		left: 300px;

diff --git a/css/sass/structure/navigation/_menu.scss b/css/sass/structure/navigation/_menu.scss
@@ -54,8 +54,8 @@
 			color: $colorPrimary;
 			text-decoration: none;
 			padding: 10px;
-			font-size: 17px;
-			line-height: 17px;
+			@include px2rem($font-size-nav-mainlinks, $font-size-gridbase, $font-size-nav-mainlinks);
+
 			@include border-radius(4px);
 			margin: 0 0 10px 0;
 		}
@@ -238,7 +238,7 @@
 /* New Toogle Button */
 #wrap #mainnav-toggle {
   position: fixed;
-  right: 0;
+  right: 10px;
   top: 0;
   @include px2rem($font-size-mobile-meta);
   background: transparent;

diff --git a/css/sass/structure/navigation/_metanav.scss b/css/sass/structure/navigation/_metanav.scss
@@ -135,6 +135,9 @@
 	    display: none;
 	    content: "";
 	}
+	li.facultyhome {
+	    display: none;
+	}
     }
 
     @media (min-width: $screen-sm) {
@@ -154,6 +157,7 @@
 
 
 #footer {
+
     .cloned-meta-links,
     .cloned-hero-nav,
     #meta-nav {
@@ -184,6 +188,13 @@
 	    }
 
 
+    }
+    .cloned-meta-links,
+    .cloned-hero-nav {
+	 @media (min-width: $screen-sm) {
+	     display: none;
+	 }
+
     }
      #meta-nav {
 	    padding: 10px 0;
@@ -203,6 +214,7 @@
     }
     .cloned-hero-nav {
 	margin-bottom: 10px;
+	margin-left: -15px;
     }
 }
 

diff --git a/functions/template-functions.php b/functions/template-functions.php
@@ -74,6 +74,13 @@ function fau_body_class( $classes ) {
     if (empty( $header_image ) ) {	
 	$classes[] = 'nologo';
     }
+
+    $sitetitle = get_bloginfo( 'title' );
+    if (strlen($sitetitle) > 50) {
+	$classes[] = 'longtitle';
+    }
+
+
     return $classes;
  }
  add_filter( 'body_class', 'fau_body_class' );