Merge branch 'develop'

godaddy-wordpress · Oct 7, 2016 · 8267d05 · 8267d05
2 parents 8194ce0 + dc01c7d
commit 8267d05
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 4 deletions.
diff --git a/.dev/sass/partials/_header.scss b/.dev/sass/partials/_header.scss
@@ -2,13 +2,25 @@ $entry-title-bg: rgba(0, 0, 0, 0.6) !default;
 
 .site-header .site-title-wrapper {
 	float: left;
-	margin-left: 15px;
+	margin: 0 0 30px 15px;
 
 	@media #{$large-down} {
 		position: absolute;
 		z-index: 999999;
 	}
 
+	@media #{$medium-only} {
+		max-width: 90%;
+		z-index: 8;
+		position: relative;
+	}
+
+	@media #{$small-only} {
+		max-width: 75%;
+		z-index: 8;
+		position: relative;
+	}
+
 }
 
 .site-title {

diff --git a/.dev/sass/partials/_hero.scss b/.dev/sass/partials/_hero.scss
@@ -2,6 +2,14 @@
 	margin-right: 0;
 }
 
+body.home .hero {
+	padding: 150px 0;
+
+	@media #{$small-only} {
+		padding: 0;
+	}
+}
+
 .hero {
 	@extend .row;
 

diff --git a/functions.php b/functions.php
@@ -19,8 +19,10 @@ function lyrical_move_elements() {
 
 	remove_action( 'primer_after_header', 'primer_add_primary_navigation' );
 	remove_action( 'primer_after_header', 'primer_add_page_title' );
+	remove_action( 'primer_header', 'primer_add_site_title' );
 
-	add_action( 'primer_header', 'primer_add_primary_navigation', 5 );
+	add_action( 'primer_header', 'primer_add_site_title', 8 );
+	add_action( 'primer_header', 'primer_add_primary_navigation', 9 );
 
 	if ( ! is_front_page() || ! is_active_sidebar( 'hero' ) ) {
 

diff --git a/style-rtl.css b/style-rtl.css
@@ -3112,11 +3112,21 @@ body.page-template-page-builder-no-header #primary {
 
 .site-header .site-title-wrapper {
   float: right;
-  margin-right: 15px; }
+  margin: 0 15px 30px 0; }
   @media only screen and (max-width: 61.063em) {
     .site-header .site-title-wrapper {
       position: absolute;
       z-index: 999999; } }
+  @media only screen and (min-width: 40.063em) and (max-width: 61em) {
+    .site-header .site-title-wrapper {
+      max-width: 90%;
+      z-index: 8;
+      position: relative; } }
+  @media only screen and (max-width: 40em) {
+    .site-header .site-title-wrapper {
+      max-width: 75%;
+      z-index: 8;
+      position: relative; } }
 
 .site-title {
   font-family: "Playfair Display", "Raleway", "Open Sans", "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;
@@ -3249,6 +3259,12 @@ body.page-template-page-builder-no-header #primary {
 .site-header-wrapper .hero {
   margin-left: 0; }
 
+body.home .hero {
+  padding: 150px 0; }
+  @media only screen and (max-width: 40em) {
+    body.home .hero {
+      padding: 0; } }
+
 .hero {
   padding-top: 55px; }
   .hero:before, .hero:after {

diff --git a/style.css b/style.css
@@ -3112,11 +3112,21 @@ body.page-template-page-builder-no-header #primary {
 
 .site-header .site-title-wrapper {
   float: left;
-  margin-left: 15px; }
+  margin: 0 0 30px 15px; }
   @media only screen and (max-width: 61.063em) {
     .site-header .site-title-wrapper {
       position: absolute;
       z-index: 999999; } }
+  @media only screen and (min-width: 40.063em) and (max-width: 61em) {
+    .site-header .site-title-wrapper {
+      max-width: 90%;
+      z-index: 8;
+      position: relative; } }
+  @media only screen and (max-width: 40em) {
+    .site-header .site-title-wrapper {
+      max-width: 75%;
+      z-index: 8;
+      position: relative; } }
 
 .site-title {
   font-family: "Playfair Display", "Raleway", "Open Sans", "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;
@@ -3249,6 +3259,12 @@ body.page-template-page-builder-no-header #primary {
 .site-header-wrapper .hero {
   margin-right: 0; }
 
+body.home .hero {
+  padding: 150px 0; }
+  @media only screen and (max-width: 40em) {
+    body.home .hero {
+      padding: 0; } }
+
 .hero {
   padding-top: 55px; }
   .hero:before, .hero:after {