diff --git a/wp-dos/assets/fonts/jetbrains-mono_italic_300.woff2 b/wp-dos/assets/fonts/jetbrains-mono/jetbrains-mono-300-italic.woff2 similarity index 100% rename from wp-dos/assets/fonts/jetbrains-mono_italic_300.woff2 rename to wp-dos/assets/fonts/jetbrains-mono/jetbrains-mono-300-italic.woff2 diff --git a/wp-dos/assets/fonts/jetbrains-mono_normal_300.woff2 b/wp-dos/assets/fonts/jetbrains-mono/jetbrains-mono-300-normal.woff2 similarity index 100% rename from wp-dos/assets/fonts/jetbrains-mono_normal_300.woff2 rename to wp-dos/assets/fonts/jetbrains-mono/jetbrains-mono-300-normal.woff2 diff --git a/wp-dos/assets/fonts/overused-grotesk_italic_400.woff2 b/wp-dos/assets/fonts/overused-grotesk_italic_400.woff2 deleted file mode 100644 index a159918b07..0000000000 Binary files a/wp-dos/assets/fonts/overused-grotesk_italic_400.woff2 and /dev/null differ diff --git a/wp-dos/assets/fonts/overused-grotesk_italic_600.woff2 b/wp-dos/assets/fonts/overused-grotesk_italic_600.woff2 deleted file mode 100644 index d805bf088a..0000000000 Binary files a/wp-dos/assets/fonts/overused-grotesk_italic_600.woff2 and /dev/null differ diff --git a/wp-dos/assets/fonts/overused-grotesk_normal_400.woff2 b/wp-dos/assets/fonts/overused-grotesk_normal_400.woff2 deleted file mode 100644 index 1b74494fe3..0000000000 Binary files a/wp-dos/assets/fonts/overused-grotesk_normal_400.woff2 and /dev/null differ diff --git a/wp-dos/assets/fonts/overused-grotesk_normal_600.woff2 b/wp-dos/assets/fonts/overused-grotesk_normal_600.woff2 deleted file mode 100644 index 9f2ec981fe..0000000000 Binary files a/wp-dos/assets/fonts/overused-grotesk_normal_600.woff2 and /dev/null differ diff --git a/wp-dos/parts/comments.html b/wp-dos/parts/comments.html new file mode 100644 index 0000000000..7a131011e5 --- /dev/null +++ b/wp-dos/parts/comments.html @@ -0,0 +1,35 @@ + +
+ + + +
+
+ + +
+ + +
+ +
+
+
+ + + + +
+ + + + + + + + + + + +
+ \ No newline at end of file diff --git a/wp-dos/parts/footer.html b/wp-dos/parts/footer.html index 93410dc777..7180f84bec 100644 --- a/wp-dos/parts/footer.html +++ b/wp-dos/parts/footer.html @@ -1,37 +1 @@ - -
-
-
-
-

Linkedin

- - - -

Tumblr

- - - -

GitHub

- - - -

Mastodon

-
-
- - - -
- - - -
- - - -
-

Designed with WordPress.

-
-
-
- \ No newline at end of file + \ No newline at end of file diff --git a/wp-dos/parts/header.html b/wp-dos/parts/header.html index 5dd7f4d2b6..cf211cee85 100644 --- a/wp-dos/parts/header.html +++ b/wp-dos/parts/header.html @@ -1,43 +1 @@ - -
-
-
-
- -
-
- - - -
- - - -
- - - - -
- - - -
-
- - - -
- - - -
- - - -
-
-
- \ No newline at end of file + \ No newline at end of file diff --git a/wp-dos/parts/post-meta.html b/wp-dos/parts/post-meta.html index 25f610620e..1727013755 100644 --- a/wp-dos/parts/post-meta.html +++ b/wp-dos/parts/post-meta.html @@ -1,9 +1,83 @@ - -
-
+ +
+
+ + - + + + -
+ + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + +
- \ No newline at end of file + diff --git a/wp-dos/patterns/404.php b/wp-dos/patterns/404.php index fca5dfac89..f1d0db9973 100644 --- a/wp-dos/patterns/404.php +++ b/wp-dos/patterns/404.php @@ -1,51 +1,52 @@ - - -
- - -
-
-
-

█▄─▄▄─█─▄▄─█▄─██─▄█▄─▄▄▀█
██─▄███─██─██─██─███─▄─▄█
▀▄▄▄▀▀▀▄▄▄▄▀▀▄▄▄▄▀▀▄▄▀▄▄▀
█─▄▄─█─█─█
█─██─█─▄─█
▀▄▄▄▄▀▄▀▄▀
█▄─▄▄─█─▄▄─█▄─██─▄█▄─▄▄▀█
██─▄███─██─██─██─███─▄─▄█
▀▄▄▄▀▀▀▄▄▄▄▀▀▄▄▄▄▀▀▄▄▀▄▄▀', 'wp-dos');?>

+ +
+ + +
+
+
+

', '
', '
', '
', '
', '
', '
', '
', '
' ); ?>

- -
+ +
- -
-
-

-
- + +
+
+

+ - -
-

+ +

-

+

-
+ + + + +
- -
+ +
-
+
diff --git a/wp-dos/patterns/archive.php b/wp-dos/patterns/archive.php index 0aaca61e47..59c96f2951 100644 --- a/wp-dos/patterns/archive.php +++ b/wp-dos/patterns/archive.php @@ -1,23 +1,22 @@ - - -
- - -
-
- - - -
-
+ +
+ + +
+
+ + + +
+
+
@@ -26,27 +25,27 @@
- + - + - + - + - + - +
@@ -56,111 +55,36 @@
- -
+ +
- -
-
-
- - - - - - - - - - - - - - - - - - - - - -
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - - - - - - - - - - - - - - - - - -
-
-
+ +
- +
+ - -
+ +
-
-
-
+ + + + +

+ +
+
+
- \ No newline at end of file + diff --git a/wp-dos/patterns/footer.php b/wp-dos/patterns/footer.php index 14af31b258..d1bda2dec1 100644 --- a/wp-dos/patterns/footer.php +++ b/wp-dos/patterns/footer.php @@ -1,30 +1,32 @@ - - -
-
+ +
+
-

Linkedin', 'wp-dos');?>

+

', '' ); ?>

-

Tumblr', 'wp-dos');?>

+

', '' ); ?>

-

GitHub', 'wp-dos');?>

+

', '' ); ?>

-

Mastodon', 'wp-dos');?>

+

', '' ); ?>

@@ -39,7 +41,8 @@
-

WordPress.', 'wp-dos');?>

+

', '' ); ?>

diff --git a/wp-dos/patterns/header.php b/wp-dos/patterns/header.php index a1f4d40413..9314e116e2 100644 --- a/wp-dos/patterns/header.php +++ b/wp-dos/patterns/header.php @@ -1,14 +1,12 @@ - - -
+ +
@@ -27,26 +25,13 @@
-

Contact', 'wp-dos');?>

+

', '' ); ?>

- -
-
- - - -
- - - -
- - - -
-
-
+ +
+
\ No newline at end of file diff --git a/wp-dos/patterns/hidden-no-results-content.php b/wp-dos/patterns/hidden-no-results-content.php deleted file mode 100644 index 3ae66bb75b..0000000000 --- a/wp-dos/patterns/hidden-no-results-content.php +++ /dev/null @@ -1,11 +0,0 @@ - - - -

- diff --git a/wp-dos/patterns/home.php b/wp-dos/patterns/home.php index fbab49f15c..9add87a984 100644 --- a/wp-dos/patterns/home.php +++ b/wp-dos/patterns/home.php @@ -1,52 +1,48 @@ -
- -
-
- -
-
+ +
+
+ +
+
-
- - +
- + - + - + - + - + - +
@@ -56,110 +52,32 @@
- -
-
-
+ +
- -
-
-
- - - - - - - - - - - - - - - - - - - - - -
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - - - - - - - - - - - - - - - - - -
-
-
+ +
- -
+ +
-
-
-
+ + + + +

+ +
+
+
diff --git a/wp-dos/patterns/index.php b/wp-dos/patterns/index.php index fc5c402e51..33ca40b687 100644 --- a/wp-dos/patterns/index.php +++ b/wp-dos/patterns/index.php @@ -1,21 +1,20 @@ - - -
- - -
-
- -
-
+ +
+ + +
+
+ +
+
+
@@ -24,27 +23,27 @@
- + - + - + - + - + - +
@@ -54,110 +53,35 @@
- -
+ +
- -
-
-
- - - - - - - - - - - - - - - - - - - - - -
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - - - - - - - - - - - - - - - - - -
-
-
+ +
- +
+ - -
+ +
-
-
-
+ + + + +

+ +
+
+
diff --git a/wp-dos/patterns/page.php b/wp-dos/patterns/page.php index 81343721aa..556c783ff9 100644 --- a/wp-dos/patterns/page.php +++ b/wp-dos/patterns/page.php @@ -1,159 +1,159 @@ - - -
+ +
- -
-
-
-
+ +
+
+
+ + + +
-
- -
+ +
- + - + - + - + - + - +
- + - + - + - + - + - +
- + - + - + - + - + - +
- + - + - + - + - + - +
- + - + - + - + - + - +
-
+
diff --git a/wp-dos/patterns/search.php b/wp-dos/patterns/search.php index 17aaa606b9..5778fdf77a 100644 --- a/wp-dos/patterns/search.php +++ b/wp-dos/patterns/search.php @@ -1,27 +1,26 @@ - - -
- - -
-
- - - -
- - - -
-
+ +
+ + +
+ + + + + + +
+ +
+
+
@@ -30,27 +29,27 @@
- + - + - + - + - + - +
@@ -60,110 +59,35 @@
- -
+ +
- -
-
-
- - - - - - - - - - - - - - - - - - - - - -
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - - - - - - - - - - - - - - - - - -
-
-
+ +
- +
+ - -
+ +
-
-
-
+ + + + +

+ +
+
+
diff --git a/wp-dos/patterns/single.php b/wp-dos/patterns/single.php index 4d3986b2f3..a9971ca1eb 100644 --- a/wp-dos/patterns/single.php +++ b/wp-dos/patterns/single.php @@ -1,50 +1,44 @@ - - -
+ +
- -
-
-
-
- -
- + +
+
+
- + - + - + - + - + - +
@@ -54,134 +48,32 @@
- -
-
- - -
- - - -
-
- - -
- - -
- -
-
-
- - - - -
- - - - - - - - - - - -
-
-
+ +
- -
-
-
- - - - - - - - - - - - - - - - - - - - - -
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - - + +
+
+ - - - + +
+
+ - - - + +
+ - - - + +
+ - - -
-
-
+ +
-
+
diff --git a/wp-dos/readme.txt b/wp-dos/readme.txt index 194cda7e41..bb4e729562 100644 --- a/wp-dos/readme.txt +++ b/wp-dos/readme.txt @@ -2,8 +2,8 @@ Contributors: Automattic Requires at least: 6.0 -Tested up to: 6.5 -Requires PHP: 5.7 +Tested up to: 6.7 +Requires PHP: 7.2 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -14,9 +14,6 @@ WP-DOS is a blog theme designed for nostalgic ones. It is a tribute to the folks == Changelog == -= 1.1 = -* Changes during deploy - = 1.0.0 = * Initial release @@ -37,15 +34,13 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -WP-DOS is based on DOS (https://github.com/wordpress/dos/), (C) Automattic, [GPLv2 or later](http://www.gnu.org/licenses/gpl-2.0.html) - - == Fonts == JetBrains Mono Copyright 2020 The JetBrains Mono Project Authors (https://github.com/JetBrains/JetBrainsMono) +License: This Font Software is licensed under the SIL Open Font License, Version 1.1. +License URI: This license is available with a FAQ at: https://scripts.sil.org/OFL Source: https://www.jetbrains.com -License: This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is available with a FAQ at: https://scripts.sil.org/OFL == Images == diff --git a/wp-dos/style.css b/wp-dos/style.css index 8fc5210ac2..68b4a7e2d0 100644 --- a/wp-dos/style.css +++ b/wp-dos/style.css @@ -1,17 +1,17 @@ /* Theme Name: WP-DOS -Theme URI: +Theme URI: https://themeshaper.com/wp-dos Author: Automattic -Author URI: https://wordpress.org +Author URI: https://automattic.com/ Description: WP-DOS is a blog theme designed for nostalgic ones. It is a tribute to the folks who invented computing as we know it today. It is an exciting opportunity to test blogging as if we were back again to the green (or amber) phosphor. Requires at least: 6.0 -Tested up to: 6.5 -Requires PHP: 5.7 -Version: 1.1 +Tested up to: 6.7 +Requires PHP: 7.2 +Version: 1.0.0 License: GNU General Public License v2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Text Domain: wp-dos -Tags: blog, one-column, four-columns, wide-blocks, block-patterns, block-styles, custom-background, custom-colors, custom-header, custom-menu, editor-style, flexible-header, front-page-post-form, full-site-editing, full-width-template, post-formats, rtl-language-support, style-variations, template-editing, theme-options, threaded-comments, translation-ready +Tags: blog, wide-blocks, block-styles, full-site-editing, rtl-language-support, style-variations, threaded-comments, translation-ready /* * Control the hover stylings of outline block style. @@ -30,5 +30,5 @@ Tags: blog, one-column, four-columns, wide-blocks, block-patterns, block-styles, */ a { text-decoration-thickness: .0625em !important; - text-underline-offset: .15em; + text-underline-offset: .10em; } diff --git a/wp-dos/templates/404.html b/wp-dos/templates/404.html index 8ec87ececc..08388365f6 100644 --- a/wp-dos/templates/404.html +++ b/wp-dos/templates/404.html @@ -1,43 +1 @@ - -
- - -
-
-
-


█▄─▄▄─█─▄▄─█▄─██─▄█▄─▄▄▀█
██─▄███─██─██─██─███─▄─▄█
▀▄▄▄▀▀▀▄▄▄▄▀▀▄▄▄▄▀▀▄▄▀▄▄▀
█─▄▄─█─█─█
█─██─█─▄─█
▀▄▄▄▄▀▄▀▄▀
█▄─▄▄─█─▄▄─█▄─██─▄█▄─▄▄▀█
██─▄███─██─██─██─███─▄─▄█
▀▄▄▄▀▀▀▄▄▄▄▀▀▄▄▄▄▀▀▄▄▀▄▄▀

-
- - - -
- - - -
-
-

Oops! That page can’t be found.

-
- - - -
-

It looks like nothing was found at this location.

- - - -

Maybe try a search?

-
- - -
- - - -
-
-
- - -
- \ No newline at end of file + \ No newline at end of file diff --git a/wp-dos/templates/archive.html b/wp-dos/templates/archive.html index 3132602274..9ac3f03234 100644 --- a/wp-dos/templates/archive.html +++ b/wp-dos/templates/archive.html @@ -1,157 +1 @@ - -
- - -
-
- - - -
-
-
- -
- - - -
-
- - - - - - - - - - - - - - - - - - - - - -
-
-
- - - -
- - - -
-
-
- - - -
-
-
- - - - - - - - - - - - - - - - - - - - - -
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - - - - - - - - - - - - - - - - - -
-
-
-
- - - - -
- - - - - -
-
-
- - -
- \ No newline at end of file + \ No newline at end of file diff --git a/wp-dos/templates/index.html b/wp-dos/templates/index.html index bebff07bdb..f5add18f0f 100644 --- a/wp-dos/templates/index.html +++ b/wp-dos/templates/index.html @@ -1,155 +1 @@ - -
- - -
-
- -
-
-
- -
- - - -
-
- - - - - - - - - - - - - - - - - - - - - -
-
-
- - - -
- - - -
-
-
- - - -
-
-
- - - - - - - - - - - - - - - - - - - - - -
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - - - - - - - - - - - - - - - - - -
-
-
-
- - - - -
- - - - - -
-
-
- - -
- \ No newline at end of file + \ No newline at end of file diff --git a/wp-dos/templates/search.html b/wp-dos/templates/search.html index 5ca826c6ee..7a819db0ae 100644 --- a/wp-dos/templates/search.html +++ b/wp-dos/templates/search.html @@ -1,161 +1 @@ - -
- - -
-
- - - -
- - - -
-
-
- -
- - - -
-
- - - - - - - - - - - - - - - - - - - - - -
-
-
- - - -
- - - -
-
-
- - - -
-
-
- - - - - - - - - - - - - - - - - - - - - -
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - - - - - - - - - - - - - - - - - -
-
-
-
- - - - -
- - - - - -
-
-
- - -
- \ No newline at end of file + \ No newline at end of file diff --git a/wp-dos/templates/single.html b/wp-dos/templates/single.html index 62ac6e1af8..83c2550e09 100644 --- a/wp-dos/templates/single.html +++ b/wp-dos/templates/single.html @@ -1,179 +1 @@ - -
- - -
-
-
-
- -
- - - -
- - -
- - - - - - - - - - - - - - - - - - - - - -
-
-
- - - -
- - - -
-
- - -
- - - -
-
- - -
- - -
- -
-
-
- - - - -
- - - - - - - - - - - -
-
-
- - - -
-
-
- - - - - - - - - - - - - - - - - - - - - -
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - - - - - - - - - - - - - - - - - -
-
-
-
-
- - -
- \ No newline at end of file + \ No newline at end of file diff --git a/wp-dos/theme.json b/wp-dos/theme.json index b88f4704a5..ba1885e68a 100644 --- a/wp-dos/theme.json +++ b/wp-dos/theme.json @@ -71,6 +71,49 @@ "wideSize": "1200px" }, "spacing": { + "customSpacingSize": true, + "spacingScale": { + "theme": { + "steps": 0 + } + }, + "spacingSizes": [ + { + "name": "2X-Small", + "size": "0.5rem", + "slug": "20" + }, + { + "name": "X-Small", + "size": "clamp(0.5rem, 1vw, 1rem)", + "slug": "30" + }, + { + "name": "Small", + "size": "clamp(0.75rem, 1.5vw, 1.5rem)", + "slug": "40" + }, + { + "name": "Medium", + "size": "clamp(1rem, 2vw, 2rem)", + "slug": "50" + }, + { + "name": "Large", + "size": "clamp(1.5rem, 3vw, 3rem)", + "slug": "60" + }, + { + "name": "X-Large", + "size": "clamp(2rem, 4vw, 4rem)", + "slug": "70" + }, + { + "name": "2X-Large", + "size": "clamp(3rem, 6vw, 6rem)", + "slug": "80" + } + ], "units": [ "%", "px", @@ -84,27 +127,22 @@ "defaultFontSizes": false, "fluid": true, "fontFamilies": [ - { - "fontFamily": "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif", - "name": "System Font", - "slug": "system-font" - }, { "fontFace": [ { - "fontFamily": "\"JetBrains Mono\"", + "fontFamily": "JetBrains Mono", "fontStyle": "normal", "fontWeight": "300", - "src": "file:./assets/fonts/jetbrains-mono_normal_300.woff2" + "src": "file:./assets/fonts/jetbrains-mono/jetbrains-mono-300-normal.woff2" }, { - "fontFamily": "\"JetBrains Mono\"", + "fontFamily": "JetBrains Mono", "fontStyle": "italic", "fontWeight": "300", - "src": "file:./assets/fonts/jetbrains-mono_italic_300.woff2" + "src": "file:./assets/fonts/jetbrains-mono/jetbrains-mono-300-italic.woff2" } ], - "fontFamily": "\"JetBrains Mono\", monospace", + "fontFamily": "JetBrains Mono, monospace", "name": "JetBrains Mono", "slug": "jetbrains-mono" } @@ -116,7 +154,7 @@ "min": "1rem" }, "name": "Small", - "size": "1rem", + "size": "1.0625rem", "slug": "small" }, { @@ -125,7 +163,7 @@ "min": "1rem" }, "name": "Medium", - "size": "1rem", + "size": "1.0625rem", "slug": "medium" }, { @@ -134,7 +172,7 @@ "min": "1rem" }, "name": "Large", - "size": "1rem", + "size": "1.0625rem", "slug": "large" }, { @@ -143,7 +181,7 @@ "min": "1rem" }, "name": "Extra Large", - "size": "1rem", + "size": "1.0625rem", "slug": "x-large" } ] @@ -212,7 +250,8 @@ "core/comments": { "spacing": { "margin": { - "top": "10vh" + "bottom": "0", + "top": "var(--wp--preset--spacing--80)" } } }, @@ -296,13 +335,14 @@ "core/post-comments-form": { "spacing": { "margin": { - "top": "5vh" + "bottom": "var(--wp--preset--spacing--70)", + "top": "var(--wp--preset--spacing--70)" } } }, "core/post-content": { "spacing": { - "blockGap": "var(--wp--preset--spacing--20)" + "blockGap": "var(--wp--preset--spacing--50)" } }, "core/post-date": { @@ -487,6 +527,14 @@ "fontWeight": "700", "lineHeight": "1.5" } + }, + "core/spacer": { + "spacing": { + "margin": { + "bottom": "0", + "top": "0" + } + } } }, "color": { @@ -596,11 +644,23 @@ "templateParts": [ { "area": "header", - "name": "header" + "name": "header", + "title": "Header" + }, + { + "area": "uncategorized", + "name": "post-meta", + "title": "Post Meta" + }, + { + "area": "uncategorized", + "name": "comments", + "title": "Comments" }, { "area": "footer", - "name": "footer" + "name": "footer", + "title": "Footer" } ], "version": 3,