From 4908a41dae31caa9ced6af14df97e6efe9e12066 Mon Sep 17 00:00:00 2001
From: James Koster <james@jameskoster.co.uk>
Date: Tue, 2 Sep 2014 20:34:07 +0100
Subject: [PATCH] control positioning

---
 inc/customizer/controls.php | 21 +++++++++++++++++----
 inc/structure/footer.php    |  6 ++++--
 sass/partials/_menu.scss    |  2 +-
 style.css                   |  2 +-
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/inc/customizer/controls.php b/inc/customizer/controls.php
index 68a6663de..1315abe19 100755
--- a/inc/customizer/controls.php
+++ b/inc/customizer/controls.php
@@ -17,7 +17,20 @@ function storefront_customize_register( $wp_customize ) {
 		$wp_customize->get_setting( 'blogdescription' )->transport  = 'postMessage';
 		$wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage';
 
-		$wp_customize->get_section( 'colors' )->description 		= __( 'Adjust the general Storefront color scheme.', 'storefront' );
+		// Move background color setting alongside background image
+		$wp_customize->get_control( 'background_color' )->section 	= 'background_image';
+
+		// Change background image section title & priority
+		$wp_customize->get_section( 'background_image' )->title 	= __( 'Background', 'storefront' );
+		$wp_customize->get_section( 'background_image' )->priority 	= 30;
+
+		/**
+	     * Add the typography section
+	     */
+	    $wp_customize->add_section( 'storefront_typography' , array(
+		    'title'      => __( 'Typography', 'storefront-designer' ),
+		    'priority'   => 45,
+		) );
 
 		/**
 		 * Accent Color
@@ -29,7 +42,7 @@ function storefront_customize_register( $wp_customize ) {
 
 	    $wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'storefront_accent_color', array(
 	        'label'	   => 'Link / accent color',
-	        'section'  => 'colors',
+	        'section'  => 'storefront_typography',
 	        'settings' => 'storefront_accent_color',
 	        'priority' => 20,
 	    ) ) );
@@ -45,7 +58,7 @@ function storefront_customize_register( $wp_customize ) {
 
 	    $wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'storefront_text_color', array(
 	        'label'	   => 'Text color',
-	        'section'  => 'colors',
+	        'section'  => 'storefront_typography',
 	        'settings' => 'storefront_text_color',
 	        'priority' => 30,
 	    ) ) );
@@ -61,7 +74,7 @@ function storefront_customize_register( $wp_customize ) {
 
 	    $wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'storefront_heading_color', array(
 	        'label'	   => 'Heading color',
-	        'section'  => 'colors',
+	        'section'  => 'storefront_typography',
 	        'settings' => 'storefront_heading_color',
 	        'priority' => 40,
 	    ) ) );
diff --git a/inc/structure/footer.php b/inc/structure/footer.php
index f5c51d7bd..627c069c1 100644
--- a/inc/structure/footer.php
+++ b/inc/structure/footer.php
@@ -55,8 +55,10 @@ function storefront_footer_widgets() {
 	function storefront_credit() {
 		?>
 		<div class="site-info">
-			&copy; <?php echo get_bloginfo( 'name' ) . ' ' . get_the_date( 'Y' ); ?><br />
-			<?php printf( __( '%1$s designed by %2$s.', 'storefront' ), 'Storefront', '<a href="http://woothemes.com" rel="designer">WooThemes</a>' ); ?>
+			&copy; <?php echo get_bloginfo( 'name' ) . ' ' . get_the_date( 'Y' ); ?>
+			<?php if ( apply_filters( 'storefront_credit_link', true ) ) { ?>
+			<br /> <?php printf( __( '%1$s designed by %2$s.', 'storefront' ), 'Storefront', '<a href="http://woothemes.com" rel="designer">WooThemes</a>' ); ?>
+			<?php } ?>
 		</div><!-- .site-info -->
 		<?php
 	}
diff --git a/sass/partials/_menu.scss b/sass/partials/_menu.scss
index 60bc2d9d3..7bba92e25 100755
--- a/sass/partials/_menu.scss
+++ b/sass/partials/_menu.scss
@@ -222,7 +222,7 @@
 	 * Secondary Navigation
 	 */
 	.secondary-navigation {
-		margin: 0;
+		margin: 0 0 1.618em;
 		width: auto;
 		clear: none;
 		line-height: 1;
diff --git a/style.css b/style.css
index e3ecbfa82..ed80dd809 100644
--- a/style.css
+++ b/style.css
@@ -1035,7 +1035,7 @@ fieldset {
    * Secondary Navigation
    */
   .secondary-navigation {
-    margin: 0;
+    margin: 0 0 1.618em;
     width: auto;
     clear: none;
     line-height: 1; }