diff --git a/assembler/functions.php b/assembler/functions.php index 2d3c072a07..2277a4e088 100644 --- a/assembler/functions.php +++ b/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 @@ * * @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. * diff --git a/assembler/parts/byline-date.html b/assembler/parts/byline-date.html deleted file mode 100644 index 0a1d59073e..0000000000 --- a/assembler/parts/byline-date.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/assembler/parts/comments.html b/assembler/parts/comments.html new file mode 100644 index 0000000000..521c29cbbb --- /dev/null +++ b/assembler/parts/comments.html @@ -0,0 +1,40 @@ + +
+ + +
+ + + + + +
+
+ + + +
+
+ + + +
+ + + + +
+
+ + + + + + + + + +
+ +
+ \ No newline at end of file diff --git a/assembler/parts/footer.html b/assembler/parts/footer.html index 00d94daee5..ac13973686 100644 --- a/assembler/parts/footer.html +++ b/assembler/parts/footer.html @@ -1 +1,78 @@ - + + + + + +
+ + + + +
+
+

Location

+ + + + + + + +

123 Example Street

+ + + +

San Francisco, CA 12345

+
+ + + +
+

Hours

+ + + + + + + +

Monday—Friday

+ + + +

8am — 6pm

+
+ + + +
+

Contact

+ + + + + + + +

hi@example.com

+ + + +

(123) 456-7890

+
+
+ + + + + + + +

+ Designed with WordPress

+ + + + +
+ \ No newline at end of file diff --git a/assembler/parts/header.html b/assembler/parts/header.html index 5122b6bba5..b5efd92840 100644 --- a/assembler/parts/header.html +++ b/assembler/parts/header.html @@ -1 +1,27 @@ - + +
+ + + + +
+
+
+
+ + + +
+ + +
+
Learn more
+
+
+
+ + + + +
+ \ No newline at end of file diff --git a/assembler/parts/post-meta.html b/assembler/parts/post-meta.html deleted file mode 100644 index 484fbea5b1..0000000000 --- a/assembler/parts/post-meta.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/assembler/patterns/byline-date.php b/assembler/patterns/byline-date.php deleted file mode 100644 index a1093da330..0000000000 --- a/assembler/patterns/byline-date.php +++ /dev/null @@ -1,22 +0,0 @@ - - -
-

- - - - - -

- - -
- diff --git a/assembler/patterns/footer.php b/assembler/patterns/footer.php deleted file mode 100644 index 3e26ba33be..0000000000 --- a/assembler/patterns/footer.php +++ /dev/null @@ -1,32 +0,0 @@ - - - - -
-
-
- - - -

- WordPress'; - echo sprintf( - esc_html__( 'Designed with %1$s', 'assembler' ), - $wordpress_link - ); - ?> -

-
-
- diff --git a/assembler/patterns/header.php b/assembler/patterns/header.php deleted file mode 100644 index 82c2c55cd3..0000000000 --- a/assembler/patterns/header.php +++ /dev/null @@ -1,25 +0,0 @@ - - - - -
-
-
-
-
- - - -
-
-
- diff --git a/assembler/patterns/post-meta.php b/assembler/patterns/post-meta.php deleted file mode 100644 index 9ec91586c0..0000000000 --- a/assembler/patterns/post-meta.php +++ /dev/null @@ -1,19 +0,0 @@ - - - - -
-
-
-
-
- diff --git a/assembler/patterns/template-page-w-title.php b/assembler/patterns/template-page-w-title.php new file mode 100644 index 0000000000..714b42d6d5 --- /dev/null +++ b/assembler/patterns/template-page-w-title.php @@ -0,0 +1,35 @@ + + + + + +
+ + + + + + + + + + + + + + + + + +
+ + + \ No newline at end of file diff --git a/assembler/readme.txt b/assembler/readme.txt index b535ed23e2..1f1637b162 100644 --- a/assembler/readme.txt +++ b/assembler/readme.txt @@ -6,6 +6,10 @@ Requires PHP: 7.0 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html +== Description == + +Assemble something beautiful. + == Changelog == = 0.0.1 = diff --git a/assembler/style.css b/assembler/style.css index ee2208d52b..2a318cc52a 100644 --- a/assembler/style.css +++ b/assembler/style.css @@ -3,7 +3,7 @@ Theme Name: Assembler Theme URI: https://wordpress.com/theme/assembler Author: Automattic Author URI: https://automattic.com/ -Description: Assembler is a simple, minimal theme that supports full-site editing and global styles. Use it to create something beautiful. +Description: Assemble something beautiful. Requires at least: 6.4 Tested up to: 6.4 Requires PHP: 7.0 @@ -13,3 +13,26 @@ License URI: http://www.gnu.org/licenses/gpl-2.0.html Text Domain: assembler Tags: blog, one-column, three-columns, wide-blocks, block-patterns, custom-colors, custom-logo, custom-menu, editor-style, featured-images, full-site-editing, rtl-language-support, style-variations, template-editing, theme-options, threaded-comments, translation-ready */ + +footer { + margin-top: 0 !important; +} + +/* Moves core/navigation to the right on mobile. */ +.order-0 { + order: 0; +} + +.order-1 { + order: 1; +} + +@media (min-width: 600px) { + .md\:order-0 { + order: 0; + } + + .md\:order-1 { + order: 1; + } + } \ No newline at end of file diff --git a/assembler/templates/archive.html b/assembler/templates/archive.html new file mode 100644 index 0000000000..f92d0d0b03 --- /dev/null +++ b/assembler/templates/archive.html @@ -0,0 +1,40 @@ + + + + +
+
+ + + +
+
+
+
+ + + + + + + + + + + + +
+ + + + +
+ + + +
+
+
+ + + \ No newline at end of file diff --git a/assembler/templates/home.html b/assembler/templates/home.html new file mode 100644 index 0000000000..069a24a7fe --- /dev/null +++ b/assembler/templates/home.html @@ -0,0 +1,7 @@ + + + +
+ + + \ No newline at end of file diff --git a/assembler/templates/index.html b/assembler/templates/index.html index 9fc9c1e13a..f92d0d0b03 100644 --- a/assembler/templates/index.html +++ b/assembler/templates/index.html @@ -1,37 +1,40 @@ - -
-
- -
-
-
-
- - - - - - - - - - - - -
- - - - -
- - - -
-
-
- - - + + +
+
+ + + +
+
+
+
+ + + + + + + + + + + + +
+ + + + +
+ + + +
+
+
+ + + \ No newline at end of file diff --git a/assembler/templates/page.html b/assembler/templates/page.html index f95f8d207e..bfe35188b5 100644 --- a/assembler/templates/page.html +++ b/assembler/templates/page.html @@ -1,14 +1,11 @@ - -
- -
- + +
+ + - -
-
+
- + \ No newline at end of file diff --git a/assembler/templates/search.html b/assembler/templates/search.html new file mode 100644 index 0000000000..6eb32f5160 --- /dev/null +++ b/assembler/templates/search.html @@ -0,0 +1,57 @@ + + + +
+ + + + +
+ + + + +
+ +
+
+
+
+ + + + + + + + + + + + +
+ +
+ + + +
+ + + + + +
+ + + + +
+ + + + +
+ + + \ No newline at end of file diff --git a/assembler/templates/single.html b/assembler/templates/single.html index 2104f13028..07411088c7 100644 --- a/assembler/templates/single.html +++ b/assembler/templates/single.html @@ -1,61 +1,31 @@ - -
-
- - - -
- - - -
- - - -
-
- - - -
-
- - - -
-
- - - -
- - - - -
-
- - - - - - - - - -
-
- - - -
-
- -
-
-
- - - + +
+ + + + + + + + + + +
+ + + + + + + + + + + + +
+ + + \ No newline at end of file diff --git a/assembler/templates/template-page-w-title.html b/assembler/templates/template-page-w-title.html new file mode 100644 index 0000000000..2540efd21b --- /dev/null +++ b/assembler/templates/template-page-w-title.html @@ -0,0 +1 @@ + diff --git a/assembler/theme.json b/assembler/theme.json index 404499633f..4ef7d5cd3e 100644 --- a/assembler/theme.json +++ b/assembler/theme.json @@ -1,6 +1,10 @@ { - "version": 2, - "$schema": "https://schemas.wp.org/trunk/theme.json", + "customTemplates": [ + { + "name": "template-page-w-title", + "title": "Pages with Title" + } + ], "settings": { "appearanceTools": true, "color": { @@ -29,7 +33,7 @@ "slug": "theme-4" }, { - "color": "#000000", + "color": "#1E1E1E", "name": "Color 5", "slug": "theme-5" } @@ -95,14 +99,18 @@ "fontStretch": "normal", "fontStyle": "normal", "fontWeight": "100 800", - "src": ["file:./assets/fonts/inter/InterVariable.ttf"] + "src": [ + "file:./assets/fonts/inter/InterVariable.ttf" + ] }, { "fontFamily": "Inter", "fontStretch": "normal", "fontStyle": "italic", "fontWeight": "100 800", - "src": ["file:./assets/fonts/inter/InterVariable-Italic.ttf"] + "src": [ + "file:./assets/fonts/inter/InterVariable-Italic.ttf" + ] } ], "fontFamily": "\"Inter\", sans-serif", @@ -148,7 +156,9 @@ "fontStretch": "normal", "fontStyle": "normal", "fontWeight": "100 800", - "src": ["file:./assets/fonts/vina-sans/VinaSans-Regular.ttf"] + "src": [ + "file:./assets/fonts/vina-sans/VinaSans-Regular.ttf" + ] } ], "fontFamily": "\"Vina Sans\", sans-serif", @@ -194,7 +204,9 @@ "fontStretch": "normal", "fontStyle": "normal", "fontWeight": "100 800", - "src": ["file:./assets/fonts/rubik/Rubik-VariableFont_wght.ttf"] + "src": [ + "file:./assets/fonts/rubik/Rubik-VariableFont_wght.ttf" + ] } ], "fontFamily": "\"Rubik\", sans-serif", @@ -205,27 +217,27 @@ "fontSizes": [ { "name": "Small", - "size": "12px", + "size": "15px", "slug": "small" }, { "name": "Medium", - "size": "16px", + "size": "26px", "slug": "medium" }, { "name": "Large", - "size": "30px", + "size": "40.5px", "slug": "large" }, { "name": "Extra Large", - "size": "60px", + "size": "60.75px", "slug": "x-large" }, { "name": "2X Large", - "size": "96px", + "size": "95.95px", "slug": "xx-large" } ], @@ -235,10 +247,49 @@ }, "styles": { "blocks": { + "core/button": { + "variations": { + "outline": { + "border": { + "width": "1px" + }, + "spacing": { + "padding": { + "bottom": "9px", + "left": "19px", + "right": "19px", + "top": "9px" + } + } + } + } + }, + "core/buttons": { + "spacing": { + "blockGap": "8px" + } + }, + "core/navigation": { + "typography": { + "fontSize": "var(--wp--preset--font-size--small)" + } + }, + "core/post-title": { + "css": ":not([class*=\"text-align-\"]){text-align:center;}", + "typography": { + "fontSize": "var(--wp--preset--font-size--x-large)" + } + }, "core/site-title": { + "elements": { + "link": { + "typography": { + "textDecoration": "none" + } + } + }, "typography": { - "fontSize": "var(--wp--preset--font-size--medium)", - "fontWeight": "600" + "fontSize": "var(--wp--preset--font-size--medium)" } } }, @@ -250,7 +301,7 @@ "elements": { "button": { "border": { - "radius": "0" + "radius": "6px" }, "color": { "background": { @@ -262,22 +313,17 @@ }, "spacing": { "padding": { - "bottom": "16px", - "top": "16px", - "left": "24px", - "right": "24px" + "bottom": "10px", + "left": "20px", + "right": "20px", + "top": "10px" } }, "typography": { "fontFamily": { "ref": "styles.elements.heading.typography.fontFamily" }, - "fontWeight": { - "ref": "styles.elements.heading.typography.fontWeight" - }, - "textTransform": { - "ref": "styles.elements.heading.typography.textTransform" - } + "fontSize": "var(--wp--preset--font-size--small)" } }, "h1": { @@ -317,15 +363,17 @@ "fontSize": "var(--wp--preset--font-size--small)" } }, - "link": { - "color": { - "text": { "ref": "styles.color.text" } - } - }, "heading": { "typography": { "fontWeight": "500" } + }, + "link": { + "color": { + "text": { + "ref": "styles.color.text" + } + } } }, "spacing": { @@ -340,5 +388,19 @@ "fontSize": "16px", "lineHeight": "1.65" } - } -} + }, + "templateParts": [ + { + "area": "header", + "name": "header", + "title": "Header" + }, + { + "area": "footer", + "name": "footer", + "title": "Footer" + } + ], + "version": 2, + "$schema": "https://schemas.wp.org/trunk/theme.json" +} \ No newline at end of file