diff --git a/composer.json b/composer.json index 278e061..d4d06e2 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ } ], "require": { - "php": ">=7.3" + "php": ">=7.1" }, "require-dev": {}, "autoload": { diff --git a/config/appearance.php b/config/appearance.php index 95ae832..0d59c43 100644 --- a/config/appearance.php +++ b/config/appearance.php @@ -27,7 +27,7 @@ $genesis_sample_link_color_brightness = genesis_sample_color_brightness( $genesis_sample_link_color, 35 ); return [ - 'fonts-url' => 'https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,700&display=swap', + 'fonts-url' => 'https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,700|Merriweather:700|Montserrat:300,500,600&display=swap', 'content-width' => 1062, 'button-bg' => $genesis_sample_link_color, 'button-color' => $genesis_sample_link_color_contrast, diff --git a/config/layouts.php b/config/layouts.php new file mode 100644 index 0000000..42bc568 --- /dev/null +++ b/config/layouts.php @@ -0,0 +1,31 @@ + [ + 'label' => __( 'Full Width Content', 'genesis-sample' ), + 'img' => $url . 'c.gif', + 'type' => [ 'site' ], + ], +]; + + \ No newline at end of file diff --git a/functions.php b/functions.php index 4f6352f..96a54f3 100644 --- a/functions.php +++ b/functions.php @@ -40,6 +40,9 @@ function genesis_sample_localization_setup() { // Includes Customizer CSS. require_once get_stylesheet_directory() . '/lib/output.php'; +// Includes layouts configuration for available theme settings +require_once get_stylesheet_directory() . '/lib/functions/layout.php'; + // Adds WooCommerce support. require_once get_stylesheet_directory() . '/lib/woocommerce/woocommerce-setup.php'; diff --git a/lib/functions/layout.php b/lib/functions/layout.php new file mode 100644 index 0000000..d12078e --- /dev/null +++ b/lib/functions/layout.php @@ -0,0 +1,27 @@ + li { .woocommerce input.button[type="submit"], .woocommerce #respond input#submit, .woocommerce #respond input#submit.alt { - background-color: #333; + background-color: #0060a6; /* default #333; */ border: 0; border-radius: 0; color: #fff; @@ -414,7 +414,7 @@ ul.wc-block-grid__products > li { .woocommerce #respond input#submit:hover, .woocommerce #respond input#submit.alt:focus, .woocommerce #respond input#submit.alt:hover { - background-color: #0073e5; + background-color: #0060a6; /* default #0073e5 */ color: #fff; } diff --git a/sass/_content.scss b/sass/_content.scss index 8e418b1..dff995a 100644 --- a/sass/_content.scss +++ b/sass/_content.scss @@ -19,7 +19,7 @@ } .entry-content ul > li { - list-style-type: disc; + list-style-type: none; } .entry-content ol ul > li, diff --git a/sass/_defaults.scss b/sass/_defaults.scss index e6b7175..1022d1c 100644 --- a/sass/_defaults.scss +++ b/sass/_defaults.scss @@ -44,6 +44,11 @@ a:hover { } p { + font-family: $font-family--montserrat; + font-size: $paragraph--font-size; + font-weight: $font-weight--light; + color: $paragraph--color; + opacity: 0.7; margin: 0 0 30px; padding: 0; } @@ -69,7 +74,11 @@ hr { b, strong { - font-weight: 700; + font-family: $font-family--montserrat; + font-size: $strong--font-size; + font-weight: $font-weight--medium; + color: $paragraph--color; + opacity: 0.7; } blockquote, @@ -91,32 +100,47 @@ blockquote { /* Headings --------------------------------------------- */ -h1, -h2, -h3, -h4, -h5, -h6 { - font-family: "Source Sans Pro", sans-serif; - font-weight: 400; - line-height: 1.2; - margin: 0 0 20px; -} - h1 { - font-size: 30px; + font-family: $font-family--merriweather; + font-size: $h1--font-size; + font-weight: $font-weight--bold; + color: $heading-h1--color; + line-height: $headings--line-height; } -h2 { - font-size: 27px; +h2 { + font-family: $font-family--merriweather; + font-size: $h2--font-size; + font-weight: $font-weight--bold; + color: $heading-h2--color; + line-height: $headings--line-height; } h3 { - font-size: 24px; + font-family: $font-family--montserrat; + font-size: $h3--font-size; + font-weight: $font-weight--semi-bold; + color: $heading-h3--color; + opacity: 0.7; + line-height: $headings--line-height; } h4 { - font-size: 20px; + font-family: $font-family--montserrat; + font-size: $h4--font-size; + font-weight: $font-weight--medium; + color: $heading-h4--color; + opacity: 0.7; + text-transform: capitalize; + line-height: $headings--line-height; +} + +h5, +h6 { + font-family: $font-family--source-sans-pro; + font-weight: 400; + line-height: $headings--line-height; + margin: 0 0 20px; } .entry-content h3, @@ -413,3 +437,4 @@ th { position: relative; margin-bottom: 30px; } + diff --git a/sass/_plugins.scss b/sass/_plugins.scss index 2ad1614..07640d0 100644 --- a/sass/_plugins.scss +++ b/sass/_plugins.scss @@ -108,3 +108,21 @@ .site-container .entry-content .wpforms-form textarea.wpforms-field-large { height: 300px; } + +/* WooCommerce +--------------------------------------------- */ +.woocommerce-product-details__short-description { + display: inline-flex; + flex-direction: column; + flex-wrap: nowrap; + justify-content: space-evenly; + align-items: flex-start; +} + +.woocommerce-Price-amount.amount { + font-family: $font-family--montserrat; + font-size: $woocommerce-product-price--font-size; + font-weight: $font-weight--light; + color: $woocommerce-product-price--color; +} + diff --git a/sass/_variables.scss b/sass/_variables.scss deleted file mode 100644 index ac92d33..0000000 --- a/sass/_variables.scss +++ /dev/null @@ -1,3 +0,0 @@ -// * Variables */ - -// If we had any variables, we'd put them here! diff --git a/sass/components/_index.scss b/sass/components/_index.scss new file mode 100644 index 0000000..dcbe00f --- /dev/null +++ b/sass/components/_index.scss @@ -0,0 +1,6 @@ +// +// Components Index File +//============================ + +@import "list-items"; + diff --git a/sass/components/_list-items.scss b/sass/components/_list-items.scss new file mode 100644 index 0000000..42f1496 --- /dev/null +++ b/sass/components/_list-items.scss @@ -0,0 +1,20 @@ +// List Items +//========================================== +/* Target a parent