From 232a5df0a557822ce1f14e7b3af32509fb8f363d Mon Sep 17 00:00:00 2001
From: Muluh MG Godson <godsonmuluh@gmail.com>
Date: Wed, 24 Nov 2021 23:47:38 +0100
Subject: [PATCH 1/7] add blockgaps to selected blocks

---
 theme.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/theme.json b/theme.json
index 221f402..38967c3 100644
--- a/theme.json
+++ b/theme.json
@@ -2,6 +2,7 @@
 	"version": 1,
 	"settings": {
 		"spacing": {
+			"blockGap": true,
 			"customPadding": true,
 			"customMargin": true,
 			"units": [ "px", "em", "rem", "vh", "vw" ]

From ebdd42f9604d9c380ed13bdd107df01892658578 Mon Sep 17 00:00:00 2001
From: Muluh MG Godson <godsonmuluh@gmail.com>
Date: Wed, 24 Nov 2021 23:48:48 +0100
Subject: [PATCH 2/7] add spacing support to some core blocks

---
 custom-block-settings.js | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 custom-block-settings.js

diff --git a/custom-block-settings.js b/custom-block-settings.js
new file mode 100644
index 0000000..6cb5483
--- /dev/null
+++ b/custom-block-settings.js
@@ -0,0 +1,39 @@
+// Enable spacing control on the following blocks
+const enableSpacingControlOnBlocks = [
+    'core/columns',
+    'core/column',
+    'core/group',
+];
+ 
+/**
+ * Add spacing control attribute to block.
+ *
+ * @param {object} settings Current block settings.
+ * @param {string} name Name of block.
+ *
+ * @returns {object} Modified block settings.
+ */
+ const addSpacingControlAttribute = ( settings, name ) => {
+    // Do nothing if it's another block than our defined ones.
+    if ( ! enableSpacingControlOnBlocks.includes( name ) ) {
+        return settings;
+    }
+
+    // Use Lodash's assign to gracefully handle if attributes are undefined
+    settings = lodash.assign( settings, {
+        supports: {
+            spacing: {
+                blockGap: true,
+                margin: true,  
+                padding: true, 
+            }
+        }
+    } );
+    return settings;
+};
+
+wp.hooks.addFilter(
+    'blocks.registerBlockType',
+    'custom-spacing',
+    addSpacingControlAttribute
+);

From 514bf32d696f9ed44dcdac50b05cb92fc565f4d8 Mon Sep 17 00:00:00 2001
From: Muluh MG Godson <godsonmuluh@gmail.com>
Date: Wed, 24 Nov 2021 23:49:24 +0100
Subject: [PATCH 3/7] enqueue custom script in functions.php

---
 functions.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/functions.php b/functions.php
index 6565b5c..a7f4819 100644
--- a/functions.php
+++ b/functions.php
@@ -55,10 +55,14 @@ public function actions_manager() {
 		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
 		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
 		add_filter( 'cc_theme_base_menus', array( $this, 'add_global_menu') );
+		add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) );
 	}
 	public function enqueue_scripts() {
 		wp_enqueue_script( 'vocabulary', THEME_LOCAL_URI . '/assets/js/vocabulary.js', '', self::theme_ver, true );
 	}
+	public function admin_enqueue_scripts() {
+		wp_enqueue_script( 'custom-block-settings', THEME_LOCAL_URI . '/custom-block-settings.js', '', self::theme_ver, true );
+	}
 	public function enqueue_styles() {
 		wp_enqueue_style( 'cc_current_style', THEME_LOCAL_URI . '/assets/css/styles.css', self::theme_ver );
 		wp_enqueue_style( 'cc_custom_style', THEME_LOCAL_URI . '/style.css', self::theme_ver );

From 0b0371e312d245c56c46507d1fd723dc18fee76e Mon Sep 17 00:00:00 2001
From: MuluhGodson <40151808+MuluhGodson@users.noreply.github.com>
Date: Wed, 24 Nov 2021 23:55:34 +0100
Subject: [PATCH 4/7] Delete unrelated file

---
 single.php | 65 ------------------------------------------------------
 1 file changed, 65 deletions(-)
 delete mode 100644 single.php

diff --git a/single.php b/single.php
deleted file mode 100644
index 1ebda89..0000000
--- a/single.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-	get_header();
-	the_post();
-?>
-<section class="main-content">
-	<header class="single-header">
-		<div class="container">
-			<div class="columns is-centered">
-				<div class="column">
-				<?php
-					if ( function_exists( 'yoast_breadcrumb' ) ) {
-						yoast_breadcrumb( '<p id="breadcrumbs">', '</p>' );
-					}
-				?>
-				<div class="is-mobile cc-post-parent">
-
-					<div class="cc-post-heading is-vcentered column">
-						<h2><?php the_title(); ?></h2>
-						<div class="cc-category">
-							<?php the_category(','); ?>
-						</div>
-						<div class="is-flex is-flex-direction-row is-justify-content-space-between pt-3">
-							<div>
-								<?php
-									$show_authors_is_enabled = get_theme_mod( 'cc_base_show_authors' );
-									get_template_part( 'inc/partials/entry/entry', 'author' );
-								?>
-							</div>
-							<div>
-								<div class="column is-2">
-									<div class="share-entry margin-vertical-normal is-flex is-3">
-										<a href="<?php echo CC_Site::social_share( 'facebook', get_the_ID() ); ?>" class="share facebook column"><i class="icon facebook has-black-color"></i></a>
-										<a href="<?php echo CC_Site::social_share( 'twitter', get_the_ID() ); ?>" class="share twitter column"><i class="icon twitter has-black-color"></i></a>
-										<a href="<?php echo CC_Site::social_share( 'whatsapp', get_the_ID() ); ?>" class="share whatsapp column"><i class="icon whatsapp has-black-color"></i></a>
-										<a href="<?php echo CC_Site::social_share( 'linkedin', get_the_ID() ); ?>" class="share linkedin column"><i class="icon linkedin has-black-color"></i></a>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-					<div class="cc-post-image">
-						<img src="<?php the_post_thumbnail(); ?>
-					</div>
-
-				</div>
-				</div>
-			</div>
-		</div>
-	</header>
-	<div class="container">
-		<div class="columns is-centered">
-			<div class="column is-8">
-				<section class="entry-page-content">
-					<div class="text-format body-big">
-						<?php the_content(); ?>
-					</div>
-					<footer class="entry-footer">
-						<?php get_template_part( 'inc/partials/entry/entry', 'footer' ); ?>
-					</footer>
-				</section>
-			</div>
-		</div>
-	</div>
-</section>
-<?php get_footer(); ?>

From 4f9fe5e816dbbc38aa7e61a01ba9f89fe9b63315 Mon Sep 17 00:00:00 2001
From: MuluhGodson <40151808+MuluhGodson@users.noreply.github.com>
Date: Wed, 24 Nov 2021 23:56:02 +0100
Subject: [PATCH 5/7] remove unrelated line

---
 functions.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/functions.php b/functions.php
index a7f4819..967431e 100644
--- a/functions.php
+++ b/functions.php
@@ -65,7 +65,6 @@ public function admin_enqueue_scripts() {
 	}
 	public function enqueue_styles() {
 		wp_enqueue_style( 'cc_current_style', THEME_LOCAL_URI . '/assets/css/styles.css', self::theme_ver );
-		wp_enqueue_style( 'cc_custom_style', THEME_LOCAL_URI . '/style.css', self::theme_ver );
 	}
 }
 

From d6865db409066f0a5ffc8efab86f468aaa8c1041 Mon Sep 17 00:00:00 2001
From: MuluhGodson <40151808+MuluhGodson@users.noreply.github.com>
Date: Wed, 24 Nov 2021 23:56:23 +0100
Subject: [PATCH 6/7] Delete unrelated file

---
 style.css | 88 -------------------------------------------------------
 1 file changed, 88 deletions(-)
 delete mode 100644 style.css

diff --git a/style.css b/style.css
deleted file mode 100644
index 83166aa..0000000
--- a/style.css
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-Theme Name: creativecommons.org Child theme
-Theme URI: https://creativecommons.org/
-Author: Creative Commons
-Author URI: https://creativecommons.org/
-Description: creativeommons.org website child theme.
-Template: creativecommons-base
-Version: 2020.07.1
-License: GPL2 or later
-License URI: http://www.gnu.org/licenses/gpl-2.0.html
-
-This theme, like WordPress, is licensed under the GPL.
-*/
-
-/* styles for single blog post*/
-.cc-category {
-	position: absolute;
-	left: 0;
-	top: -3.5rem;
-	background-color: #c74200;
-	padding: 1rem;
-	z-index: 4;
-}
-
-.cc-category a {
-	color: #ffffff;
-	font-weight: bolder;
-}
-
-.cc-post-heading {
-	position: absolute;
-	top: 45%;
-	left: 55%;
-	width: auto;
-	background-color: #ffffff;
-	z-index: 3;
-	padding: 3rem;
-}
-
-.cc-post-image {
-	position: relative;
-	top: 0;
-	left: 0;
-	width: 50rem;
-	z-index: 2;
-}
-
-.cc-post-parent {
-	position: relative;
-    width: 100%;
-	margin-top: 5rem;
-	z-index: 1;
-}
-
-@media (max-width: 1023px) {
-	.cc-category {
-		position: relative;
-		top: auto;
-		left: auto;
-        width: fit-content;
-		background-color: #c74200;
-		padding: 1rem;
-	}
-
-    .cc-post-heading {
-		position: relative;
-		top: auto;
-		left: auto;
-		background-color: transparent;
-		width: 100%;
-		display: block;
-		padding: 1rem;
-	}
-
-	.cc-post-image {
-		position: relative;
-		top: auto;
-		left: auto;
-		width: 100%;
-		display: block;
-	}
-
-    .cc-post-parent {
-		position: relative;
-		margin-top: 1rem;
-		width: 100%;
-	}
-}

From 02dcabb3e336b7f24ca030832cda80337b9b2660 Mon Sep 17 00:00:00 2001
From: Muluh MG Godson <godsonmuluh@gmail.com>
Date: Thu, 25 Nov 2021 00:00:34 +0100
Subject: [PATCH 7/7] restore style.css file

---
 style.css | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 style.css

diff --git a/style.css b/style.css
new file mode 100644
index 0000000..c27f61e
--- /dev/null
+++ b/style.css
@@ -0,0 +1,12 @@
+/*
+Theme Name: creativecommons.org Child theme
+Theme URI: https://creativecommons.org/
+Author: Creative Commons
+Author URI: https://creativecommons.org/
+Description: creativeommons.org website child theme.
+Template: creativecommons-base
+Version: 2020.07.1
+License: GPL2 or later
+License URI: http://www.gnu.org/licenses/gpl-2.0.html
+This theme, like WordPress, is licensed under the GPL.
+*/
\ No newline at end of file