From f21bc7d6e59df3d42ef5e1868c40349b736324b4 Mon Sep 17 00:00:00 2001 From: Maggie Date: Thu, 12 Aug 2021 16:36:57 +0200 Subject: [PATCH 1/2] two columns pattern and indented paragraph block style --- skatepark/assets/theme.css | 32 +++++++++++-------- skatepark/functions.php | 2 +- skatepark/inc/block-patterns.php | 1 + skatepark/inc/block-styles.php | 13 ++++++++ .../inc/patterns/two-columns-of-text.php | 32 +++++++++++++++++++ .../block-styles/_indented-paragraph.scss | 3 ++ skatepark/sass/theme.scss | 3 +- skatepark/theme.json | 3 ++ 8 files changed, 73 insertions(+), 16 deletions(-) create mode 100644 skatepark/inc/patterns/two-columns-of-text.php create mode 100644 skatepark/sass/block-styles/_indented-paragraph.scss diff --git a/skatepark/assets/theme.css b/skatepark/assets/theme.css index 65c2f9b28..88420118e 100644 --- a/skatepark/assets/theme.css +++ b/skatepark/assets/theme.css @@ -257,20 +257,6 @@ left: calc( -1 * var(--wp--custom--button--border--width)); } -.pre-footer h3 { - text-transform: uppercase; -} - -.pre-footer .wp-block-social-links.is-style-logos-only { - margin-left: calc( -1 * ( 8px + 0.25em )); -} - -.pre-footer .wp-block-search.wp-block-search__button-inside .wp-block-search__inside-wrapper .wp-block-search__button { - --wp--custom--button--typography--font-size: 14px; - --wp--custom--button--spacing--padding--top: 0.5em; - --wp--custom--button--spacing--padding--bottom: 0.5em; -} - .is-style-skatepark-aside-caption { align-items: center; display: flex; @@ -297,6 +283,24 @@ margin-right: calc( max( 0.5 * ( 100% - var(--wp--custom--layout--wide-size) ), var(--wp--custom--post-content--padding--left) )); } +.is-style-indented-paragraph { + text-indent: 10em; +} + +.pre-footer h3 { + text-transform: uppercase; +} + +.pre-footer .wp-block-social-links.is-style-logos-only { + margin-left: calc( -1 * ( 8px + 0.25em )); +} + +.pre-footer .wp-block-search.wp-block-search__button-inside .wp-block-search__inside-wrapper .wp-block-search__button { + --wp--custom--button--typography--font-size: 14px; + --wp--custom--button--spacing--padding--top: 0.5em; + --wp--custom--button--spacing--padding--bottom: 0.5em; +} + h1.is-style-skatepark-heading-border, h2.is-style-skatepark-heading-border, h3.is-style-skatepark-heading-border, h4.is-style-skatepark-heading-border, h5.is-style-skatepark-heading-border, h6.is-style-skatepark-heading-border { display: inline-block; border-top: 2px solid var(--wp--custom--color--primary); diff --git a/skatepark/functions.php b/skatepark/functions.php index 02e24e047..c77b025a8 100644 --- a/skatepark/functions.php +++ b/skatepark/functions.php @@ -55,4 +55,4 @@ require get_stylesheet_directory() . '/inc/block-patterns.php'; /** * Block Styles. */ -require get_stylesheet_directory() . '/inc/block-styles.php'; \ No newline at end of file +require get_stylesheet_directory() . '/inc/block-styles.php'; diff --git a/skatepark/inc/block-patterns.php b/skatepark/inc/block-patterns.php index e2cf0f4da..3a05c965d 100644 --- a/skatepark/inc/block-patterns.php +++ b/skatepark/inc/block-patterns.php @@ -21,6 +21,7 @@ if ( ! function_exists( 'skatepark_register_block_patterns' ) ) : 'pre-footer', 'text-list-with-button', 'full-width-image-with-aside-caption', + 'two-columns-of-text', ); foreach ( $block_patterns as $block_pattern ) { diff --git a/skatepark/inc/block-styles.php b/skatepark/inc/block-styles.php index b3ad3cf1e..7cd6572c1 100644 --- a/skatepark/inc/block-styles.php +++ b/skatepark/inc/block-styles.php @@ -30,10 +30,23 @@ if ( ! function_exists( 'skatepark_register_block_styles' ) ) : 'name' => 'skatepark-aside-caption', 'label' => __( 'Aside caption', 'skatepark' ), 'style_handle' => 'skatepark-aside-caption', + ) + ); + + register_block_style( + 'core/paragraph', + array( + 'name' => 'indented-paragraph', + 'label' => __( 'Indented paragraph', 'skatepark' ), + 'style_handle' => 'indented-paragraph', ) ); } } endif; +<<<<<<< HEAD add_action( 'after_setup_theme', 'skatepark_register_block_styles' ); +======= +add_action( 'after_setup_theme', 'skatepark_register_block_styles' ); +>>>>>>> d5bb84db (two columns pattern and indented paragraph block style) diff --git a/skatepark/inc/patterns/two-columns-of-text.php b/skatepark/inc/patterns/two-columns-of-text.php new file mode 100644 index 000000000..0e567ed39 --- /dev/null +++ b/skatepark/inc/patterns/two-columns-of-text.php @@ -0,0 +1,32 @@ + __( 'Two columns of text', 'skatepark' ), + 'categories' => array( 'skatepark' ), + 'content' => ' +
+
+

Skate ipsum dolor sit amet, poseur nollie casper pop shove-it. Kickturn noseblunt slide tailslide lien air Bonite. Rocket air poseur snake shoveit Chico Brenes. Crooked grind locals casper slide bank. Disaster frigid air bail aerial. Hang ten smith grind tailslide sick. Axle flypaper birdie gap Thrasher. Fast plant crail grab Japan air chicken wing Bullet 66.

+
+ + + +
+

Nose blunt masonite nosebone bluntslide. Poseur tic-tac coping feeble Neil Blender. Rail camel back kick-nose bone air. Saran Wrap skate or die handplant coping. 540 half-flip face plant ho-ho.

+ + + +

Vert quarter pipe tailslide grab. Nose slide Bam Margera rocket air axle set disaster. Fast plant crail grab Japan air chicken wing Bullet 66. Hurricane coping masonite crail grab Brooklyn Banks. Death box salad grind concave cess slide.

+ + + +

Skate ipsum dolor sit amet, poseur nollie casper pop shove-it. Kickturn noseblunt slide tailslide lien air Bonite. Rocket air poseur snake shoveit Chico Brenes. Crooked grind locals casper slide bank. Disaster frigid air bail aerial. Hang ten smith grind tailslide sick. Axle flypaper birdie gap Thrasher.

+
+
+ ', +); diff --git a/skatepark/sass/block-styles/_indented-paragraph.scss b/skatepark/sass/block-styles/_indented-paragraph.scss new file mode 100644 index 000000000..e2c885331 --- /dev/null +++ b/skatepark/sass/block-styles/_indented-paragraph.scss @@ -0,0 +1,3 @@ +.is-style-indented-paragraph { + text-indent: 10em; +} \ No newline at end of file diff --git a/skatepark/sass/theme.scss b/skatepark/sass/theme.scss index 13851ba3a..9c12a3386 100644 --- a/skatepark/sass/theme.scss +++ b/skatepark/sass/theme.scss @@ -4,8 +4,9 @@ @import "blocks/buttons"; @import "blocks/post-comments"; @import "blocks/search"; -@import "block-patterns/pre-footer"; @import "block-styles/image-caption"; +@import "block-styles/indented-paragraph"; +@import "block-patterns/pre-footer"; @import "elements/headings"; @import "elements/links"; @import "templates/header"; diff --git a/skatepark/theme.json b/skatepark/theme.json index 987e87064..a06d39c99 100644 --- a/skatepark/theme.json +++ b/skatepark/theme.json @@ -359,6 +359,9 @@ "margin": "var(--wp--custom--margin--vertical) auto" } }, + "fontsToLoadFromGoogle": [ + "family=Red+Hat+Display:ital,wght@0,400;0,500;0,700;0,900;1,400;1,500;1,700;1,900" + ], "line-height": { "body": 1.6 } From 5ca312c185974ab33ff0ae2505a2d459e9456cef Mon Sep 17 00:00:00 2001 From: Maggie Date: Fri, 13 Aug 2021 10:11:17 +0200 Subject: [PATCH 2/2] changed text --- skatepark/inc/block-styles.php | 4 ---- skatepark/inc/patterns/two-columns-of-text.php | 10 +++++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/skatepark/inc/block-styles.php b/skatepark/inc/block-styles.php index 7cd6572c1..e5ee070fe 100644 --- a/skatepark/inc/block-styles.php +++ b/skatepark/inc/block-styles.php @@ -45,8 +45,4 @@ if ( ! function_exists( 'skatepark_register_block_styles' ) ) : } endif; -<<<<<<< HEAD add_action( 'after_setup_theme', 'skatepark_register_block_styles' ); -======= -add_action( 'after_setup_theme', 'skatepark_register_block_styles' ); ->>>>>>> d5bb84db (two columns pattern and indented paragraph block style) diff --git a/skatepark/inc/patterns/two-columns-of-text.php b/skatepark/inc/patterns/two-columns-of-text.php index 0e567ed39..e17743b03 100644 --- a/skatepark/inc/patterns/two-columns-of-text.php +++ b/skatepark/inc/patterns/two-columns-of-text.php @@ -11,21 +11,21 @@ return array( 'content' => '
-

Skate ipsum dolor sit amet, poseur nollie casper pop shove-it. Kickturn noseblunt slide tailslide lien air Bonite. Rocket air poseur snake shoveit Chico Brenes. Crooked grind locals casper slide bank. Disaster frigid air bail aerial. Hang ten smith grind tailslide sick. Axle flypaper birdie gap Thrasher. Fast plant crail grab Japan air chicken wing Bullet 66.

+

' . esc_html__( 'Rodney Mullen. Paul Rodriguez. Bucky Lasek. Bob Burnquist. Tony Hawk. Ryan Sheckler. Eric Koston. Bam Margera. Chris Cole. Andrew Reynolds. The are all skateboarding icons. Some of them even have video games you may have played.', 'skatepark' ) . '

-
-

Nose blunt masonite nosebone bluntslide. Poseur tic-tac coping feeble Neil Blender. Rail camel back kick-nose bone air. Saran Wrap skate or die handplant coping. 540 half-flip face plant ho-ho.

+
+

' . esc_html__( 'Skateboarding can teach people discipline, patience, and resiliency. It’s a great sport for kids with a lot of energy! We’ll help build up some structure and support in your life, all while you meet new people and have a ton of fun learning how to skateboard.', 'skatepark' ) . '

-

Vert quarter pipe tailslide grab. Nose slide Bam Margera rocket air axle set disaster. Fast plant crail grab Japan air chicken wing Bullet 66. Hurricane coping masonite crail grab Brooklyn Banks. Death box salad grind concave cess slide.

+

' . esc_html__( 'Skateboarding is a social sport! Come hang out and meet some new friends to cheer you on while you skate. We have a strict no-bullying policy and maintain a supportive environment for all camp attendees.', 'skatepark' ) . '

-

Skate ipsum dolor sit amet, poseur nollie casper pop shove-it. Kickturn noseblunt slide tailslide lien air Bonite. Rocket air poseur snake shoveit Chico Brenes. Crooked grind locals casper slide bank. Disaster frigid air bail aerial. Hang ten smith grind tailslide sick. Axle flypaper birdie gap Thrasher.

+

' . esc_html__( 'Work 1:1 with our team of coaches to learn how to skate. They’ll be your mentors and guides while you’re at camp. Plus, many of our older campers will mentor the younger skaters.', 'skatepark' ) . '

',