浏览代码

Additional clean-up

Rich Tabor 1 年之前
父节点
当前提交
ffb02bb9c6
共有 5 个文件被更改,包括 25 次插入62 次删除
  1. 3 7
      assembler/functions.php
  2. 0 25
      assembler/patterns/template-page-2.html
  3. 1 7
      assembler/style.css
  4. 19 21
      assembler/templates/page.html
  5. 2 2
      assembler/theme.json

+ 3 - 7
assembler/functions.php

@@ -10,8 +10,7 @@
 
 declare( strict_types = 1 );
 
-if ( ! function_exists( 'assembler_support' ) ) :
-
+if ( ! function_exists( 'assembler_setup' ) ) :
 	/**
 	 * Sets up theme defaults and registers support for various WordPress features.
 	 *
@@ -19,21 +18,18 @@ if ( ! function_exists( 'assembler_support' ) ) :
 	 *
 	 * @return void
 	 */
-	function assembler_support() {
+	function assembler_setup() {
 
 		// Enqueue editor styles.
 		add_editor_style( 'style.css' );
 
-		// Make theme available for translation.
-		load_theme_textdomain( 'assembler' );
 	}
 
 endif;
 
-add_action( 'after_setup_theme', 'assembler_support' );
+add_action( 'after_setup_theme', 'assembler_setup' );
 
 if ( ! function_exists( 'assembler_styles' ) ) :
-
 	/**
 	 * Enqueue styles.
 	 *

+ 0 - 25
assembler/patterns/template-page-2.html

@@ -1,25 +0,0 @@
-<!-- wp:template-part {"slug":"header"} /-->
-
-<!-- wp:group {"tagName":"main","metadata":{"name":"Main Content"},"style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"default"}} -->
-<main class="wp-block-group" style="margin-top:0;margin-bottom:0">
-    
-    <!-- wp:spacer {"height":"var:preset|spacing|30"} -->
-    <div style="height:var(--wp--preset--spacing--30)" aria-hidden="true" class="wp-block-spacer"></div>
-    <!-- /wp:spacer -->
-    
-    <!-- wp:post-title {"textAlign":"center","align":"wide"} /-->
-
-    <!-- wp:spacer {"height":"var:preset|spacing|10"} -->
-    <div style="height:var(--wp--preset--spacing--10)" aria-hidden="true" class="wp-block-spacer"></div>
-    <!-- /wp:spacer -->
-    
-    <!-- wp:post-content {"lock":{"move":false,"remove":false},"layout":{"type":"constrained"}} /-->
-    
-    <!-- wp:spacer {"height":"var:preset|spacing|30"} -->
-    <div style="height:var(--wp--preset--spacing--30)" aria-hidden="true" class="wp-block-spacer"></div>
-    <!-- /wp:spacer -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer"} /--><!-- wp:group {"tagName":"main","metadata":{"name":"Main Content"},"style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->

+ 1 - 7
assembler/style.css

@@ -18,6 +18,7 @@ footer {
     margin-top: 0 !important;
 }
 
+/* Moves core/navigation to the right on mobile. */
 .order-0 {
     order: 0;
 }
@@ -26,10 +27,6 @@ footer {
     order: 1;
 }
   
-.order-2 {
-    order: 2;
-}
-  
 @media (min-width: 600px) {
     .md\:order-0 {
         order: 0;
@@ -38,7 +35,4 @@ footer {
     .md\:order-1 {
       order: 1;
     }
-    .md\:order-2 {
-      order: 2;
-    }
   }

+ 19 - 21
assembler/templates/page.html

@@ -1,27 +1,25 @@
 <!-- wp:template-part {"slug":"header"} /-->
 
 <!-- wp:group {"tagName":"main","metadata":{"name":"Main"},"style":{"spacing":{"blockGap":"0","margin":{"top":"0"}}},"layout":{"type":"default"}} -->
-<main class="wp-block-group" style="margin-top:0"><!-- wp:spacer {"height":"var:preset|spacing|40"} -->
-<div style="height:var(--wp--preset--spacing--40)" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
+<main class="wp-block-group" style="margin-top:0">
+    
+    <!-- wp:spacer {"height":"var:preset|spacing|40"} -->
+    <div style="height:var(--wp--preset--spacing--40)" aria-hidden="true" class="wp-block-spacer"></div>
+    <!-- /wp:spacer -->
+    
+    <!-- wp:post-title {"level":1} /-->
+    
+    <!-- wp:spacer {"height":"var:preset|spacing|30","style":{"layout":[]}} -->
+    <div style="height:var(--wp--preset--spacing--30)" aria-hidden="true" class="wp-block-spacer"></div>
+    <!-- /wp:spacer -->
+    
+    <!-- wp:post-content {"lock":{"move":false,"remove":false},"layout":{"type":"constrained"}} /-->
+    
+    <!-- wp:spacer {"height":"var:preset|spacing|40"} -->
+    <div style="height:var(--wp--preset--spacing--40)" aria-hidden="true" class="wp-block-spacer"></div>
+    <!-- /wp:spacer -->
 
-<!-- wp:group {"align":"wide","layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignwide"><!-- wp:post-title {"level":1,"align":"wide"} /--></div>
-<!-- /wp:group -->
-
-<!-- wp:spacer {"height":"var:preset|spacing|20","style":{"layout":[]}} -->
-<div style="height:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"layout":{"type":"default"}} -->
-<div class="wp-block-group"><!-- wp:group {"align":"wide","layout":{"type":"default"}} -->
-<div class="wp-block-group alignwide"><!-- wp:post-content {"lock":{"move":false,"remove":false},"layout":{"type":"constrained"}} /--></div>
-<!-- /wp:group --></div>
-<!-- /wp:group -->
-
-<!-- wp:spacer {"height":"var:preset|spacing|40"} -->
-<div style="height:var(--wp--preset--spacing--40)" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer --></main>
-<!-- /wp:group -->
+    </main>
+    <!-- /wp:group -->
 
 <!-- wp:template-part {"slug":"footer"} /-->

+ 2 - 2
assembler/theme.json

@@ -286,8 +286,8 @@
 				"spacing": {
 					"padding": {
 						"bottom": "10px",
-						"left": "20px",
-						"right": "20px",
+						"left": "18px",
+						"right": "18px",
 						"top": "10px"
 					}
 				},