Addressing #69, #88, #89, #90

pootlepress · Dec 3, 2015 · 2904f51 · 2904f51
1 parent b20a31c
commit 2904f51
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 9 deletions.
diff --git a/inc/pro/assets/css/style.css b/inc/pro/assets/css/style.css
@@ -523,7 +523,7 @@ body.eighteen-tags-pro-active .site-header-cart li a {
 		top: -25px;
 		left: 100%;
 		cursor: pointer;
-		padding: 0 0.7em;
+		padding: 0 12px 0 11px;
 	}
 
 	.hamburger-open .header-toggle {

diff --git a/inc/pro/includes/vars-n-funcs.php b/inc/pro/includes/vars-n-funcs.php
@@ -49,7 +49,6 @@ function eighteen_tags_pro_fields () {
 			'label'   => 'Hamburger Label',
 			'section' => 'Primary Navigation',
 			'type'    => 'text',
-			'default' => 'Menu',
 		),
 		array(
 			'id'      => 'pri-nav-font',

diff --git a/inc/structure/header.php b/inc/structure/header.php
@@ -130,9 +130,11 @@ function eighteen_tags_skip_links() {
 	 */
 	function eighteen_tags_hamburger_menu() {
 		if ( strpos( get_theme_mod( 'eighteen-tags-pro-nav-style' ), 'hamburger' ) ) {
+			$label = get_theme_mod( 'eighteen-tags-pro-pri-nav-label' );
+			$class = $label ? 'header-toggle has-label' : 'header-toggle';
 			?>
 			<div class="overlay hamburger-overlay"></div>
-			<a class="header-toggle" aria-controls="header" aria-expanded="false"><?php echo get_theme_mod( 'eighteen-tags-pro-pri-nav-label', 'Menu' ); ?></a>
+			<a class="<?php echo $class; ?>" aria-controls="header" aria-expanded="false"><?php echo $label; ?></a>
 			<?php
 		}
 	}

diff --git a/inc/styles.php b/inc/styles.php
@@ -39,7 +39,7 @@
 	padding : 1em;
 }
 
-#masthead, .single .woocommerce-breadcrumb {
+.single #masthead, .single .woocommerce-breadcrumb {
 	margin-bottom: 0;
 }
 

diff --git a/single.php b/single.php
@@ -25,11 +25,15 @@
 					<div></div>
 					<header class="entry-header">
 						<?php
-						if (has_post_thumbnail( get_the_ID() ) ) {
+						if ( has_post_thumbnail( get_the_ID() ) ) {
 							$image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'single-post-thumbnail' );
 							echo "<div class='etp-full-width-image-bg' style=\"background-image: url('{$image[0]}')\"></div>";
 							?>
 							<?php
+						} else {
+							?>
+							<div class="margin-bottom"></div>
+							<?php
 						}
 						?>
 						<div class="col-full">

diff --git a/style-rtl.css b/style-rtl.css
@@ -1418,10 +1418,6 @@ fieldset legend {
 	margin-left: .53em;
 }
 
-.header-toggle:before {
-	margin: 0.7em;
-}
-
 .primary-navigation {
 	display: none;
 }

diff --git a/style.css b/style.css
@@ -1081,6 +1081,7 @@ a:focus {
 	}
 
 	.content-area,
+	.margin-bottom,
 	.widget-area {
 		margin-bottom: 2.618em;
 	}
@@ -1440,6 +1441,10 @@ fieldset legend {
 .header-toggle:before {
 	display: inline;
 	vertical-align: middle;
+	margin: 0;
+}
+
+.header-toggle.has-label:before {
 	margin: 0 0.5em 0 0;
 }