From 09a2785fccc826a4d9028c90b492910adef66a36 Mon Sep 17 00:00:00 2001 From: Calvin Koepke Date: Fri, 9 Dec 2016 11:03:11 -0700 Subject: [PATCH 01/48] #57: Add WooCommerce Support --- CHANGELOG.md | 3 + css/genesis-sample-woocommerce.css | 542 +++++++++++++++++++++++++++++ functions.php | 20 +- lib/output.php | 50 +++ style.css | 2 +- 5 files changed, 615 insertions(+), 2 deletions(-) create mode 100644 css/genesis-sample-woocommerce.css diff --git a/CHANGELOG.md b/CHANGELOG.md index c08288bb..f79d0225 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,9 @@ _No changes._ * Set localization * Update XML file +## [2.3.3] - 2016-12-09 +* Add WooCommerce support to the theme and customizer + [unreleased]: https://github.com/copyblogger/genesis-sample/compare/2.2.4...HEAD [2.2.4]: https://github.com/copyblogger/genesis-sample/compare/2.2.3...2.2.4 [2.2.3]: https://github.com/copyblogger/genesis-sample/compare/014deb3689323b7bbd4ddbfff4f5f9279a38f741...2.2.3 diff --git a/css/genesis-sample-woocommerce.css b/css/genesis-sample-woocommerce.css new file mode 100644 index 00000000..5a998ce2 --- /dev/null +++ b/css/genesis-sample-woocommerce.css @@ -0,0 +1,542 @@ +/* Woocommerce Globals +---------------------------------------------------------------------------------------------------- */ + +.woocommerce.full-width-content .content, +.woocommerce-page.full-width-content .content { + max-width: 1280px; +} + +.woocommerce .content { + background-color: #fff; + margin-bottom: 40px; + padding: 70px 80px; +} + +.woocommerce .entry.product { + padding: 0; +} + +.woocommerce .page-title { + text-align: center; +} + +.woocommerce .page-title::after { + border-bottom: 1px solid #000; + content: ""; + display: block; + margin: 0 auto 40px; + padding-bottom: 30px; + width: 2.5%; +} + +.woocommerce ins, +.woocommerce abbr.required { + text-decoration: none; +} + +.woocommerce span.onsale { + background-color: #c3251d; + border-radius: 0; + line-height: 1.75; + min-height: auto; +} + +.woocommerce fieldset { + margin-bottom: 20px; +} + + +/* Woocommerce Shop Page +---------------------------------------------------------------------------------------------------- */ + +.woocommerce .content .entry { + border-bottom: 0; +} + +.woocommerce a.added_to_cart { + line-height: 1; +} + +.woocommerce ul.products li.product h3, +.woocommerce ul.products li.product .price .from { + color: #000; +} + +.woocommerce ul.products li.product h3:hover, +.woocommerce ul.products li.product .price { + color: #c3251d; +} + + +/* Woocommerce Product +---------------------------------------------------------------------------------------------------- */ + +.woocommerce div.product p.price, +.woocommerce div.product span.price { + color: #c3251d; +} + +.woocommerce div.product form.cart .button { + line-height: 1.5; +} + + +/* Woocommerce Product Tabs +---------------------------------------------------------------------------------------------------- */ + +.woocommerce div.product .woocommerce-tabs ul.tabs:before, +.woocommerce div.product .woocommerce-tabs ul.tabs li { + border-color: #eee; +} + +.woocommerce div.product .woocommerce-tabs ul.tabs li:after, +.woocommerce div.product .woocommerce-tabs ul.tabs li:before { + display: none; +} + +.woocommerce div.product .woocommerce-tabs ul.tabs li { + background-color: #f5f5f5; + border-radius: 0; +} + +.woocommerce div.product .woocommerce-tabs ul.tabs li a { + color: #000; +} + +.woocommerce div.product .woocommerce-tabs ul.tabs li a:hover, +.woocommerce div.product .woocommerce-tabs ul.tabs li a:focus { + color: #c3251d; +} + + +/* Woocommerce Checkout +---------------------------------------------------------------------------------------------------- */ + +#add_payment_method #payment ul.payment_methods li, +.woocommerce-cart #payment ul.payment_methods li, +.woocommerce-checkout #payment ul.payment_methods li { + list-style-type: none; +} + + +/* Woocommerce Cart Page +---------------------------------------------------------------------------------------------------- */ + +.woocommerce table.shop_table, +.woocommerce table.shop_table td { + border-color: #eee; + border-radius: 0; +} + +.woocommerce-cart table.cart { + line-height: 1.75; +} + +.woocommerce-cart table.cart td { + font-size: 18px; + font-size: 1.8rem; + padding: 10px 12px; +} + +.woocommerce-cart table.cart .product-thumbnail { + min-width: 56px; +} + +.woocommerce-cart table.cart th.product-quantity { + min-width: 110px; +} + +.woocommerce-cart table.cart th.product-name { + min-width: 140px; +} + +.woocommerce-cart table.cart th.product-price, +.woocommerce-cart table.cart th.product-subtotal { + min-width: 70px; +} + +.woocommerce table.shop_table td.actions { + padding-top: 15px; +} + +.woocommerce-cart table.cart td.actions .coupon .input-text { + font-size: 18px; + font-size: 1.8rem; +} + +.woocommerce-cart td.product-name dl.variation dd { + margin-left: 20px; +} + +#add_payment_method table.cart img, +.woocommerce-cart table.cart img, +.woocommerce-checkout table.cart img { + vertical-align: middle; +} + +/* Woocommerce Payment +---------------------------------------------------------------------------------------------------- */ + +#add_payment_method #payment, +.woocommerce-cart #payment, +.woocommerce-checkout #payment { + background-color: #f5f5f5; + border-radius: 0; + padding: 30px; +} + +#add_payment_method #payment div.payment_box, +.woocommerce-cart #payment div.payment_box, +.woocommerce-checkout #payment div.payment_box { + background-color: #eee; +} + +#add_payment_method #payment div.payment_box:before, +.woocommerce-cart #payment div.payment_box:before, +.woocommerce-checkout #payment div.payment_box:before { + display: none; +} + +#add_payment_method #payment ul.payment_methods, +.woocommerce-cart #payment ul.payment_methods, +.woocommerce-checkout #payment ul.payment_methods { + border-color: #eee; +} + + +/* Woocommerce Forms +---------------------------------------------------------------------------------------------------- */ + +.woocommerce a.button, +.woocommerce a.button.alt, +.woocommerce button.button, +.woocommerce button.button.alt, +.woocommerce input.button, +.woocommerce input.button.alt, +.woocommerce input.button[type="submit"], +.woocommerce #respond input#submit, +.woocommerce #respond input#submit.alt { + background-color: #333; + border: 0; + border-radius: 0; + color: #fff; + cursor: pointer; + font-size: 16px; + font-size: 1.6rem; + font-weight: 700; + padding: 16px 24px; + text-decoration: none; + white-space: normal; + width: auto; +} + +.woocommerce a.button:hover, +.woocommerce a.button.alt:hover, +.woocommerce button.button:hover, +.woocommerce button.button.alt:hover, +.woocommerce input.button:hover, +.woocommerce input.button.alt:hover, +.woocommerce input:hover[type="submit"], +.woocommerce #respond input#submit:hover, +.woocommerce #respond input#submit.alt:hover { + background-color: #c3251d; + color: #fff; +} + +.woocommerce #reviews #comment { + height: 150px; +} + +.woocommerce .quantity .qty { + font-size: 20px; + font-size: 2rem; + line-height: 1.5; + margin-right: 5px; + padding: 3px 5px 4px; + width: 70px; +} + +.woocommerce form .form-row input.input-text, +.woocommerce form .form-row textarea { + line-height: 1.5; + padding: 8px 20px; +} + +#add_payment_method table.cart td.actions .coupon .input-text, +.woocommerce-cart table.cart td.actions .coupon .input-text, +.woocommerce-checkout table.cart td.actions .coupon .input-text { + border-color: #eee; + padding: 5px 20px; + width: 150px; +} + +.woocommerce form.checkout_coupon, +.woocommerce form.login, +.woocommerce form.register, +.woocommerce form .form-row .select2-container, +.woocommerce form .form-row.woocommerce-validated .select2-container, +.woocommerce form .form-row.woocommerce-validated input.input-text, +.woocommerce form .form-row.woocommerce-validated select { + border-color: #eee; + border-radius: 0; +} + +#add_payment_method table.cart input, +.woocommerce-cart table.cart input, +.woocommerce-checkout table.cart input { + vertical-align: top; +} + +.woocommerce .coupon { + line-height: 1; +} + +.woocommerce .coupon .input-text { + height: 48px; +} + + +/* Woocommerce Disabled Buttons +---------------------------------------------------------------------------------------------------- */ + +.woocommerce a.button.disabled, +.woocommerce a.button:disabled, +.woocommerce a.button:disabled[disabled], +.woocommerce button.button.disabled, +.woocommerce button.button:disabled, +.woocommerce button.button:disabled[disabled], +.woocommerce input.button.disabled, +.woocommerce input.button:disabled, +.woocommerce input.button:disabled[disabled], +.woocommerce #respond input#submit.disabled, +.woocommerce #respond input#submit:disabled, +.woocommerce #respond input#submit:disabled[disabled] { + background-color: #000; + color: #fff; + padding: 16px 24px; +} + +.woocommerce a.button.alt.disabled, +.woocommerce a.button.alt.disabled:hover, +.woocommerce a.button.alt:disabled, +.woocommerce a.button.alt:disabled:hover, +.woocommerce a.button.alt[disabled]:disabled, +.woocommerce a.button.alt[disabled]:disabled:hover, +.woocommerce button.button.alt.disabled, +.woocommerce button.button.alt.disabled:hover, +.woocommerce button.button.alt:disabled, +.woocommerce button.button.alt:disabled:hover, +.woocommerce button.button.alt[disabled]:disabled, +.woocommerce button.button.alt[disabled]:disabled:hover, +.woocommerce input.button.alt.disabled, +.woocommerce input.button.alt.disabled:hover, +.woocommerce input.button.alt:disabled, +.woocommerce input.button.alt:disabled:hover, +.woocommerce input.button.alt[disabled]:disabled, +.woocommerce input.button.alt[disabled]:disabled:hover, +.woocommerce #respond input#submit.alt.disabled, +.woocommerce #respond input#submit.alt.disabled:hover, +.woocommerce #respond input#submit.alt:disabled, +.woocommerce #respond input#submit.alt:disabled:hover, +.woocommerce #respond input#submit.alt[disabled]:disabled, +.woocommerce #respond input#submit.alt[disabled]:disabled:hover { + background-color: #eee; + color: #000 +} + + +/* Woocommerce Account Page +---------------------------------------------------------------------------------------------------- */ + +.woocommerce-MyAccount-navigation ul { + margin-left: 0; +} + +.woocommerce-MyAccount-navigation ul li { + list-style-type: none; +} + +.woocommerce-account .woocommerce-MyAccount-navigation { + width: 20%; +} + +.woocommerce-account .woocommerce-MyAccount-content { + width: 80%; +} + + +/* Woocommerce Breadcrumb +---------------------------------------------------------------------------------------------------- */ + +.woocommerce .woocommerce-breadcrumb { + font-size: 18px; + font-size: 1.8rem; + margin-bottom: 40px; +} + +.woocommerce .woocommerce-breadcrumb, +.woocommerce .woocommerce-breadcrumb a { + color: #000; +} + +.woocommerce .woocommerce-breadcrumb a { + text-decoration: none; +} + +.woocommerce .woocommerce-breadcrumb a:hover, +.woocommerce .woocommerce-breadcrumb a:focus { + color: #c3251d; +} + +/* Woocommerce Reviews +---------------------------------------------------------------------------------------------------- */ + +.woocommerce #reviews #comments ol.commentlist li img.avatar { + background: transparent; + border: 0; + margin: 0 16px 24px 0; + padding: 0; + position: relative; + width: 60px; +} + +.woocommerce #reviews #comments ol.commentlist li .comment-text { + border-color: #eee; + border-radius: 0; + margin-left: 80px; +} + +.woocommerce .entry-content #reviews ol > li { + list-style-type: none; +} + +/* Woocommerce Misc +---------------------------------------------------------------------------------------------------- */ + +.woocommerce-error, +.woocommerce-info, +.woocommerce-message { + background-color: #f5f5f5; + border-top-color: #c3251d; +} + +.woocommerce-error:before, +.woocommerce-info:before, +.woocommerce-message:before { + color: #c3251d; +} + +div.woocommerce-info.wc-memberships-restriction-message.wc-memberships-restricted-content-message { + width: 48%; +} + +/* Woocommerce Widgets +---------------------------------------------------------------------------------------------------- */ + +/* Woo Search +-------------------------------------------------- */ + +.woocommerce-product-search { + overflow: hidden; + width: 100%; +} + +.woocommerce-product-search input[type="submit"] { + border: 0; + clip: rect(0, 0, 0, 0); + height: 1px; + margin: -1px; + padding: 0; + position: absolute; + width: 1px; +} + +/* Woo Shopping Cart +-------------------------------------------------- */ + +.woocommerce .widget_shopping_cart ul.cart_list li, +.woocommerce.widget_shopping_cart ul.cart_list li { + padding-top: 15px; +} + +.woocommerce .widget_shopping_cart .cart_list li a.remove, +.woocommerce.widget_shopping_cart .cart_list li a.remove { + top: 15px; +} + +.woocommerce.widget_shopping_cart .total { + border-top: 1px solid #eee; +} + +/* Woo Product Lists +-------------------------------------------------- */ + +.woocommerce ul.cart_list li img, +.woocommerce ul.product_list_widget li img { + width: 60px; +} + +.sidebar ul.product_list_widget li { + /*border-top: 1px solid #eee;*/ + line-height: 1.4; + margin-bottom: 15px; + padding: 15px 0 0; +} + +.sidebar ul.product_list_widget li:last-child { + /*border-bottom: 1px solid #eee;*/ + margin-bottom: 0; + padding-bottom: 15px; +} + +/* Woo Filter +-------------------------------------------------- */ + +.woocommerce.widget_price_filter .price_slider_wrapper .ui-widget-content { + background-color: #eee; +} + +.woocommerce.widget_price_filter .ui-slider .ui-slider-handle, +.woocommerce.widget_price_filter .ui-slider .ui-slider-range { + background-color: #c3251d; +} + +.woocommerce .widget_layered_nav ul li.chosen a:before, +.woocommerce .widget_layered_nav_filters ul li a:before { + color: #c3251d; +} + +/* Woo Active Filters +-------------------------------------------------- */ + +.woocommerce.widget_layered_nav_filters ul li { + margin: 0 20px 20px 0; +} + +/* Woo Recent Reviews +-------------------------------------------------- */ + +.woocommerce.widget_recent_reviews .reviewer { + font-size: 12px; + font-size: 1.2rem; + letter-spacing: 1px; + text-transform: uppercase; +} + +/* Media Queries +---------------------------------------------------------------------------------------------------- */ + +@media only screen and (max-width: 600px) { + + .woocommerce input.button, + .woocommerce input.button[type="submit"], + .woocommerce-cart table.cart td.actions .coupon .input-text { + width: 100% !important; + } + + .woocommerce-cart table.cart td.actions .coupon .input-text { + background-color: #fff; + margin-bottom: 10px; + } + +} \ No newline at end of file diff --git a/functions.php b/functions.php index 38400f4b..30748757 100755 --- a/functions.php +++ b/functions.php @@ -28,7 +28,7 @@ //* Child theme (do not remove) define( 'CHILD_THEME_NAME', 'Genesis Sample' ); define( 'CHILD_THEME_URL', 'http://www.studiopress.com/' ); -define( 'CHILD_THEME_VERSION', '2.2.4' ); +define( 'CHILD_THEME_VERSION', '2.3.4' ); //* Enqueue Scripts and Styles add_action( 'wp_enqueue_scripts', 'genesis_sample_enqueue_scripts_styles' ); @@ -46,6 +46,24 @@ function genesis_sample_enqueue_scripts_styles() { } +//* Enqueue custom WooCommerce styles when WooCommerce active +add_filter( 'woocommerce_enqueue_styles', 'genesis_sample_woocommerce_styles' ); +function genesis_sample_woocommerce_styles( $enqueue_styles ) { + + $enqueue_styles['genesis-sample-woocommerce-styles'] = array( + 'src' => get_stylesheet_directory_uri() . '/css/genesis-sample-woocommerce.css', + 'deps' => '', + 'version' => CHILD_THEME_VERSION, + 'media' => 'screen' + ); + + return $enqueue_styles; + +} + +//* Add WooCommerce Support +add_theme_support( 'genesis-connect-woocommerce' ); + //* Add HTML5 markup structure add_theme_support( 'html5', array( 'caption', 'comment-form', 'comment-list', 'gallery', 'search-form' ) ); diff --git a/lib/output.php b/lib/output.php index 4b695fe2..811b56d8 100644 --- a/lib/output.php +++ b/lib/output.php @@ -25,6 +25,7 @@ function genesis_sample_css() { $color_accent = get_theme_mod( 'genesis_sample_accent_color', genesis_sample_customizer_get_default_accent_color() ); $css = ''; + $woo_css = ''; //* Calculate Color Contrast function genesis_sample_color_contrast( $color ) { @@ -74,6 +75,23 @@ function genesis_sample_color_brightness( $color, $change ) { } ', $color_link ) : ''; + $woo_css .= $css .= ( genesis_sample_customizer_get_default_link_color() !== $color_link ) ? sprintf( ' + + .woocommerce div.product p.price, + .woocommerce div.product span.price, + .woocommerce div.product .woocommerce-tabs ul.tabs li a:hover, + .woocommerce div.product .woocommerce-tabs ul.tabs li a:focus, + .woocommerce ul.products li.product h3:hover, + .woocommerce ul.products li.product .price, + .woocommerce .woocommerce-breadcrumb a:hover, + .woocommerce .woocommerce-breadcrumb a:focus, + .woocommerce .widget_layered_nav ul li.chosen a:before, + .woocommerce .widget_layered_nav_filters ul li a:before { + color: %s; + } + + ', $color_link ) : ''; + $css .= ( genesis_sample_customizer_get_default_accent_color() !== $color_accent ) ? sprintf( ' button:focus, @@ -95,8 +113,40 @@ function genesis_sample_color_brightness( $color, $change ) { } ', $color_accent, genesis_sample_color_contrast( $color_accent ) ) : ''; + $woo_css .= ( genesis_sample_customizer_get_default_accent_color() !== $color_accent ) ? sprintf( ' + .woocommerce a.button:hover, + .woocommerce a.button.alt:hover, + .woocommerce button.button:hover, + .woocommerce button.button.alt:hover, + .woocommerce input.button:hover, + .woocommerce input.button.alt:hover, + .woocommerce input:hover[type="submit"], + .woocommerce span.onsale, + .woocommerce #respond input#submit:hover, + .woocommerce #respond input#submit.alt:hover, + .woocommerce-error:before, + .woocommerce-info:before, + .woocommerce-message:before, + .woocommerce.widget_price_filter .ui-slider .ui-slider-handle, + .woocommerce.widget_price_filter .ui-slider .ui-slider-range { + background-color: %1$s; + color: %2$s; + } + + .woocommerce-error, + .woocommerce-info, + .woocommerce-message { + border-top-color: %1$s; + } + + ', $color_accent, genesis_sample_color_contrast( $color_accent ) ) : ''; + if ( $css ) { wp_add_inline_style( $handle, $css ); } + if ( $woo_css ) { + wp_add_inline_style( 'genesis-sample-woocommerce-styles', $woo_css ); + } + } \ No newline at end of file diff --git a/style.css b/style.css index 3d267d0d..71889788 100755 --- a/style.css +++ b/style.css @@ -10,7 +10,7 @@ Tags: black, red, white, one-column, two-columns, three-columns, left-sidebar, right-sidebar, responsive-layout, accessibility-ready, custom-background, custom-colors, custom-header, custom-menu, featured-images, full-width-template, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready Template: genesis - Template Version: 2.2.3 + Template Version: 2.3.3 License: GPL-2.0+ License URI: http://www.gnu.org/licenses/gpl-2.0.html From b41302a21a37afdd88258d5387b0955d05efe17f Mon Sep 17 00:00:00 2001 From: Calvin Koepke Date: Fri, 9 Dec 2016 13:26:32 -0700 Subject: [PATCH 02/48] #1234: Remove bottom padding on checkout payments --- css/genesis-sample-woocommerce.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/css/genesis-sample-woocommerce.css b/css/genesis-sample-woocommerce.css index 5a998ce2..7343b07c 100644 --- a/css/genesis-sample-woocommerce.css +++ b/css/genesis-sample-woocommerce.css @@ -118,6 +118,12 @@ list-style-type: none; } +#add_payment_method #payment div.form-row, +.woocommerce-cart #payment div.form-row, +.woocommerce-checkout #payment div.form-row { + padding-bottom: 0; +} + /* Woocommerce Cart Page ---------------------------------------------------------------------------------------------------- */ From 0147901dfe741c0f52fbd2f8145b16fea4688ac8 Mon Sep 17 00:00:00 2001 From: Calvin Koepke Date: Fri, 9 Dec 2016 13:31:18 -0700 Subject: [PATCH 03/48] #1233: Adjust variations table layout --- css/genesis-sample-woocommerce.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/css/genesis-sample-woocommerce.css b/css/genesis-sample-woocommerce.css index 7343b07c..6d1c8b87 100644 --- a/css/genesis-sample-woocommerce.css +++ b/css/genesis-sample-woocommerce.css @@ -80,6 +80,9 @@ line-height: 1.5; } +.woocommerce div.product form.cart .variations { + table-layout: fixed; +} /* Woocommerce Product Tabs ---------------------------------------------------------------------------------------------------- */ From 7acddfc4e1a5dcebf56486616af72c3d3b6988be Mon Sep 17 00:00:00 2001 From: Calvin Koepke Date: Tue, 13 Dec 2016 10:23:38 -0700 Subject: [PATCH 04/48] #57: Update WooCommerce Compatability --- CHANGELOG.md | 6 +- css/genesis-sample-woocommerce.css | 116 +++++++++++++++-------------- functions.php | 2 +- lib/output.php | 76 ++++++++++--------- style.css | 2 +- 5 files changed, 107 insertions(+), 95 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f79d0225..ee6e3128 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,7 @@ # Genesis Sample Theme Changelog ## [Unreleased][unreleased] - -_No changes._ +* Add WooCommerce support to the theme and customizer ## [2.2.4] - 2016-06-08 * Reorder font size on breadcrumbs @@ -24,9 +23,6 @@ _No changes._ * Set localization * Update XML file -## [2.3.3] - 2016-12-09 -* Add WooCommerce support to the theme and customizer - [unreleased]: https://github.com/copyblogger/genesis-sample/compare/2.2.4...HEAD [2.2.4]: https://github.com/copyblogger/genesis-sample/compare/2.2.3...2.2.4 [2.2.3]: https://github.com/copyblogger/genesis-sample/compare/014deb3689323b7bbd4ddbfff4f5f9279a38f741...2.2.3 diff --git a/css/genesis-sample-woocommerce.css b/css/genesis-sample-woocommerce.css index 6d1c8b87..c93fa377 100644 --- a/css/genesis-sample-woocommerce.css +++ b/css/genesis-sample-woocommerce.css @@ -20,7 +20,7 @@ text-align: center; } -.woocommerce .page-title::after { +.woocommerce .page-title:::after { border-bottom: 1px solid #000; content: ""; display: block; @@ -62,7 +62,7 @@ color: #000; } -.woocommerce ul.products li.product h3:hover, +.woocommerce ul.products li.product h3::hover, .woocommerce ul.products li.product .price { color: #c3251d; } @@ -87,13 +87,13 @@ /* Woocommerce Product Tabs ---------------------------------------------------------------------------------------------------- */ -.woocommerce div.product .woocommerce-tabs ul.tabs:before, +.woocommerce div.product .woocommerce-tabs ul.tabs::before, .woocommerce div.product .woocommerce-tabs ul.tabs li { border-color: #eee; } -.woocommerce div.product .woocommerce-tabs ul.tabs li:after, -.woocommerce div.product .woocommerce-tabs ul.tabs li:before { +.woocommerce div.product .woocommerce-tabs ul.tabs li::after, +.woocommerce div.product .woocommerce-tabs ul.tabs li::before { display: none; } @@ -106,8 +106,8 @@ color: #000; } -.woocommerce div.product .woocommerce-tabs ul.tabs li a:hover, -.woocommerce div.product .woocommerce-tabs ul.tabs li a:focus { +.woocommerce div.product .woocommerce-tabs ul.tabs li a::hover, +.woocommerce div.product .woocommerce-tabs ul.tabs li a::focus { color: #c3251d; } @@ -200,9 +200,9 @@ background-color: #eee; } -#add_payment_method #payment div.payment_box:before, -.woocommerce-cart #payment div.payment_box:before, -.woocommerce-checkout #payment div.payment_box:before { +#add_payment_method #payment div.payment_box::before, +.woocommerce-cart #payment div.payment_box::before, +.woocommerce-checkout #payment div.payment_box::before { display: none; } @@ -239,15 +239,23 @@ width: auto; } -.woocommerce a.button:hover, -.woocommerce a.button.alt:hover, -.woocommerce button.button:hover, -.woocommerce button.button.alt:hover, -.woocommerce input.button:hover, -.woocommerce input.button.alt:hover, -.woocommerce input:hover[type="submit"], -.woocommerce #respond input#submit:hover, -.woocommerce #respond input#submit.alt:hover { +.woocommerce a.button::hover, +.woocommerce a.button::focus, +.woocommerce a.button.alt::hover, +.woocommerce a.button.alt::focus, +.woocommerce button.button::hover, +.woocommerce button.button::focus, +.woocommerce button.button.alt::hover, +.woocommerce button.button.alt::focus, +.woocommerce input.button::hover, +.woocommerce input.button::focus, +.woocommerce input.button.alt::hover, +.woocommerce input.button.alt::focus, +.woocommerce input::hover[type="submit"], +.woocommerce #respond input#submit::hover, +.woocommerce #respond input#submit::focus, +.woocommerce #respond input#submit.alt::hover, +.woocommerce #respond input#submit.alt::focus { background-color: #c3251d; color: #fff; } @@ -309,46 +317,46 @@ ---------------------------------------------------------------------------------------------------- */ .woocommerce a.button.disabled, -.woocommerce a.button:disabled, -.woocommerce a.button:disabled[disabled], +.woocommerce a.button::disabled, +.woocommerce a.button::disabled[disabled], .woocommerce button.button.disabled, -.woocommerce button.button:disabled, -.woocommerce button.button:disabled[disabled], +.woocommerce button.button::disabled, +.woocommerce button.button::disabled[disabled], .woocommerce input.button.disabled, -.woocommerce input.button:disabled, -.woocommerce input.button:disabled[disabled], +.woocommerce input.button::disabled, +.woocommerce input.button::disabled[disabled], .woocommerce #respond input#submit.disabled, -.woocommerce #respond input#submit:disabled, -.woocommerce #respond input#submit:disabled[disabled] { +.woocommerce #respond input#submit::disabled, +.woocommerce #respond input#submit::disabled[disabled] { background-color: #000; color: #fff; padding: 16px 24px; } .woocommerce a.button.alt.disabled, -.woocommerce a.button.alt.disabled:hover, -.woocommerce a.button.alt:disabled, -.woocommerce a.button.alt:disabled:hover, -.woocommerce a.button.alt[disabled]:disabled, -.woocommerce a.button.alt[disabled]:disabled:hover, +.woocommerce a.button.alt.disabled::hover, +.woocommerce a.button.alt::disabled, +.woocommerce a.button.alt::disabled::hover, +.woocommerce a.button.alt[disabled]::disabled, +.woocommerce a.button.alt[disabled]::disabled::hover, .woocommerce button.button.alt.disabled, -.woocommerce button.button.alt.disabled:hover, -.woocommerce button.button.alt:disabled, -.woocommerce button.button.alt:disabled:hover, -.woocommerce button.button.alt[disabled]:disabled, -.woocommerce button.button.alt[disabled]:disabled:hover, +.woocommerce button.button.alt.disabled::hover, +.woocommerce button.button.alt::disabled, +.woocommerce button.button.alt::disabled::hover, +.woocommerce button.button.alt[disabled]::disabled, +.woocommerce button.button.alt[disabled]::disabled::hover, .woocommerce input.button.alt.disabled, -.woocommerce input.button.alt.disabled:hover, -.woocommerce input.button.alt:disabled, -.woocommerce input.button.alt:disabled:hover, -.woocommerce input.button.alt[disabled]:disabled, -.woocommerce input.button.alt[disabled]:disabled:hover, +.woocommerce input.button.alt.disabled::hover, +.woocommerce input.button.alt::disabled, +.woocommerce input.button.alt::disabled::hover, +.woocommerce input.button.alt[disabled]::disabled, +.woocommerce input.button.alt[disabled]::disabled::hover, .woocommerce #respond input#submit.alt.disabled, -.woocommerce #respond input#submit.alt.disabled:hover, -.woocommerce #respond input#submit.alt:disabled, -.woocommerce #respond input#submit.alt:disabled:hover, -.woocommerce #respond input#submit.alt[disabled]:disabled, -.woocommerce #respond input#submit.alt[disabled]:disabled:hover { +.woocommerce #respond input#submit.alt.disabled::hover, +.woocommerce #respond input#submit.alt::disabled, +.woocommerce #respond input#submit.alt::disabled::hover, +.woocommerce #respond input#submit.alt[disabled]::disabled, +.woocommerce #respond input#submit.alt[disabled]::disabled::hover { background-color: #eee; color: #000 } @@ -392,8 +400,8 @@ text-decoration: none; } -.woocommerce .woocommerce-breadcrumb a:hover, -.woocommerce .woocommerce-breadcrumb a:focus { +.woocommerce .woocommerce-breadcrumb a::hover, +.woocommerce .woocommerce-breadcrumb a::focus { color: #c3251d; } @@ -429,9 +437,9 @@ border-top-color: #c3251d; } -.woocommerce-error:before, -.woocommerce-info:before, -.woocommerce-message:before { +.woocommerce-error::before, +.woocommerce-info::before, +.woocommerce-message::before { color: #c3251d; } @@ -510,8 +518,8 @@ div.woocommerce-info.wc-memberships-restriction-message.wc-memberships-restricte background-color: #c3251d; } -.woocommerce .widget_layered_nav ul li.chosen a:before, -.woocommerce .widget_layered_nav_filters ul li a:before { +.woocommerce .widget_layered_nav ul li.chosen a::before, +.woocommerce .widget_layered_nav_filters ul li a::before { color: #c3251d; } diff --git a/functions.php b/functions.php index 30748757..06be6c14 100755 --- a/functions.php +++ b/functions.php @@ -28,7 +28,7 @@ //* Child theme (do not remove) define( 'CHILD_THEME_NAME', 'Genesis Sample' ); define( 'CHILD_THEME_URL', 'http://www.studiopress.com/' ); -define( 'CHILD_THEME_VERSION', '2.3.4' ); +define( 'CHILD_THEME_VERSION', '2.3.0' ); //* Enqueue Scripts and Styles add_action( 'wp_enqueue_scripts', 'genesis_sample_enqueue_scripts_styles' ); diff --git a/lib/output.php b/lib/output.php index 811b56d8..f9ef1aba 100644 --- a/lib/output.php +++ b/lib/output.php @@ -62,31 +62,31 @@ function genesis_sample_color_brightness( $color, $change ) { $css .= ( genesis_sample_customizer_get_default_link_color() !== $color_link ) ? sprintf( ' a, - .entry-title a:focus, - .entry-title a:hover, - .genesis-nav-menu a:focus, - .genesis-nav-menu a:hover, + .entry-title a::focus, + .entry-title a::hover, + .genesis-nav-menu a::focus, + .genesis-nav-menu a::hover, .genesis-nav-menu .current-menu-item > a, - .genesis-nav-menu .sub-menu .current-menu-item > a:focus, - .genesis-nav-menu .sub-menu .current-menu-item > a:hover, - .js nav button:focus, - .js .menu-toggle:focus { + .genesis-nav-menu .sub-menu .current-menu-item > a::focus, + .genesis-nav-menu .sub-menu .current-menu-item > a::hover, + .js nav button::focus, + .js .menu-toggle::focus { color: %s; } ', $color_link ) : ''; - $woo_css .= $css .= ( genesis_sample_customizer_get_default_link_color() !== $color_link ) ? sprintf( ' + $woo_css .= ( genesis_sample_customizer_get_default_link_color() !== $color_link ) ? sprintf( ' .woocommerce div.product p.price, .woocommerce div.product span.price, - .woocommerce div.product .woocommerce-tabs ul.tabs li a:hover, - .woocommerce div.product .woocommerce-tabs ul.tabs li a:focus, - .woocommerce ul.products li.product h3:hover, + .woocommerce div.product .woocommerce-tabs ul.tabs li a::hover, + .woocommerce div.product .woocommerce-tabs ul.tabs li a::focus, + .woocommerce ul.products li.product h3::hover, .woocommerce ul.products li.product .price, - .woocommerce .woocommerce-breadcrumb a:hover, - .woocommerce .woocommerce-breadcrumb a:focus, - .woocommerce .widget_layered_nav ul li.chosen a:before, - .woocommerce .widget_layered_nav_filters ul li a:before { + .woocommerce .woocommerce-breadcrumb a::hover, + .woocommerce .woocommerce-breadcrumb a::focus, + .woocommerce .widget_layered_nav ul li.chosen a::before, + .woocommerce .widget_layered_nav_filters ul li a::before { color: %s; } @@ -94,19 +94,19 @@ function genesis_sample_color_brightness( $color, $change ) { $css .= ( genesis_sample_customizer_get_default_accent_color() !== $color_accent ) ? sprintf( ' - button:focus, - button:hover, + button::focus, + button::hover, input:focus[type="button"], input:focus[type="reset"], input:focus[type="submit"], input:hover[type="button"], input:hover[type="reset"], input:hover[type="submit"], - .archive-pagination li a:focus, - .archive-pagination li a:hover, + .archive-pagination li a::focus, + .archive-pagination li a::hover, .archive-pagination .active a, - .button:focus, - .button:hover, + .button::focus, + .button::hover, .sidebar .enews-widget input[type="submit"] { background-color: %s; color: %s; @@ -114,19 +114,27 @@ function genesis_sample_color_brightness( $color, $change ) { ', $color_accent, genesis_sample_color_contrast( $color_accent ) ) : ''; $woo_css .= ( genesis_sample_customizer_get_default_accent_color() !== $color_accent ) ? sprintf( ' - .woocommerce a.button:hover, - .woocommerce a.button.alt:hover, - .woocommerce button.button:hover, - .woocommerce button.button.alt:hover, - .woocommerce input.button:hover, - .woocommerce input.button.alt:hover, + .woocommerce a.button::hover, + .woocommerce a.button::focus, + .woocommerce a.button.alt::hover, + .woocommerce a.button.alt::focus, + .woocommerce button.button::hover, + .woocommerce button.button::focus, + .woocommerce button.button.alt::hover, + .woocommerce button.button.alt::focus, + .woocommerce input.button::hover, + .woocommerce input.button::focus, + .woocommerce input.button.alt::hover, + .woocommerce input.button.alt::focus, .woocommerce input:hover[type="submit"], .woocommerce span.onsale, - .woocommerce #respond input#submit:hover, - .woocommerce #respond input#submit.alt:hover, - .woocommerce-error:before, - .woocommerce-info:before, - .woocommerce-message:before, + .woocommerce #respond input#submit::hover, + .woocommerce #respond input#submit::focus, + .woocommerce #respond input#submit.alt::hover, + .woocommerce #respond input#submit.alt::focus, + .woocommerce-error::before, + .woocommerce-info::before, + .woocommerce-message::before, .woocommerce.widget_price_filter .ui-slider .ui-slider-handle, .woocommerce.widget_price_filter .ui-slider .ui-slider-range { background-color: %1$s; @@ -149,4 +157,4 @@ function genesis_sample_color_brightness( $color, $change ) { wp_add_inline_style( 'genesis-sample-woocommerce-styles', $woo_css ); } -} \ No newline at end of file +} diff --git a/style.css b/style.css index 71889788..e5a94206 100755 --- a/style.css +++ b/style.css @@ -10,7 +10,7 @@ Tags: black, red, white, one-column, two-columns, three-columns, left-sidebar, right-sidebar, responsive-layout, accessibility-ready, custom-background, custom-colors, custom-header, custom-menu, featured-images, full-width-template, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready Template: genesis - Template Version: 2.3.3 + Template Version: 2.3.0 License: GPL-2.0+ License URI: http://www.gnu.org/licenses/gpl-2.0.html From e49d66d1f1c24240a7ea500c2a712833f488958f Mon Sep 17 00:00:00 2001 From: Calvin Koepke Date: Tue, 13 Dec 2016 10:25:45 -0700 Subject: [PATCH 05/48] Fix typo --- css/genesis-sample-woocommerce.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/genesis-sample-woocommerce.css b/css/genesis-sample-woocommerce.css index c93fa377..4c134f20 100644 --- a/css/genesis-sample-woocommerce.css +++ b/css/genesis-sample-woocommerce.css @@ -20,7 +20,7 @@ text-align: center; } -.woocommerce .page-title:::after { +.woocommerce .page-title::after { border-bottom: 1px solid #000; content: ""; display: block; From cfc176af8fa7d978aa32f0cb9947313e782be441 Mon Sep 17 00:00:00 2001 From: Lauren Mancke Date: Tue, 13 Dec 2016 13:22:13 -0500 Subject: [PATCH 06/48] Update Documentation #58 --- CHANGELOG.md | 1 + README.md | 2 +- css/genesis-sample-woocommerce.css | 34 +++++++++++++---------- functions.php | 44 +++++++++++++++--------------- js/responsive-menu.js | 36 +++++++++++++----------- lib/customize.php | 12 ++++---- lib/output.php | 6 ++-- lib/theme-defaults.php | 8 +++--- page_landing.php | 24 ++++++++-------- 9 files changed, 89 insertions(+), 78 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee6e3128..7f174879 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## [Unreleased][unreleased] * Add WooCommerce support to the theme and customizer +* Update Documentation ## [2.2.4] - 2016-06-08 * Reorder font size on breadcrumbs diff --git a/README.md b/README.md index ec4e4215..e825f104 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Genesis Sample Theme -Github project link: https://github.com/copyblogger/genesis-sample +Github project link: https://github.com/copyblogger/genesis-sample/ ## Installation Instructions diff --git a/css/genesis-sample-woocommerce.css b/css/genesis-sample-woocommerce.css index 4c134f20..8745541c 100644 --- a/css/genesis-sample-woocommerce.css +++ b/css/genesis-sample-woocommerce.css @@ -1,4 +1,7 @@ -/* Woocommerce Globals +/* Genesis Sample WooCommerce +Loaded on WooCommerce pages */ + +/* WooCommerce Globals ---------------------------------------------------------------------------------------------------- */ .woocommerce.full-width-content .content, @@ -46,7 +49,7 @@ } -/* Woocommerce Shop Page +/* WooCommerce Shop Page ---------------------------------------------------------------------------------------------------- */ .woocommerce .content .entry { @@ -68,7 +71,7 @@ } -/* Woocommerce Product +/* WooCommerce Product ---------------------------------------------------------------------------------------------------- */ .woocommerce div.product p.price, @@ -84,7 +87,8 @@ table-layout: fixed; } -/* Woocommerce Product Tabs + +/* WooCommerce Product Tabs ---------------------------------------------------------------------------------------------------- */ .woocommerce div.product .woocommerce-tabs ul.tabs::before, @@ -112,7 +116,7 @@ } -/* Woocommerce Checkout +/* WooCommerce Checkout ---------------------------------------------------------------------------------------------------- */ #add_payment_method #payment ul.payment_methods li, @@ -128,7 +132,7 @@ } -/* Woocommerce Cart Page +/* WooCommerce Cart Page ---------------------------------------------------------------------------------------------------- */ .woocommerce table.shop_table, @@ -183,7 +187,8 @@ vertical-align: middle; } -/* Woocommerce Payment + +/* WooCommerce Payment ---------------------------------------------------------------------------------------------------- */ #add_payment_method #payment, @@ -213,7 +218,7 @@ } -/* Woocommerce Forms +/* WooCommerce Forms ---------------------------------------------------------------------------------------------------- */ .woocommerce a.button, @@ -313,7 +318,7 @@ } -/* Woocommerce Disabled Buttons +/* WooCommerce Disabled Buttons ---------------------------------------------------------------------------------------------------- */ .woocommerce a.button.disabled, @@ -362,7 +367,7 @@ } -/* Woocommerce Account Page +/* WooCommerce Account Page ---------------------------------------------------------------------------------------------------- */ .woocommerce-MyAccount-navigation ul { @@ -382,7 +387,7 @@ } -/* Woocommerce Breadcrumb +/* WooCommerce Breadcrumb ---------------------------------------------------------------------------------------------------- */ .woocommerce .woocommerce-breadcrumb { @@ -405,7 +410,7 @@ color: #c3251d; } -/* Woocommerce Reviews +/* WooCommerce Reviews ---------------------------------------------------------------------------------------------------- */ .woocommerce #reviews #comments ol.commentlist li img.avatar { @@ -427,7 +432,7 @@ list-style-type: none; } -/* Woocommerce Misc +/* WooCommerce Misc ---------------------------------------------------------------------------------------------------- */ .woocommerce-error, @@ -447,7 +452,8 @@ div.woocommerce-info.wc-memberships-restriction-message.wc-memberships-restricte width: 48%; } -/* Woocommerce Widgets + +/* WooCommerce Widgets ---------------------------------------------------------------------------------------------------- */ /* Woo Search diff --git a/functions.php b/functions.php index 06be6c14..d134faeb 100755 --- a/functions.php +++ b/functions.php @@ -10,27 +10,27 @@ * @link http://www.studiopress.com/ */ -//* Start the engine +// Start the engine. include_once( get_template_directory() . '/lib/init.php' ); -//* Setup Theme +// Setup Theme. include_once( get_stylesheet_directory() . '/lib/theme-defaults.php' ); -//* Set Localization (do not remove) +// Set Localization (do not remove). load_child_theme_textdomain( 'genesis-sample', apply_filters( 'child_theme_textdomain', get_stylesheet_directory() . '/languages', 'genesis-sample' ) ); -//* Add Image upload and Color select to WordPress Theme Customizer +// Add Image upload and Color select to WordPress Theme Customizer. require_once( get_stylesheet_directory() . '/lib/customize.php' ); -//* Include Customizer CSS +// Include Customizer CSS. include_once( get_stylesheet_directory() . '/lib/output.php' ); -//* Child theme (do not remove) +// Child theme (do not remove). define( 'CHILD_THEME_NAME', 'Genesis Sample' ); define( 'CHILD_THEME_URL', 'http://www.studiopress.com/' ); define( 'CHILD_THEME_VERSION', '2.3.0' ); -//* Enqueue Scripts and Styles +// Enqueue Scripts and Styles. add_action( 'wp_enqueue_scripts', 'genesis_sample_enqueue_scripts_styles' ); function genesis_sample_enqueue_scripts_styles() { @@ -46,7 +46,7 @@ function genesis_sample_enqueue_scripts_styles() { } -//* Enqueue custom WooCommerce styles when WooCommerce active +// Enqueue custom WooCommerce styles when WooCommerce active. add_filter( 'woocommerce_enqueue_styles', 'genesis_sample_woocommerce_styles' ); function genesis_sample_woocommerce_styles( $enqueue_styles ) { @@ -61,19 +61,19 @@ function genesis_sample_woocommerce_styles( $enqueue_styles ) { } -//* Add WooCommerce Support +// Add WooCommerce Support. add_theme_support( 'genesis-connect-woocommerce' ); -//* Add HTML5 markup structure +// Add HTML5 markup structure. add_theme_support( 'html5', array( 'caption', 'comment-form', 'comment-list', 'gallery', 'search-form' ) ); -//* Add Accessibility support +// Add Accessibility support. add_theme_support( 'genesis-accessibility', array( '404-page', 'drop-down-menu', 'headings', 'rems', 'search-form', 'skip-links' ) ); -//* Add viewport meta tag for mobile browsers +// Add viewport meta tag for mobile browsers. add_theme_support( 'genesis-responsive-viewport' ); -//* Add support for custom header +// Add support for custom header. add_theme_support( 'custom-header', array( 'width' => 600, 'height' => 160, @@ -82,26 +82,26 @@ function genesis_sample_woocommerce_styles( $enqueue_styles ) { 'flex-height' => true, ) ); -//* Add support for custom background +// Add support for custom background. add_theme_support( 'custom-background' ); -//* Add support for after entry widget +// Add support for after entry widget. add_theme_support( 'genesis-after-entry-widget-area' ); -//* Add support for 3-column footer widgets +// Add support for 3-column footer widgets. add_theme_support( 'genesis-footer-widgets', 3 ); -//* Add Image Sizes +// Add Image Sizes. add_image_size( 'featured-image', 720, 400, TRUE ); -//* Rename primary and secondary navigation menus +// Rename primary and secondary navigation menus. add_theme_support( 'genesis-menus' , array( 'primary' => __( 'After Header Menu', 'genesis-sample' ), 'secondary' => __( 'Footer Menu', 'genesis-sample' ) ) ); -//* Reposition the secondary navigation menu +// Reposition the secondary navigation menu. remove_action( 'genesis_after_header', 'genesis_do_subnav' ); add_action( 'genesis_footer', 'genesis_do_subnav', 5 ); -//* Reduce the secondary navigation menu to one level depth +// Reduce the secondary navigation menu to one level depth. add_filter( 'wp_nav_menu_args', 'genesis_sample_secondary_menu_args' ); function genesis_sample_secondary_menu_args( $args ) { @@ -115,7 +115,7 @@ function genesis_sample_secondary_menu_args( $args ) { } -//* Modify size of the Gravatar in the author box +// Modify size of the Gravatar in the author box. add_filter( 'genesis_author_box_gravatar_size', 'genesis_sample_author_box_gravatar' ); function genesis_sample_author_box_gravatar( $size ) { @@ -123,7 +123,7 @@ function genesis_sample_author_box_gravatar( $size ) { } -//* Modify size of the Gravatar in the entry comments +// Modify size of the Gravatar in the entry comments. add_filter( 'genesis_comment_list_args', 'genesis_sample_comments_gravatar' ); function genesis_sample_comments_gravatar( $args ) { diff --git a/js/responsive-menu.js b/js/responsive-menu.js index 6d5b19c0..6ab22e76 100644 --- a/js/responsive-menu.js +++ b/js/responsive-menu.js @@ -1,5 +1,9 @@ /** - * Accessibility-ready responsive menu. + * This script adds the accessibility-ready responsive menu to the Genesis Sample theme. + * + * @package Genesis Sample\JS + * @author StudioPress + * @license GPL-2.0+ */ ( function ( document, $, undefined ) { @@ -33,11 +37,11 @@ } ) ) }; if ($( '.nav-primary' ).length > 0 ) { - $( '.nav-primary' ).before( toggleButtons.menu ); // add the main nav buttons + $( '.nav-primary' ).before( toggleButtons.menu ); // Add the main nav buttons. } else { $( '.nav-header' ).before( toggleButtons.menu ); } - $( 'nav .sub-menu' ).before( toggleButtons.submenu ); // add the submenu nav buttons + $( 'nav .sub-menu' ).before( toggleButtons.submenu ); // Add the submenu nav buttons. $( '.' + mainMenuButtonClass ).each( _addClassID ); $( '.' + mainMenuButtonClass ).addClass('dashicons-before dashicons-menu'); $( '.' + subMenuButtonClass ).addClass('dashicons-before dashicons-arrow-down'); @@ -46,7 +50,7 @@ $( '.' + subMenuButtonClass ).on( 'click.genesisSample-subbutton', _submenuToggle ); }; - // add nav class and ID to related button + // Add nav class and ID to related button. function _addClassID() { var $this = $( this ), nav = $this.next( 'nav' ), @@ -57,10 +61,10 @@ $this.attr( 'id', 'mobile-' + $( nav ).attr( id ) ); } - // check CSS rule to determine width + // Check CSS rule to determine width. function _combineMenus(){ - if ( ( $( '.js nav' ).css( 'position' ) == 'relative' ) && $( '.nav-primary' ).length > 0 ) { // depends on .js nav having position: relative; in style.css - $( '.nav-header .menu > li' ).addClass( 'moved-item' ); // tag moved items so we can move them back + if ( ( $( '.js nav' ).css( 'position' ) == 'relative' ) && $( '.nav-primary' ).length > 0 ) { // Depends on .js nav having position: relative; in style.css. + $( '.nav-header .menu > li' ).addClass( 'moved-item' ); // Tag moved items so we can move them back. $( '.nav-header .menu > li' ).prependTo( '.nav-primary ul.genesis-nav-menu' ); $( '.nav-header' ).hide(); } else if ( ( $( '.js nav' ).css( 'position' ) !== 'relative' ) && $( '.nav-primary' ).length > 0 ) { @@ -70,7 +74,7 @@ } } - // Change Skiplinks and Superfish + // Change Skiplinks and Superfish. function _doResize() { var buttons = $( 'button[id^="mobile-"]' ).attr( 'id' ); if ( typeof buttons === 'undefined' ) { @@ -82,7 +86,7 @@ } /** - * action to happen when the main menu button is clicked + * Action to happen when the main menu button is clicked. */ function _mainmenuToggle() { var $this = $( this ); @@ -93,7 +97,7 @@ } /** - * action for submenu toggles + * Action for submenu toggles. */ function _submenuToggle() { @@ -110,7 +114,7 @@ } /** - * activate/deactivate superfish + * Activate/deactivate superfish. */ function _superfishToggle( buttons ) { if ( typeof $( '.js-superfish' ).superfish !== 'function' ) { @@ -128,7 +132,7 @@ } /** - * modify skip links to match mobile buttons + * Modify skip links to match mobile buttons. */ function _changeSkipLink( buttons ) { var startLink = 'genesis-nav', @@ -157,7 +161,7 @@ } /** - * generic function to get the display value of an element + * Generic function to get the display value of an element. * @param {id} $id ID to check * @return {string} CSS value of display property */ @@ -168,7 +172,7 @@ } /** - * Toggle aria attributes + * Toggle aria attributes. * @param {button} $this passed through * @param {aria-xx} attribute aria attribute to toggle * @return {bool} from _ariaReturn @@ -181,10 +185,10 @@ $(document).ready(function () { - // run test on initial page load + // Run test on initial page load. _combineMenus(); - // run test on resize of the window + // Run test on resize of the window. $( window ).resize( _combineMenus ); genesisSample.params = typeof genesisSampleL10n === 'undefined' ? '' : genesisSampleL10n; diff --git a/lib/customize.php b/lib/customize.php index f47ab7ac..abd2cd4a 100644 --- a/lib/customize.php +++ b/lib/customize.php @@ -62,9 +62,9 @@ function genesis_sample_customizer_register() { 'genesis_sample_link_color', array( 'description' => __( 'Change the default color for linked titles, menu links, post info links and more.', 'genesis-sample' ), - 'label' => __( 'Link Color', 'genesis-sample' ), - 'section' => 'colors', - 'settings' => 'genesis_sample_link_color', + 'label' => __( 'Link Color', 'genesis-sample' ), + 'section' => 'colors', + 'settings' => 'genesis_sample_link_color', ) ) ); @@ -83,9 +83,9 @@ function genesis_sample_customizer_register() { 'genesis_sample_accent_color', array( 'description' => __( 'Change the default color for button hovers.', 'genesis-sample' ), - 'label' => __( 'Accent Color', 'genesis-sample' ), - 'section' => 'colors', - 'settings' => 'genesis_sample_accent_color', + 'label' => __( 'Accent Color', 'genesis-sample' ), + 'section' => 'colors', + 'settings' => 'genesis_sample_accent_color', ) ) ); diff --git a/lib/output.php b/lib/output.php index f9ef1aba..551da301 100644 --- a/lib/output.php +++ b/lib/output.php @@ -27,7 +27,7 @@ function genesis_sample_css() { $css = ''; $woo_css = ''; - //* Calculate Color Contrast + // Calculate Color Contrast. function genesis_sample_color_contrast( $color ) { $hexcolor = str_replace( '#', '', $color ); @@ -42,7 +42,7 @@ function genesis_sample_color_contrast( $color ) { } - //* Calculate Color Brightness + // Calculate Color Brightness. function genesis_sample_color_brightness( $color, $change ) { $hexcolor = str_replace( '#', '', $color ); @@ -50,7 +50,7 @@ function genesis_sample_color_brightness( $color, $change ) { $red = hexdec( substr( $hexcolor, 0, 2 ) ); $green = hexdec( substr( $hexcolor, 2, 2 ) ); $blue = hexdec( substr( $hexcolor, 4, 2 ) ); - + $red = max( 0, min( 255, $red + $change ) ); $green = max( 0, min( 255, $green + $change ) ); $blue = max( 0, min( 255, $blue + $change ) ); diff --git a/lib/theme-defaults.php b/lib/theme-defaults.php index 742e9bc7..575888dd 100644 --- a/lib/theme-defaults.php +++ b/lib/theme-defaults.php @@ -40,16 +40,16 @@ function genesis_sample_theme_setting_defaults() { if ( function_exists( 'genesis_update_settings' ) ) { genesis_update_settings( array( - 'blog_cat_num' => 6, + 'blog_cat_num' => 6, 'content_archive' => 'full', 'content_archive_limit' => 0, 'content_archive_thumbnail' => 0, 'posts_nav' => 'numeric', 'site_layout' => 'content-sidebar', ) ); - - } + + } update_option( 'posts_per_page', 6 ); -} \ No newline at end of file +} diff --git a/page_landing.php b/page_landing.php index 1fb67930..2bb4b7eb 100644 --- a/page_landing.php +++ b/page_landing.php @@ -4,15 +4,15 @@ * * This file adds the landing page template to the Genesis Sample Theme. * + * Template Name: Landing + * * @package Genesis Sample * @author StudioPress * @license GPL-2.0+ * @link http://www.studiopress.com/ */ -//* Template Name: Landing - -//* Add landing page body class to the head +// Add landing page body class to the head. add_filter( 'body_class', 'genesis_sample_add_body_class' ); function genesis_sample_add_body_class( $classes ) { @@ -22,10 +22,10 @@ function genesis_sample_add_body_class( $classes ) { } -//* Remove Skip Links +// Remove Skip Links. remove_action ( 'genesis_before_header', 'genesis_skip_links', 5 ); -//* Dequeue Skip Links Script +// Dequeue Skip Links Script. add_action( 'wp_enqueue_scripts', 'genesis_sample_dequeue_skip_links' ); function genesis_sample_dequeue_skip_links() { @@ -33,27 +33,27 @@ function genesis_sample_dequeue_skip_links() { } -//* Force full width content layout +// Force full width content layout. add_filter( 'genesis_site_layout', '__genesis_return_full_width_content' ); -//* Remove site header elements +// Remove site header elements. remove_action( 'genesis_header', 'genesis_header_markup_open', 5 ); remove_action( 'genesis_header', 'genesis_do_header' ); remove_action( 'genesis_header', 'genesis_header_markup_close', 15 ); -//* Remove navigation +// Remove navigation. remove_theme_support( 'genesis-menus' ); -//* Remove breadcrumbs +// Remove breadcrumbs. remove_action( 'genesis_before_loop', 'genesis_do_breadcrumbs' ); -//* Remove footer widgets +// Remove footer widgets. remove_action( 'genesis_before_footer', 'genesis_footer_widget_areas' ); -//* Remove site footer elements +// Remove site footer elements. remove_action( 'genesis_footer', 'genesis_footer_markup_open', 5 ); remove_action( 'genesis_footer', 'genesis_do_footer' ); remove_action( 'genesis_footer', 'genesis_footer_markup_close', 15 ); -//* Run the Genesis loop +// Run the Genesis loop. genesis(); From 6d9ef168bbd8a722781f27dea3a8be6969723f4e Mon Sep 17 00:00:00 2001 From: Calvin Koepke Date: Tue, 13 Dec 2016 16:50:32 -0700 Subject: [PATCH 07/48] Update to WooCommerce and file structure --- CHANGELOG.md | 1 + functions.php | 27 ++-- lib/customize.php | 26 ---- lib/helper-functions.php | 81 ++++++++++ lib/output.php | 90 ------------ .../genesis-sample-woocommerce.css | 138 ++++++++++-------- lib/woocommerce/woocommerce-output.php | 75 ++++++++++ lib/woocommerce/woocommerce-setup.php | 34 +++++ 8 files changed, 274 insertions(+), 198 deletions(-) create mode 100644 lib/helper-functions.php rename {css => lib/woocommerce}/genesis-sample-woocommerce.css (80%) create mode 100644 lib/woocommerce/woocommerce-output.php create mode 100644 lib/woocommerce/woocommerce-setup.php diff --git a/CHANGELOG.md b/CHANGELOG.md index ee6e3128..4387c67d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## [Unreleased][unreleased] * Add WooCommerce support to the theme and customizer +* Updated the file structure ## [2.2.4] - 2016-06-08 * Reorder font size on breadcrumbs diff --git a/functions.php b/functions.php index 06be6c14..a96cc8aa 100755 --- a/functions.php +++ b/functions.php @@ -19,12 +19,21 @@ //* Set Localization (do not remove) load_child_theme_textdomain( 'genesis-sample', apply_filters( 'child_theme_textdomain', get_stylesheet_directory() . '/languages', 'genesis-sample' ) ); +//* Add the helper functions +include_once( get_stylesheet_directory() . '/lib/helper-functions.php' ); + //* Add Image upload and Color select to WordPress Theme Customizer require_once( get_stylesheet_directory() . '/lib/customize.php' ); //* Include Customizer CSS include_once( get_stylesheet_directory() . '/lib/output.php' ); +// Add the required WooCommerce functions +include_once( get_stylesheet_directory() . '/lib/woocommerce/woocommerce-setup.php' ); + +// Add the required WooCommerce custom CSS +include_once( get_stylesheet_directory() . '/lib/woocommerce/woocommerce-output.php' ); + //* Child theme (do not remove) define( 'CHILD_THEME_NAME', 'Genesis Sample' ); define( 'CHILD_THEME_URL', 'http://www.studiopress.com/' ); @@ -46,24 +55,6 @@ function genesis_sample_enqueue_scripts_styles() { } -//* Enqueue custom WooCommerce styles when WooCommerce active -add_filter( 'woocommerce_enqueue_styles', 'genesis_sample_woocommerce_styles' ); -function genesis_sample_woocommerce_styles( $enqueue_styles ) { - - $enqueue_styles['genesis-sample-woocommerce-styles'] = array( - 'src' => get_stylesheet_directory_uri() . '/css/genesis-sample-woocommerce.css', - 'deps' => '', - 'version' => CHILD_THEME_VERSION, - 'media' => 'screen' - ); - - return $enqueue_styles; - -} - -//* Add WooCommerce Support -add_theme_support( 'genesis-connect-woocommerce' ); - //* Add HTML5 markup structure add_theme_support( 'html5', array( 'caption', 'comment-form', 'comment-list', 'gallery', 'search-form' ) ); diff --git a/lib/customize.php b/lib/customize.php index f47ab7ac..44462aa0 100644 --- a/lib/customize.php +++ b/lib/customize.php @@ -10,32 +10,6 @@ * @link http://www.studiopress.com/ */ -/** - * Get default link color for Customizer. - * - * Abstracted here since at least two functions use it. - * - * @since 2.2.3 - * - * @return string Hex color code for link color. - */ -function genesis_sample_customizer_get_default_link_color() { - return '#c3251d'; -} - -/** - * Get default accent color for Customizer. - * - * Abstracted here since at least two functions use it. - * - * @since 2.2.3 - * - * @return string Hex color code for accent color. - */ -function genesis_sample_customizer_get_default_accent_color() { - return '#c3251d'; -} - add_action( 'customize_register', 'genesis_sample_customizer_register' ); /** * Register settings and controls with the Customizer. diff --git a/lib/helper-functions.php b/lib/helper-functions.php new file mode 100644 index 00000000..1d694c4c --- /dev/null +++ b/lib/helper-functions.php @@ -0,0 +1,81 @@ + 128 ) ? '#333333' : '#ffffff'; + +} + +/** + * Calculate the color brightness + * + * @since 2.2.3 + * + * @return string Hex color code for the color brightness + */ +function genesis_sample_color_brightness( $color, $change ) { + + $hexcolor = str_replace( '#', '', $color ); + + $red = hexdec( substr( $hexcolor, 0, 2 ) ); + $green = hexdec( substr( $hexcolor, 2, 2 ) ); + $blue = hexdec( substr( $hexcolor, 4, 2 ) ); + + $red = max( 0, min( 255, $red + $change ) ); + $green = max( 0, min( 255, $green + $change ) ); + $blue = max( 0, min( 255, $blue + $change ) ); + + return '#'.dechex( $red ).dechex( $green ).dechex( $blue ); + +} diff --git a/lib/output.php b/lib/output.php index f9ef1aba..365cf860 100644 --- a/lib/output.php +++ b/lib/output.php @@ -25,39 +25,6 @@ function genesis_sample_css() { $color_accent = get_theme_mod( 'genesis_sample_accent_color', genesis_sample_customizer_get_default_accent_color() ); $css = ''; - $woo_css = ''; - - //* Calculate Color Contrast - function genesis_sample_color_contrast( $color ) { - - $hexcolor = str_replace( '#', '', $color ); - - $red = hexdec( substr( $hexcolor, 0, 2 ) ); - $green = hexdec( substr( $hexcolor, 2, 2 ) ); - $blue = hexdec( substr( $hexcolor, 4, 2 ) ); - - $luminosity = ( ( $red * 0.2126 ) + ( $green * 0.7152 ) + ( $blue * 0.0722 ) ); - - return ( $luminosity > 128 ) ? '#333333' : '#ffffff'; - - } - - //* Calculate Color Brightness - function genesis_sample_color_brightness( $color, $change ) { - - $hexcolor = str_replace( '#', '', $color ); - - $red = hexdec( substr( $hexcolor, 0, 2 ) ); - $green = hexdec( substr( $hexcolor, 2, 2 ) ); - $blue = hexdec( substr( $hexcolor, 4, 2 ) ); - - $red = max( 0, min( 255, $red + $change ) ); - $green = max( 0, min( 255, $green + $change ) ); - $blue = max( 0, min( 255, $blue + $change ) ); - - return '#'.dechex( $red ).dechex( $green ).dechex( $blue ); - - } $css .= ( genesis_sample_customizer_get_default_link_color() !== $color_link ) ? sprintf( ' @@ -75,23 +42,6 @@ function genesis_sample_color_brightness( $color, $change ) { } ', $color_link ) : ''; - $woo_css .= ( genesis_sample_customizer_get_default_link_color() !== $color_link ) ? sprintf( ' - - .woocommerce div.product p.price, - .woocommerce div.product span.price, - .woocommerce div.product .woocommerce-tabs ul.tabs li a::hover, - .woocommerce div.product .woocommerce-tabs ul.tabs li a::focus, - .woocommerce ul.products li.product h3::hover, - .woocommerce ul.products li.product .price, - .woocommerce .woocommerce-breadcrumb a::hover, - .woocommerce .woocommerce-breadcrumb a::focus, - .woocommerce .widget_layered_nav ul li.chosen a::before, - .woocommerce .widget_layered_nav_filters ul li a::before { - color: %s; - } - - ', $color_link ) : ''; - $css .= ( genesis_sample_customizer_get_default_accent_color() !== $color_accent ) ? sprintf( ' button::focus, @@ -113,48 +63,8 @@ function genesis_sample_color_brightness( $color, $change ) { } ', $color_accent, genesis_sample_color_contrast( $color_accent ) ) : ''; - $woo_css .= ( genesis_sample_customizer_get_default_accent_color() !== $color_accent ) ? sprintf( ' - .woocommerce a.button::hover, - .woocommerce a.button::focus, - .woocommerce a.button.alt::hover, - .woocommerce a.button.alt::focus, - .woocommerce button.button::hover, - .woocommerce button.button::focus, - .woocommerce button.button.alt::hover, - .woocommerce button.button.alt::focus, - .woocommerce input.button::hover, - .woocommerce input.button::focus, - .woocommerce input.button.alt::hover, - .woocommerce input.button.alt::focus, - .woocommerce input:hover[type="submit"], - .woocommerce span.onsale, - .woocommerce #respond input#submit::hover, - .woocommerce #respond input#submit::focus, - .woocommerce #respond input#submit.alt::hover, - .woocommerce #respond input#submit.alt::focus, - .woocommerce-error::before, - .woocommerce-info::before, - .woocommerce-message::before, - .woocommerce.widget_price_filter .ui-slider .ui-slider-handle, - .woocommerce.widget_price_filter .ui-slider .ui-slider-range { - background-color: %1$s; - color: %2$s; - } - - .woocommerce-error, - .woocommerce-info, - .woocommerce-message { - border-top-color: %1$s; - } - - ', $color_accent, genesis_sample_color_contrast( $color_accent ) ) : ''; - if ( $css ) { wp_add_inline_style( $handle, $css ); } - if ( $woo_css ) { - wp_add_inline_style( 'genesis-sample-woocommerce-styles', $woo_css ); - } - } diff --git a/css/genesis-sample-woocommerce.css b/lib/woocommerce/genesis-sample-woocommerce.css similarity index 80% rename from css/genesis-sample-woocommerce.css rename to lib/woocommerce/genesis-sample-woocommerce.css index 4c134f20..4106ac9f 100644 --- a/css/genesis-sample-woocommerce.css +++ b/lib/woocommerce/genesis-sample-woocommerce.css @@ -1,4 +1,7 @@ -/* Woocommerce Globals +/* Genesis Sample WooCommerce Styles +Included with the WooCommerce stylsheet */ + +/* WooCommerce Globals ---------------------------------------------------------------------------------------------------- */ .woocommerce.full-width-content .content, @@ -46,7 +49,7 @@ } -/* Woocommerce Shop Page +/* WooCommerce Shop Page ---------------------------------------------------------------------------------------------------- */ .woocommerce .content .entry { @@ -62,13 +65,13 @@ color: #000; } -.woocommerce ul.products li.product h3::hover, +.woocommerce ul.products li.product h3:hover, .woocommerce ul.products li.product .price { color: #c3251d; } -/* Woocommerce Product +/* WooCommerce Product ---------------------------------------------------------------------------------------------------- */ .woocommerce div.product p.price, @@ -84,7 +87,8 @@ table-layout: fixed; } -/* Woocommerce Product Tabs + +/* WooCommerce Product Tabs ---------------------------------------------------------------------------------------------------- */ .woocommerce div.product .woocommerce-tabs ul.tabs::before, @@ -106,13 +110,13 @@ color: #000; } -.woocommerce div.product .woocommerce-tabs ul.tabs li a::hover, -.woocommerce div.product .woocommerce-tabs ul.tabs li a::focus { +.woocommerce div.product .woocommerce-tabs ul.tabs li a:hover, +.woocommerce div.product .woocommerce-tabs ul.tabs li a:focus { color: #c3251d; } -/* Woocommerce Checkout +/* WooCommerce Checkout ---------------------------------------------------------------------------------------------------- */ #add_payment_method #payment ul.payment_methods li, @@ -128,7 +132,7 @@ } -/* Woocommerce Cart Page +/* WooCommerce Cart Page ---------------------------------------------------------------------------------------------------- */ .woocommerce table.shop_table, @@ -183,7 +187,8 @@ vertical-align: middle; } -/* Woocommerce Payment + +/* WooCommerce Payment ---------------------------------------------------------------------------------------------------- */ #add_payment_method #payment, @@ -213,7 +218,7 @@ } -/* Woocommerce Forms +/* WooCommerce Forms ---------------------------------------------------------------------------------------------------- */ .woocommerce a.button, @@ -239,23 +244,24 @@ width: auto; } -.woocommerce a.button::hover, -.woocommerce a.button::focus, -.woocommerce a.button.alt::hover, -.woocommerce a.button.alt::focus, -.woocommerce button.button::hover, -.woocommerce button.button::focus, -.woocommerce button.button.alt::hover, -.woocommerce button.button.alt::focus, -.woocommerce input.button::hover, -.woocommerce input.button::focus, -.woocommerce input.button.alt::hover, -.woocommerce input.button.alt::focus, -.woocommerce input::hover[type="submit"], -.woocommerce #respond input#submit::hover, -.woocommerce #respond input#submit::focus, -.woocommerce #respond input#submit.alt::hover, -.woocommerce #respond input#submit.alt::focus { +.woocommerce a.button:hover, +.woocommerce a.button:focus, +.woocommerce a.button.alt:hover, +.woocommerce a.button.alt:focus, +.woocommerce button.button:hover, +.woocommerce button.button:focus, +.woocommerce button.button.alt:hover, +.woocommerce button.button.alt:focus, +.woocommerce input.button:hover, +.woocommerce input.button:focus, +.woocommerce input.button.alt:hover, +.woocommerce input.button.alt:focus, +.woocommerce input[type="submit"]:hover, +.woocommerce input[type="submit"]:focus, +.woocommerce #respond input#submit:hover, +.woocommerce #respond input#submit:focus, +.woocommerce #respond input#submit.alt:hover, +.woocommerce #respond input#submit.alt:focus { background-color: #c3251d; color: #fff; } @@ -313,56 +319,56 @@ } -/* Woocommerce Disabled Buttons +/* WooCommerce Disabled Buttons ---------------------------------------------------------------------------------------------------- */ .woocommerce a.button.disabled, -.woocommerce a.button::disabled, -.woocommerce a.button::disabled[disabled], +.woocommerce a.button:disabled, +.woocommerce a.button:disabled[disabled], .woocommerce button.button.disabled, -.woocommerce button.button::disabled, -.woocommerce button.button::disabled[disabled], +.woocommerce button.button:disabled, +.woocommerce button.button:disabled[disabled], .woocommerce input.button.disabled, -.woocommerce input.button::disabled, -.woocommerce input.button::disabled[disabled], +.woocommerce input.button:disabled, +.woocommerce input.button:disabled[disabled], .woocommerce #respond input#submit.disabled, -.woocommerce #respond input#submit::disabled, -.woocommerce #respond input#submit::disabled[disabled] { +.woocommerce #respond input#submit:disabled, +.woocommerce #respond input#submit:disabled[disabled] { background-color: #000; color: #fff; padding: 16px 24px; } .woocommerce a.button.alt.disabled, -.woocommerce a.button.alt.disabled::hover, -.woocommerce a.button.alt::disabled, -.woocommerce a.button.alt::disabled::hover, -.woocommerce a.button.alt[disabled]::disabled, -.woocommerce a.button.alt[disabled]::disabled::hover, +.woocommerce a.button.alt.disabled:hover, +.woocommerce a.button.alt:disabled, +.woocommerce a.button.alt:disabled:hover, +.woocommerce a.button.alt[disabled]:disabled, +.woocommerce a.button.alt[disabled]:disabled:hover, .woocommerce button.button.alt.disabled, -.woocommerce button.button.alt.disabled::hover, -.woocommerce button.button.alt::disabled, -.woocommerce button.button.alt::disabled::hover, -.woocommerce button.button.alt[disabled]::disabled, -.woocommerce button.button.alt[disabled]::disabled::hover, +.woocommerce button.button.alt.disabled:hover, +.woocommerce button.button.alt:disabled, +.woocommerce button.button.alt:disabled:hover, +.woocommerce button.button.alt[disabled]:disabled, +.woocommerce button.button.alt[disabled]:disabled:hover, .woocommerce input.button.alt.disabled, -.woocommerce input.button.alt.disabled::hover, -.woocommerce input.button.alt::disabled, -.woocommerce input.button.alt::disabled::hover, -.woocommerce input.button.alt[disabled]::disabled, -.woocommerce input.button.alt[disabled]::disabled::hover, +.woocommerce input.button.alt.disabled:hover, +.woocommerce input.button.alt:disabled, +.woocommerce input.button.alt:disabled:hover, +.woocommerce input.button.alt[disabled]:disabled, +.woocommerce input.button.alt[disabled]:disabled:hover, .woocommerce #respond input#submit.alt.disabled, -.woocommerce #respond input#submit.alt.disabled::hover, -.woocommerce #respond input#submit.alt::disabled, -.woocommerce #respond input#submit.alt::disabled::hover, -.woocommerce #respond input#submit.alt[disabled]::disabled, -.woocommerce #respond input#submit.alt[disabled]::disabled::hover { +.woocommerce #respond input#submit.alt.disabled:hover, +.woocommerce #respond input#submit.alt:disabled, +.woocommerce #respond input#submit.alt:disabled:hover, +.woocommerce #respond input#submit.alt[disabled]:disabled, +.woocommerce #respond input#submit.alt[disabled]:disabled:hover { background-color: #eee; color: #000 } -/* Woocommerce Account Page +/* WooCommerce Account Page ---------------------------------------------------------------------------------------------------- */ .woocommerce-MyAccount-navigation ul { @@ -382,7 +388,7 @@ } -/* Woocommerce Breadcrumb +/* WooCommerce Breadcrumb ---------------------------------------------------------------------------------------------------- */ .woocommerce .woocommerce-breadcrumb { @@ -400,12 +406,13 @@ text-decoration: none; } -.woocommerce .woocommerce-breadcrumb a::hover, -.woocommerce .woocommerce-breadcrumb a::focus { +.woocommerce .woocommerce-breadcrumb a:hover, +.woocommerce .woocommerce-breadcrumb a:focus { color: #c3251d; } -/* Woocommerce Reviews + +/* WooCommerce Reviews ---------------------------------------------------------------------------------------------------- */ .woocommerce #reviews #comments ol.commentlist li img.avatar { @@ -427,7 +434,8 @@ list-style-type: none; } -/* Woocommerce Misc + +/* WooCommerce Misc ---------------------------------------------------------------------------------------------------- */ .woocommerce-error, @@ -447,7 +455,8 @@ div.woocommerce-info.wc-memberships-restriction-message.wc-memberships-restricte width: 48%; } -/* Woocommerce Widgets + +/* WooCommerce Widgets ---------------------------------------------------------------------------------------------------- */ /* Woo Search @@ -540,6 +549,7 @@ div.woocommerce-info.wc-memberships-restriction-message.wc-memberships-restricte text-transform: uppercase; } + /* Media Queries ---------------------------------------------------------------------------------------------------- */ diff --git a/lib/woocommerce/woocommerce-output.php b/lib/woocommerce/woocommerce-output.php new file mode 100644 index 00000000..10bebda2 --- /dev/null +++ b/lib/woocommerce/woocommerce-output.php @@ -0,0 +1,75 @@ + get_stylesheet_directory_uri() . '/lib/woocommerce/genesis-sample-woocommerce.css', + 'deps' => '', + 'version' => CHILD_THEME_VERSION, + 'media' => 'screen' + ); + + return $enqueue_styles; + +} \ No newline at end of file From 92cc2360e1e27debc007595d8c38c37bdca1ed54 Mon Sep 17 00:00:00 2001 From: Calvin Koepke Date: Wed, 14 Dec 2016 12:54:05 -0700 Subject: [PATCH 08/48] Update Documentation --- lib/helper-functions.php | 10 +++++----- lib/woocommerce/woocommerce-output.php | 2 +- lib/woocommerce/woocommerce-setup.php | 11 ++++++++--- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/lib/helper-functions.php b/lib/helper-functions.php index 1d694c4c..b288526a 100644 --- a/lib/helper-functions.php +++ b/lib/helper-functions.php @@ -2,7 +2,7 @@ /** * Genesis Sample. * - * This file adds the required helper functions used elsewhere in the child theme. + * This file adds the required helper functions used in the Genesis Sample Theme. * * @package Genesis Sample * @author StudioPress @@ -11,7 +11,7 @@ */ /** - * Get default link color for Customizer. + * Get default link color for Customizer for the Genesis Sample Theme. * * Abstracted here since at least two functions use it. * @@ -24,7 +24,7 @@ function genesis_sample_customizer_get_default_link_color() { } /** - * Get default accent color for Customizer. + * Get default accent color for Customizer for the Genesis Sample Theme. * * Abstracted here since at least two functions use it. * @@ -37,7 +37,7 @@ function genesis_sample_customizer_get_default_accent_color() { } /** - * Calculate the color contrast + * Calculate the color contrast for the Genesis Sample Theme. * * @since 2.2.3 * @@ -58,7 +58,7 @@ function genesis_sample_color_contrast( $color ) { } /** - * Calculate the color brightness + * Calculate the color brightness for the Genesis Sample Theme. * * @since 2.2.3 * diff --git a/lib/woocommerce/woocommerce-output.php b/lib/woocommerce/woocommerce-output.php index 10bebda2..ced0d774 100644 --- a/lib/woocommerce/woocommerce-output.php +++ b/lib/woocommerce/woocommerce-output.php @@ -2,7 +2,7 @@ add_action( 'wp_enqueue_scripts', 'genesis_sample_woocommerce_css' ); /** - * Add the custom CSS to the WooCommerce stylesheet. + * Add the Genesis Sample Theme's custom CSS to the WooCommerce stylesheet. * * @since 2.3.0 * diff --git a/lib/woocommerce/woocommerce-setup.php b/lib/woocommerce/woocommerce-setup.php index 0957527f..fb30a1c4 100644 --- a/lib/woocommerce/woocommerce-setup.php +++ b/lib/woocommerce/woocommerce-setup.php @@ -2,7 +2,7 @@ /** * Genesis Sample. * - * This file adds the required WooCommerce setup functions + * This file adds the required WooCommerce setup functions. * * @package Genesis Sample * @author StudioPress @@ -10,15 +10,20 @@ * @link http://www.studiopress.com/ */ -// Add WooCommerce Support +/** + * Add theme support for WooCommerce to the Genesis Sample Theme. + * + * @since 2.3.0 + */ add_theme_support( 'genesis-connect-woocommerce' ); add_filter( 'woocommerce_enqueue_styles', 'genesis_sample_woocommerce_styles' ); /** - * Enqueue custom WooCommerce styles when WooCommerce active + * Enqueue the Genesis Sample Theme's custom WooCommerce styles to the WooCommerce plugin. * * @since 2.3.0 * + * @return array() Required values for the Genesis Sample Theme's WooCommerce stylesheet. */ function genesis_sample_woocommerce_styles( $enqueue_styles ) { From 64bfa9210d29959f2e6fd33c8f995e55d51c97ec Mon Sep 17 00:00:00 2001 From: Calvin Koepke Date: Thu, 15 Dec 2016 12:34:54 -0700 Subject: [PATCH 09/48] Update Doc Standards + Additional WooCommerce Support --- lib/helper-functions.php | 7 +- .../genesis-sample-woocommerce.css | 196 +++++++++++++----- lib/woocommerce/woocommerce-setup.php | 72 ++++++- 3 files changed, 218 insertions(+), 57 deletions(-) diff --git a/lib/helper-functions.php b/lib/helper-functions.php index b288526a..d26b4957 100644 --- a/lib/helper-functions.php +++ b/lib/helper-functions.php @@ -46,10 +46,9 @@ function genesis_sample_customizer_get_default_accent_color() { function genesis_sample_color_contrast( $color ) { $hexcolor = str_replace( '#', '', $color ); - - $red = hexdec( substr( $hexcolor, 0, 2 ) ); - $green = hexdec( substr( $hexcolor, 2, 2 ) ); - $blue = hexdec( substr( $hexcolor, 4, 2 ) ); + $red = hexdec( substr( $hexcolor, 0, 2 ) ); + $green = hexdec( substr( $hexcolor, 2, 2 ) ); + $blue = hexdec( substr( $hexcolor, 4, 2 ) ); $luminosity = ( ( $red * 0.2126 ) + ( $green * 0.7152 ) + ( $blue * 0.0722 ) ); diff --git a/lib/woocommerce/genesis-sample-woocommerce.css b/lib/woocommerce/genesis-sample-woocommerce.css index 6033a171..e5962fc7 100644 --- a/lib/woocommerce/genesis-sample-woocommerce.css +++ b/lib/woocommerce/genesis-sample-woocommerce.css @@ -19,21 +19,8 @@ Loaded on WooCommerce pages */ padding: 0; } -.woocommerce .page-title { - text-align: center; -} - -.woocommerce .page-title::after { - border-bottom: 1px solid #000; - content: ""; - display: block; - margin: 0 auto 40px; - padding-bottom: 30px; - width: 2.5%; -} - -.woocommerce ins, -.woocommerce abbr.required { +.woocommerce abbr.required, +.woocommerce ins { text-decoration: none; } @@ -48,6 +35,10 @@ Loaded on WooCommerce pages */ margin-bottom: 20px; } +.woocommerce div.product form.cart .variations { + table-layout: fixed; +} + /* WooCommerce Shop Page ---------------------------------------------------------------------------------------------------- */ @@ -77,6 +68,7 @@ Loaded on WooCommerce pages */ .woocommerce div.product p.price, .woocommerce div.product span.price { color: #c3251d; + line-height: 1.5; } .woocommerce div.product form.cart .button { @@ -104,14 +96,16 @@ Loaded on WooCommerce pages */ .woocommerce div.product .woocommerce-tabs ul.tabs li { background-color: #f5f5f5; border-radius: 0; + padding: 0; } .woocommerce div.product .woocommerce-tabs ul.tabs li a { color: #000; + padding: .5em 1em; } -.woocommerce div.product .woocommerce-tabs ul.tabs li a:hover, -.woocommerce div.product .woocommerce-tabs ul.tabs li a:focus { +.woocommerce div.product .woocommerce-tabs ul.tabs li a:focus, +.woocommerce div.product .woocommerce-tabs ul.tabs li a:hover { color: #c3251d; } @@ -119,15 +113,15 @@ Loaded on WooCommerce pages */ /* WooCommerce Checkout ---------------------------------------------------------------------------------------------------- */ -#add_payment_method #payment ul.payment_methods li, .woocommerce-cart #payment ul.payment_methods li, -.woocommerce-checkout #payment ul.payment_methods li { +.woocommerce-checkout #payment ul.payment_methods li, +#add_payment_method #payment ul.payment_methods li { list-style-type: none; } -#add_payment_method #payment div.form-row, .woocommerce-cart #payment div.form-row, -.woocommerce-checkout #payment div.form-row { +.woocommerce-checkout #payment div.form-row, +#add_payment_method #payment div.form-row { padding-bottom: 0; } @@ -139,6 +133,7 @@ Loaded on WooCommerce pages */ .woocommerce table.shop_table td { border-color: #eee; border-radius: 0; + line-height: 1.75; } .woocommerce-cart table.cart { @@ -181,9 +176,9 @@ Loaded on WooCommerce pages */ margin-left: 20px; } -#add_payment_method table.cart img, .woocommerce-cart table.cart img, -.woocommerce-checkout table.cart img { +.woocommerce-checkout table.cart img, +#add_payment_method table.cart img { vertical-align: middle; } @@ -191,29 +186,29 @@ Loaded on WooCommerce pages */ /* WooCommerce Payment ---------------------------------------------------------------------------------------------------- */ -#add_payment_method #payment, .woocommerce-cart #payment, -.woocommerce-checkout #payment { +.woocommerce-checkout #payment, +#add_payment_method #payment { background-color: #f5f5f5; border-radius: 0; padding: 30px; } -#add_payment_method #payment div.payment_box, .woocommerce-cart #payment div.payment_box, -.woocommerce-checkout #payment div.payment_box { +.woocommerce-checkout #payment div.payment_box, +#add_payment_method #payment div.payment_box { background-color: #eee; } -#add_payment_method #payment div.payment_box::before, .woocommerce-cart #payment div.payment_box::before, -.woocommerce-checkout #payment div.payment_box::before { +.woocommerce-checkout #payment div.payment_box::before, +#add_payment_method #payment div.payment_box::before { display: none; } -#add_payment_method #payment ul.payment_methods, .woocommerce-cart #payment ul.payment_methods, -.woocommerce-checkout #payment ul.payment_methods { +.woocommerce-checkout #payment ul.payment_methods, +#add_payment_method #payment ul.payment_methods { border-color: #eee; } @@ -239,29 +234,30 @@ Loaded on WooCommerce pages */ font-size: 1.6rem; font-weight: 700; padding: 16px 24px; + text-align: center; text-decoration: none; white-space: normal; width: auto; } -.woocommerce a.button:hover, .woocommerce a.button:focus, -.woocommerce a.button.alt:hover, +.woocommerce a.button:hover, .woocommerce a.button.alt:focus, -.woocommerce button.button:hover, +.woocommerce a.button.alt:hover, .woocommerce button.button:focus, -.woocommerce button.button.alt:hover, +.woocommerce button.button:hover, .woocommerce button.button.alt:focus, -.woocommerce input.button:hover, +.woocommerce button.button.alt:hover, .woocommerce input.button:focus, -.woocommerce input.button.alt:hover, +.woocommerce input.button:hover, .woocommerce input.button.alt:focus, -.woocommerce input[type="submit"]:hover, +.woocommerce input.button.alt:hover, .woocommerce input[type="submit"]:focus, -.woocommerce #respond input#submit:hover, +.woocommerce input[type="submit"]:hover, .woocommerce #respond input#submit:focus, -.woocommerce #respond input#submit.alt:hover, -.woocommerce #respond input#submit.alt:focus { +.woocommerce #respond input#submit:hover, +.woocommerce #respond input#submit.alt:focus, +.woocommerce #respond input#submit.alt:hover { background-color: #c3251d; color: #fff; } @@ -285,9 +281,9 @@ Loaded on WooCommerce pages */ padding: 8px 20px; } -#add_payment_method table.cart td.actions .coupon .input-text, .woocommerce-cart table.cart td.actions .coupon .input-text, -.woocommerce-checkout table.cart td.actions .coupon .input-text { +.woocommerce-checkout table.cart td.actions .coupon .input-text, +#add_payment_method table.cart td.actions .coupon .input-text { border-color: #eee; padding: 5px 20px; width: 150px; @@ -297,16 +293,16 @@ Loaded on WooCommerce pages */ .woocommerce form.login, .woocommerce form.register, .woocommerce form .form-row .select2-container, -.woocommerce form .form-row.woocommerce-validated .select2-container, .woocommerce form .form-row.woocommerce-validated input.input-text, -.woocommerce form .form-row.woocommerce-validated select { +.woocommerce form .form-row.woocommerce-validated select, +.woocommerce form .form-row.woocommerce-validated .select2-container { border-color: #eee; border-radius: 0; } -#add_payment_method table.cart input, .woocommerce-cart table.cart input, -.woocommerce-checkout table.cart input { +.woocommerce-checkout table.cart input, +#add_payment_method table.cart input { vertical-align: top; } @@ -371,7 +367,19 @@ Loaded on WooCommerce pages */ /* WooCommerce Account Page ---------------------------------------------------------------------------------------------------- */ +.woocommerce-account .woocommerce-Address-title h3 { + font-size: 26px; + font-size: 2.6rem; +} + +.woocommerce-MyAccount-navigation { + border: 1px solid #eee; + padding: 20px; + margin-bottom: 40px; +} + .woocommerce-MyAccount-navigation ul { + margin-bottom: 0; margin-left: 0; } @@ -379,12 +387,43 @@ Loaded on WooCommerce pages */ list-style-type: none; } +.woocommerce-MyAccount-navigation ul li:last-child { + margin-bottom: 0; +} + +.woocommerce-MyAccount-navigation ul li.is-active > a { + text-decoration: underline; +} + .woocommerce-account .woocommerce-MyAccount-navigation { + margin-right: 5%; width: 20%; } .woocommerce-account .woocommerce-MyAccount-content { - width: 80%; + width: 75%; +} + +.content-sidebar.woocommerce-account .woocommerce-MyAccount-navigation, +.sidebar-content.woocommerce-account .woocommerce-MyAccount-navigation { + margin-right: 0; + width: 100%; +} + +.content-sidebar.woocommerce-account .woocommerce-MyAccount-navigation ul, +.sidebar-content.woocommerce-account .woocommerce-MyAccount-navigation ul { + text-align: center; +} + +.content-sidebar.woocommerce-account .woocommerce-MyAccount-navigation li, +.sidebar-content.woocommerce-account .woocommerce-MyAccount-navigation li { + display: inline-block; + margin: 0 10px; +} + +.content-sidebar.woocommerce-account .woocommerce-MyAccount-content, +.sidebar-content.woocommerce-account .woocommerce-MyAccount-content { + width: 100%; } @@ -406,8 +445,8 @@ Loaded on WooCommerce pages */ text-decoration: none; } -.woocommerce .woocommerce-breadcrumb a:hover, -.woocommerce .woocommerce-breadcrumb a:focus { +.woocommerce .woocommerce-breadcrumb a:focus, +.woocommerce .woocommerce-breadcrumb a:hover { color: #c3251d; } @@ -503,14 +542,12 @@ div.woocommerce-info.wc-memberships-restriction-message.wc-memberships-restricte } .sidebar ul.product_list_widget li { - /*border-top: 1px solid #eee;*/ line-height: 1.4; margin-bottom: 15px; padding: 15px 0 0; } .sidebar ul.product_list_widget li:last-child { - /*border-bottom: 1px solid #eee;*/ margin-bottom: 0; padding-bottom: 15px; } @@ -553,6 +590,61 @@ div.woocommerce-info.wc-memberships-restriction-message.wc-memberships-restricte /* Media Queries ---------------------------------------------------------------------------------------------------- */ +@media only screen and (max-width: 860px) { + + .woocommerce-account .woocommerce-MyAccount-content, + .woocommerce-account .woocommerce-MyAccount-navigation { + margin-right: 0; + width: 100%; + } + + .woocommerce-account .woocommerce-Address { + margin-bottom: 20px; + } + + .woocommerce-account .woocommerce-MyAccount-navigation ul { + text-align: center; + } + + .woocommerce-account .woocommerce-MyAccount-navigation ul li { + display: inline-block; + margin: 0 10px; + } + + .woocommerce div.product .woocommerce-tabs ul.tabs { + padding: 0; + } + + .woocommerce div.product .woocommerce-tabs ul.tabs li { + display: block; + margin: 0; + } + + .woocommerce div.product .woocommerce-tabs ul.tabs li a { + display: block; + } + + .woocommerce div.product .woocommerce-tabs ul.tabs li { + background-color: #fff; + border-bottom: 0; + } + + .woocommerce div.product .woocommerce-tabs ul.tabs li:last-child { + border-bottom: 1px solid #eee; + } + + .woocommerce div.product .woocommerce-tabs ul.tabs li.active { + border-bottom-color: #eee; + } + + .woocommerce div.product .woocommerce-tabs ul.tabs li.active a::after { + content: "\f147"; + float: right; + font-family: "dashicons"; + } + +} + @media only screen and (max-width: 600px) { .woocommerce input.button, diff --git a/lib/woocommerce/woocommerce-setup.php b/lib/woocommerce/woocommerce-setup.php index fb30a1c4..4fc09d5e 100644 --- a/lib/woocommerce/woocommerce-setup.php +++ b/lib/woocommerce/woocommerce-setup.php @@ -36,4 +36,74 @@ function genesis_sample_woocommerce_styles( $enqueue_styles ) { return $enqueue_styles; -} \ No newline at end of file +} + +add_filter( 'woocommerce_style_smallscreen_breakpoint', 'genesis_sample_woocommerce_breakpoint' ); +/** + * Modify the WooCommerce breakpoints for the Genesis Sample Theme. + * + * @since 1.1.0 + */ +function genesis_sample_woocommerce_breakpoint() { + + $current = genesis_site_layout(); + $layouts = array( + 'one-sidebar' => array( + 'content-sidebar', + 'sidebar-content', + ), + 'two-sidebar' => array( + 'content-sidebar-sidebar', + 'sidebar-content-sidebar', + 'sidebar-sidebar-content', + ), + ); + + if ( in_array( $current, $layouts['two-sidebar'] ) ) { + return '2000px'; // Show mobile styles immediately + } + elseif ( in_array( $current, $layouts['one-sidebar'] ) ) { + return '1200px'; + } + else { + return '860px'; + } + +} + +add_action( 'after_switch_theme', 'genesis_sample_woocommerce_image_dimensions', 1 ); +/** +* Define WooCommerce image sizes on activation for the Genesis Sample Theme. +* +* @since 1.0.0 +*/ +function genesis_sample_woocommerce_image_dimensions() { + + global $pagenow; + + if ( ! isset( $_GET['activated'] ) || $pagenow != 'themes.php' ) { + return; + } + + $catalog = array( + 'width' => '300', // px + 'height' => '300', // px + 'crop' => 1, // true + ); + $single = array( + 'width' => '600', // px + 'height' => '600', // px + 'crop' => 1, // true + ); + $thumbnail = array( + 'width' => '180', // px + 'height' => '180', // px + 'crop' => 1, // true + ); + + // Image sizes. + update_option( 'shop_catalog_image_size', $catalog ); // Product category thumbs. + update_option( 'shop_single_image_size', $single ); // Single product image. + update_option( 'shop_thumbnail_image_size', $thumbnail ); // Image gallery thumbs. + +} From d42a3cd870e40e889cd82efe3116ad8b1403444a Mon Sep 17 00:00:00 2001 From: Calvin Koepke Date: Thu, 15 Dec 2016 14:46:15 -0700 Subject: [PATCH 10/48] Mobile Updates --- .../genesis-sample-woocommerce.css | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/lib/woocommerce/genesis-sample-woocommerce.css b/lib/woocommerce/genesis-sample-woocommerce.css index e5962fc7..2e8a3057 100644 --- a/lib/woocommerce/genesis-sample-woocommerce.css +++ b/lib/woocommerce/genesis-sample-woocommerce.css @@ -109,6 +109,53 @@ Loaded on WooCommerce pages */ color: #c3251d; } +/* Two Sidebar Layouts */ +.content-sidebar-sidebar.woocommerce div.product .woocommerce-tabs ul.tabs, +.sidebar-content-sidebar.woocommerce div.product .woocommerce-tabs ul.tabs, +.sidebar-sidebar-content.woocommerce div.product .woocommerce-tabs ul.tabs { + padding: 0; +} + +.content-sidebar-sidebar.woocommerce div.product .woocommerce-tabs ul.tabs li, +.sidebar-content-sidebar.woocommerce div.product .woocommerce-tabs ul.tabs li, +.sidebar-sidebar-content.woocommerce div.product .woocommerce-tabs ul.tabs li { + display: block; + margin: 0; +} + +.content-sidebar-sidebar.woocommerce div.product .woocommerce-tabs ul.tabs li a, +.sidebar-content-sidebar.woocommerce div.product .woocommerce-tabs ul.tabs li a, +.sidebar-sidebar-content.woocommerce div.product .woocommerce-tabs ul.tabs li a { + display: block; +} + +.content-sidebar-sidebar.woocommerce div.product .woocommerce-tabs ul.tabs li, +.sidebar-content-sidebar.woocommerce div.product .woocommerce-tabs ul.tabs li, +.sidebar-sidebar-content.woocommerce div.product .woocommerce-tabs ul.tabs li { + background-color: #fff; + border-bottom: 0; +} + +.content-sidebar-sidebar.woocommerce div.product .woocommerce-tabs ul.tabs li:last-child, +.sidebar-content-sidebar.woocommerce div.product .woocommerce-tabs ul.tabs li:last-child, +.sidebar-sidebar-content.woocommerce div.product .woocommerce-tabs ul.tabs li:last-child { + border-bottom: 1px solid #eee; +} + +.content-sidebar-sidebar.woocommerce div.product .woocommerce-tabs ul.tabs li.active, +.sidebar-content-sidebar.woocommerce div.product .woocommerce-tabs ul.tabs li.active, +.sidebar-sidebar-content.woocommerce div.product .woocommerce-tabs ul.tabs li.active { + border-bottom-color: #eee; +} + +.content-sidebar-sidebar.woocommerce div.product .woocommerce-tabs ul.tabs li.active a::after, +.sidebar-content-sidebar.woocommerce div.product .woocommerce-tabs ul.tabs li.active a::after, +.sidebar-sidebar-content.woocommerce div.product .woocommerce-tabs ul.tabs li.active a::after { + content: "\f147"; + float: right; + font-family: "dashicons"; +} + /* WooCommerce Checkout ---------------------------------------------------------------------------------------------------- */ @@ -590,6 +637,49 @@ div.woocommerce-info.wc-memberships-restriction-message.wc-memberships-restricte /* Media Queries ---------------------------------------------------------------------------------------------------- */ +@media only screen and (max-width: 1200px) { + + .content-sidebar.woocommerce div.product .woocommerce-tabs ul.tabs, + .sidebar-content.woocommerce div.product .woocommerce-tabs ul.tabs { + padding: 0; + } + + .content-sidebar.woocommerce div.product .woocommerce-tabs ul.tabs li, + .sidebar-content.woocommerce div.product .woocommerce-tabs ul.tabs li { + display: block; + margin: 0; + } + + .content-sidebar.woocommerce div.product .woocommerce-tabs ul.tabs li a, + .sidebar-content.woocommerce div.product .woocommerce-tabs ul.tabs li a { + display: block; + } + + .content-sidebar.woocommerce div.product .woocommerce-tabs ul.tabs li, + .sidebar-content.woocommerce div.product .woocommerce-tabs ul.tabs li { + background-color: #fff; + border-bottom: 0; + } + + .content-sidebar.woocommerce div.product .woocommerce-tabs ul.tabs li:last-child, + .sidebar-content.woocommerce div.product .woocommerce-tabs ul.tabs li:last-child { + border-bottom: 1px solid #eee; + } + + .content-sidebar.woocommerce div.product .woocommerce-tabs ul.tabs li.active, + .sidebar-content.woocommerce div.product .woocommerce-tabs ul.tabs li.active { + border-bottom-color: #eee; + } + + .content-sidebar.woocommerce div.product .woocommerce-tabs ul.tabs li.active a::after, + .sidebar-content.woocommerce div.product .woocommerce-tabs ul.tabs li.active a::after { + content: "\f147"; + float: right; + font-family: "dashicons"; + } + +} + @media only screen and (max-width: 860px) { .woocommerce-account .woocommerce-MyAccount-content, From 8967b0dd53e7f0baa47a330b33e66a5e4c499abb Mon Sep 17 00:00:00 2001 From: Calvin Koepke Date: Thu, 15 Dec 2016 16:23:47 -0700 Subject: [PATCH 11/48] Update Account Page nav line-height --- lib/woocommerce/genesis-sample-woocommerce.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/woocommerce/genesis-sample-woocommerce.css b/lib/woocommerce/genesis-sample-woocommerce.css index 2e8a3057..e5b71ea2 100644 --- a/lib/woocommerce/genesis-sample-woocommerce.css +++ b/lib/woocommerce/genesis-sample-woocommerce.css @@ -431,7 +431,9 @@ Loaded on WooCommerce pages */ } .woocommerce-MyAccount-navigation ul li { + line-height: 1.2; list-style-type: none; + margin-bottom: 15px; } .woocommerce-MyAccount-navigation ul li:last-child { From 903dbcc533cfdb4fba5142bc76421e084464ef71 Mon Sep 17 00:00:00 2001 From: Calvin Koepke Date: Fri, 16 Dec 2016 11:34:17 -0700 Subject: [PATCH 12/48] Doc Updates --- lib/helper-functions.php | 8 ++++---- lib/woocommerce/woocommerce-output.php | 12 +++++++++++- lib/woocommerce/woocommerce-setup.php | 12 ++++++------ 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/lib/helper-functions.php b/lib/helper-functions.php index d26b4957..b6fd4f68 100644 --- a/lib/helper-functions.php +++ b/lib/helper-functions.php @@ -11,7 +11,7 @@ */ /** - * Get default link color for Customizer for the Genesis Sample Theme. + * Get default link color for Customizer. * * Abstracted here since at least two functions use it. * @@ -24,7 +24,7 @@ function genesis_sample_customizer_get_default_link_color() { } /** - * Get default accent color for Customizer for the Genesis Sample Theme. + * Get default accent color for Customizer. * * Abstracted here since at least two functions use it. * @@ -37,7 +37,7 @@ function genesis_sample_customizer_get_default_accent_color() { } /** - * Calculate the color contrast for the Genesis Sample Theme. + * Calculate the color contrast. * * @since 2.2.3 * @@ -57,7 +57,7 @@ function genesis_sample_color_contrast( $color ) { } /** - * Calculate the color brightness for the Genesis Sample Theme. + * Calculate the color brightness. * * @since 2.2.3 * diff --git a/lib/woocommerce/woocommerce-output.php b/lib/woocommerce/woocommerce-output.php index ced0d774..acb6f057 100644 --- a/lib/woocommerce/woocommerce-output.php +++ b/lib/woocommerce/woocommerce-output.php @@ -1,8 +1,18 @@ Date: Mon, 19 Dec 2016 09:43:07 -0700 Subject: [PATCH 13/48] Update Account Page + Add Default Mark Style --- .../genesis-sample-woocommerce.css | 30 +++++++++---------- style.css | 5 ++++ 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/lib/woocommerce/genesis-sample-woocommerce.css b/lib/woocommerce/genesis-sample-woocommerce.css index e5b71ea2..4bbb3a4a 100644 --- a/lib/woocommerce/genesis-sample-woocommerce.css +++ b/lib/woocommerce/genesis-sample-woocommerce.css @@ -641,6 +641,21 @@ div.woocommerce-info.wc-memberships-restriction-message.wc-memberships-restricte @media only screen and (max-width: 1200px) { + .woocommerce-account .woocommerce-MyAccount-navigation ul { + text-align: center; + } + + .woocommerce-account .woocommerce-MyAccount-navigation ul li { + display: inline-block; + margin: 0 10px; + } + + .woocommerce-account .woocommerce-MyAccount-content, + .woocommerce-account .woocommerce-MyAccount-navigation { + margin-right: 0; + width: 100%; + } + .content-sidebar.woocommerce div.product .woocommerce-tabs ul.tabs, .sidebar-content.woocommerce div.product .woocommerce-tabs ul.tabs { padding: 0; @@ -684,25 +699,10 @@ div.woocommerce-info.wc-memberships-restriction-message.wc-memberships-restricte @media only screen and (max-width: 860px) { - .woocommerce-account .woocommerce-MyAccount-content, - .woocommerce-account .woocommerce-MyAccount-navigation { - margin-right: 0; - width: 100%; - } - .woocommerce-account .woocommerce-Address { margin-bottom: 20px; } - .woocommerce-account .woocommerce-MyAccount-navigation ul { - text-align: center; - } - - .woocommerce-account .woocommerce-MyAccount-navigation ul li { - display: inline-block; - margin: 0 10px; - } - .woocommerce div.product .woocommerce-tabs ul.tabs { padding: 0; } diff --git a/style.css b/style.css index e5a94206..d582d20b 100755 --- a/style.css +++ b/style.css @@ -227,6 +227,11 @@ i { font-style: italic; } +mark { + background: #f5f5f5; + color: #000; +} + blockquote { margin: 40px; } From cfaaf1b2ea0fb01ca54958debfc4e601b0b70724 Mon Sep 17 00:00:00 2001 From: Calvin Koepke Date: Mon, 19 Dec 2016 12:13:05 -0700 Subject: [PATCH 14/48] Update Product Image Dimensions + Mobile Tweaks --- lib/woocommerce/genesis-sample-woocommerce.css | 10 ++++++++++ lib/woocommerce/woocommerce-setup.php | 8 ++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/woocommerce/genesis-sample-woocommerce.css b/lib/woocommerce/genesis-sample-woocommerce.css index 4bbb3a4a..b638aaca 100644 --- a/lib/woocommerce/genesis-sample-woocommerce.css +++ b/lib/woocommerce/genesis-sample-woocommerce.css @@ -699,6 +699,10 @@ div.woocommerce-info.wc-memberships-restriction-message.wc-memberships-restricte @media only screen and (max-width: 860px) { + .woocommerce .content { + padding: 30px; + } + .woocommerce-account .woocommerce-Address { margin-bottom: 20px; } @@ -739,6 +743,12 @@ div.woocommerce-info.wc-memberships-restriction-message.wc-memberships-restricte @media only screen and (max-width: 600px) { + .woocommerce ul.products li.product, + .woocommerce-page ul.products li.product { + margin-right: 0; + width: 100%; + } + .woocommerce input.button, .woocommerce input.button[type="submit"], .woocommerce-cart table.cart td.actions .coupon .input-text { diff --git a/lib/woocommerce/woocommerce-setup.php b/lib/woocommerce/woocommerce-setup.php index 08acbebd..1991d803 100644 --- a/lib/woocommerce/woocommerce-setup.php +++ b/lib/woocommerce/woocommerce-setup.php @@ -86,13 +86,13 @@ function genesis_sample_woocommerce_image_dimensions() { } $catalog = array( - 'width' => '300', // px - 'height' => '300', // px + 'width' => '450', // px + 'height' => '450', // px 'crop' => 1, // true ); $single = array( - 'width' => '600', // px - 'height' => '600', // px + 'width' => '650', // px + 'height' => '650', // px 'crop' => 1, // true ); $thumbnail = array( From cebdc2f145c8c3daf37c9ac55dbfe7c1c973fd97 Mon Sep 17 00:00:00 2001 From: Calvin Koepke Date: Mon, 26 Dec 2016 12:14:35 -0700 Subject: [PATCH 15/48] Updated Responsive Navigation + Woo Updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Added a more modular responsive menu JavaScript function that allows parameters to be set entirely from the theme’s functions.php file. - Update style.css to only target the primary navigation when styling for the responsive menu. - Only load WooCommerce functions if the plugin is active. --- functions.php | 26 ++++--- js/responsive-menu.js | 153 ++++++++++++++++++++++++++---------------- style.css | 4 +- 3 files changed, 116 insertions(+), 67 deletions(-) diff --git a/functions.php b/functions.php index 52d84bd1..3a1e630d 100755 --- a/functions.php +++ b/functions.php @@ -19,7 +19,7 @@ // Set Localization (do not remove). load_child_theme_textdomain( 'genesis-sample', apply_filters( 'child_theme_textdomain', get_stylesheet_directory() . '/languages', 'genesis-sample' ) ); -//* Add the helper functions. +// Add the helper functions. include_once( get_stylesheet_directory() . '/lib/helper-functions.php' ); // Add Image upload and Color select to WordPress Theme Customizer. @@ -28,11 +28,15 @@ // Include Customizer CSS. include_once( get_stylesheet_directory() . '/lib/output.php' ); -// Add the required WooCommerce functions -include_once( get_stylesheet_directory() . '/lib/woocommerce/woocommerce-setup.php' ); +if ( class_exists( 'WooCommerce' ) ) { -// Add the required WooCommerce custom CSS -include_once( get_stylesheet_directory() . '/lib/woocommerce/woocommerce-output.php' ); + // Add the required WooCommerce functions. + include_once( get_stylesheet_directory() . '/lib/woocommerce/woocommerce-setup.php' ); + + // Add the required WooCommerce custom CSS. + include_once( get_stylesheet_directory() . '/lib/woocommerce/woocommerce-output.php' ); + +} // Child theme (do not remove). define( 'CHILD_THEME_NAME', 'Genesis Sample' ); @@ -48,10 +52,16 @@ function genesis_sample_enqueue_scripts_styles() { wp_enqueue_script( 'genesis-sample-responsive-menu', get_stylesheet_directory_uri() . '/js/responsive-menu.js', array( 'jquery' ), '1.0.0', true ); $output = array( - 'mainMenu' => __( 'Menu', 'genesis-sample' ), - 'subMenu' => __( 'Menu', 'genesis-sample' ), + 'mainMenu' => __( 'Menu', 'genesis-sample' ), + 'subMenu' => __( 'Menu', 'genesis-sample' ), + 'menuClasses' => array( + 'primary' => '.nav-primary', + 'secondary' => '.nav-secondary', + ), + 'menuIconClass' => 'dashicons-before dashicons-menu', + 'subMenuIconsClass' => 'dashicons-before dashicons-arrow-down-alt2', ); - wp_localize_script( 'genesis-sample-responsive-menu', 'genesisSampleL10n', $output ); + wp_localize_script( 'genesis-sample-responsive-menu', 'genesis_responsive_menu', $output ); } diff --git a/js/responsive-menu.js b/js/responsive-menu.js index 6ab22e76..81b0b0ef 100644 --- a/js/responsive-menu.js +++ b/js/responsive-menu.js @@ -6,25 +6,34 @@ * @license GPL-2.0+ */ +var genesisMenuParams = typeof genesis_responsive_menu === 'undefined' ? '' : genesis_responsive_menu, + genesisMenus = genesisMenuParams.menuClasses; + + ( function ( document, $, undefined ) { $( 'body' ).addClass( 'js' ); 'use strict'; - var genesisSample = {}, + var genesisMenu = {}, mainMenuButtonClass = 'menu-toggle', - subMenuButtonClass = 'sub-menu-toggle'; - - genesisSample.init = function() { - var toggleButtons = { + subMenuButtonClass = 'sub-menu-toggle', + responsiveMenuClass = '.genesis-responsive-menu'; + + genesisMenu.init = function() { + var $primaryMenu = $( genesisMenus.primary ), + $secondaryMenu = $( genesisMenus.secondary ), + menuIconClass = typeof genesisMenuParams.menuIconClass !== 'undefined' ? genesisMenuParams.menuIconClass : 'dashicons-before dashicons-menu', + subMenuIconClass = typeof genesisMenuParams.subMenuIconClass !== 'undefined' ? genesisMenuParams.subMenuIconClass : 'dashicons-before dashicons-arrow-down', + toggleButtons = { menu : $( '