From 7be0d0f801040b93b40b46cd861d5aa1c07c7dff Mon Sep 17 00:00:00 2001 From: Amor Kumar Date: Fri, 21 Jun 2024 11:44:55 -0400 Subject: [PATCH 1/7] Reorganize scss files --- assets/index.js | 2 +- assets/scss/_index.scss | 5 +++++ assets/scss/abstracts/{_abstracts.scss => _index.scss} | 0 .../{_mobile-only-mixins.scss => mobile-only-mixins.scss} | 0 .../{_responsive-mixins.scss => responsive-mixins.scss} | 0 assets/scss/abstracts/{_utility.scss => utility.scss} | 0 assets/scss/base/{_base.scss => _index.scss} | 1 + assets/scss/{components/_forms.scss => base/forms.scss} | 0 assets/scss/base/{_global.scss => global.scss} | 0 assets/scss/base/{_pagination.scss => pagination.scss} | 0 assets/scss/components/_components.scss | 3 --- assets/scss/index.scss | 6 ------ assets/scss/layout/_layout.scss | 4 ---- assets/scss/pages/_pages.scss | 5 ----- assets/scss/patterns/_index.scss | 2 ++ assets/scss/template-parts/_index.scss | 3 +++ .../{layout/_footer.scss => template-parts/footer.scss} | 0 .../{layout/_header.scss => template-parts/header.scss} | 0 assets/scss/{pages/_404.scss => templates/404.scss} | 0 assets/scss/templates/_index.scss | 4 ++++ assets/scss/{pages/_archive.scss => templates/archive.scss} | 0 assets/scss/{pages/_search.scss => templates/search.scss} | 0 22 files changed, 16 insertions(+), 19 deletions(-) create mode 100644 assets/scss/_index.scss rename assets/scss/abstracts/{_abstracts.scss => _index.scss} (100%) rename assets/scss/abstracts/{_mobile-only-mixins.scss => mobile-only-mixins.scss} (100%) rename assets/scss/abstracts/{_responsive-mixins.scss => responsive-mixins.scss} (100%) rename assets/scss/abstracts/{_utility.scss => utility.scss} (100%) rename assets/scss/base/{_base.scss => _index.scss} (83%) rename assets/scss/{components/_forms.scss => base/forms.scss} (100%) rename assets/scss/base/{_global.scss => global.scss} (100%) rename assets/scss/base/{_pagination.scss => pagination.scss} (100%) delete mode 100644 assets/scss/components/_components.scss delete mode 100644 assets/scss/index.scss delete mode 100644 assets/scss/layout/_layout.scss delete mode 100644 assets/scss/pages/_pages.scss create mode 100644 assets/scss/patterns/_index.scss create mode 100644 assets/scss/template-parts/_index.scss rename assets/scss/{layout/_footer.scss => template-parts/footer.scss} (100%) rename assets/scss/{layout/_header.scss => template-parts/header.scss} (100%) rename assets/scss/{pages/_404.scss => templates/404.scss} (100%) create mode 100644 assets/scss/templates/_index.scss rename assets/scss/{pages/_archive.scss => templates/archive.scss} (100%) rename assets/scss/{pages/_search.scss => templates/search.scss} (100%) diff --git a/assets/index.js b/assets/index.js index 5d4e1c2..3ae264f 100644 --- a/assets/index.js +++ b/assets/index.js @@ -1,2 +1,2 @@ -import './scss/index.scss'; +import './scss/_index.scss'; import './js/index'; diff --git a/assets/scss/_index.scss b/assets/scss/_index.scss new file mode 100644 index 0000000..d53e10c --- /dev/null +++ b/assets/scss/_index.scss @@ -0,0 +1,5 @@ +@import './abstracts'; +@import './base'; +@import './patterns/'; +@import './template-parts'; +@import './templates'; diff --git a/assets/scss/abstracts/_abstracts.scss b/assets/scss/abstracts/_index.scss similarity index 100% rename from assets/scss/abstracts/_abstracts.scss rename to assets/scss/abstracts/_index.scss diff --git a/assets/scss/abstracts/_mobile-only-mixins.scss b/assets/scss/abstracts/mobile-only-mixins.scss similarity index 100% rename from assets/scss/abstracts/_mobile-only-mixins.scss rename to assets/scss/abstracts/mobile-only-mixins.scss diff --git a/assets/scss/abstracts/_responsive-mixins.scss b/assets/scss/abstracts/responsive-mixins.scss similarity index 100% rename from assets/scss/abstracts/_responsive-mixins.scss rename to assets/scss/abstracts/responsive-mixins.scss diff --git a/assets/scss/abstracts/_utility.scss b/assets/scss/abstracts/utility.scss similarity index 100% rename from assets/scss/abstracts/_utility.scss rename to assets/scss/abstracts/utility.scss diff --git a/assets/scss/base/_base.scss b/assets/scss/base/_index.scss similarity index 83% rename from assets/scss/base/_base.scss rename to assets/scss/base/_index.scss index b6d41eb..382c818 100644 --- a/assets/scss/base/_base.scss +++ b/assets/scss/base/_index.scss @@ -1,3 +1,4 @@ // 'base/' keeps files styling the base HTML elements. @import './global'; @import './pagination'; +@import './forms'; diff --git a/assets/scss/components/_forms.scss b/assets/scss/base/forms.scss similarity index 100% rename from assets/scss/components/_forms.scss rename to assets/scss/base/forms.scss diff --git a/assets/scss/base/_global.scss b/assets/scss/base/global.scss similarity index 100% rename from assets/scss/base/_global.scss rename to assets/scss/base/global.scss diff --git a/assets/scss/base/_pagination.scss b/assets/scss/base/pagination.scss similarity index 100% rename from assets/scss/base/_pagination.scss rename to assets/scss/base/pagination.scss diff --git a/assets/scss/components/_components.scss b/assets/scss/components/_components.scss deleted file mode 100644 index bf1f65c..0000000 --- a/assets/scss/components/_components.scss +++ /dev/null @@ -1,3 +0,0 @@ -// 'components/' is for files styling components (e.g., posts, -// comments, grid items). -@import './forms'; diff --git a/assets/scss/index.scss b/assets/scss/index.scss deleted file mode 100644 index 79fec34..0000000 --- a/assets/scss/index.scss +++ /dev/null @@ -1,6 +0,0 @@ -@import './abstracts/abstracts'; -@import './base/base'; -@import './components/components'; -@import './layout/layout'; -@import './pages/pages'; -@import './blocks/custom/custom'; diff --git a/assets/scss/layout/_layout.scss b/assets/scss/layout/_layout.scss deleted file mode 100644 index 0a2fcf3..0000000 --- a/assets/scss/layout/_layout.scss +++ /dev/null @@ -1,4 +0,0 @@ -// 'layout/' includes styles for layout elements (grids, -// headers, footers, etc.). -@import './header'; -@import './footer'; diff --git a/assets/scss/pages/_pages.scss b/assets/scss/pages/_pages.scss deleted file mode 100644 index 6d78649..0000000 --- a/assets/scss/pages/_pages.scss +++ /dev/null @@ -1,5 +0,0 @@ -// 'templates/' houses files with template-specific styles (e.g., -// front page template styles, no-sidebar styles). -@import './archive'; -@import './search'; -@import './404'; diff --git a/assets/scss/patterns/_index.scss b/assets/scss/patterns/_index.scss new file mode 100644 index 0000000..c6b30dd --- /dev/null +++ b/assets/scss/patterns/_index.scss @@ -0,0 +1,2 @@ +// 'patterns/' houses styles for custom patterns. +// @import './pattern-name'; diff --git a/assets/scss/template-parts/_index.scss b/assets/scss/template-parts/_index.scss new file mode 100644 index 0000000..ce990cb --- /dev/null +++ b/assets/scss/template-parts/_index.scss @@ -0,0 +1,3 @@ +// 'template-parts/' houses styles for site editor template parts. +@import './header'; +@import './footer'; diff --git a/assets/scss/layout/_footer.scss b/assets/scss/template-parts/footer.scss similarity index 100% rename from assets/scss/layout/_footer.scss rename to assets/scss/template-parts/footer.scss diff --git a/assets/scss/layout/_header.scss b/assets/scss/template-parts/header.scss similarity index 100% rename from assets/scss/layout/_header.scss rename to assets/scss/template-parts/header.scss diff --git a/assets/scss/pages/_404.scss b/assets/scss/templates/404.scss similarity index 100% rename from assets/scss/pages/_404.scss rename to assets/scss/templates/404.scss diff --git a/assets/scss/templates/_index.scss b/assets/scss/templates/_index.scss new file mode 100644 index 0000000..eed7309 --- /dev/null +++ b/assets/scss/templates/_index.scss @@ -0,0 +1,4 @@ +// 'templates/' houses styles for site editor templates. +@import './archive'; +@import './search'; +@import './404'; diff --git a/assets/scss/pages/_archive.scss b/assets/scss/templates/archive.scss similarity index 100% rename from assets/scss/pages/_archive.scss rename to assets/scss/templates/archive.scss diff --git a/assets/scss/pages/_search.scss b/assets/scss/templates/search.scss similarity index 100% rename from assets/scss/pages/_search.scss rename to assets/scss/templates/search.scss From f6a5f3e9ae7342f662f8e55c255ae94e682cdbb5 Mon Sep 17 00:00:00 2001 From: Amor Kumar Date: Fri, 21 Jun 2024 11:57:23 -0400 Subject: [PATCH 2/7] Update README --- README.md | 228 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 127 insertions(+), 101 deletions(-) diff --git a/README.md b/README.md index 8e18ba9..fd7c2c3 100644 --- a/README.md +++ b/README.md @@ -76,107 +76,133 @@ Meet WDS BT, a stylish block theme, tailored for WordPress, featuring native blo ## Development
- Theme Structure -
-  
-    └── wds=bt/
-        ├── CONTRIBUTING.md
-        ├── README.md
-        ├── a11y.cjs
-        ├── assets
-        │   ├── fonts
-        │   ├── images
-        │   ├── index.js
-        │   ├── js
-        │   │   ├── block-filters
-        │   │   │   ├── index.js
-        │   │   │   └── unregister-core-embed.js
-        │   │   ├── block-variations
-        │   │   │   └── index.js
-        │   │   ├── global
-        │   │   │   ├── header.js
-        │   │   │   ├── index.js
-        │   │   │   └── table.js
-        │   │   ├── index.js
-        │   │   └── templates
-        │   │       └── index.js
-        │   └── scss
-        │       ├── abstracts
-        │       │   ├── _abstracts.scss
-        │       │   ├── _mobile-only-mixins.scss
-        │       │   ├── _responsive-mixins.scss
-        │       │   └── _utility.scss
-        │       ├── base
-        │       │   ├── _base.scss
-        │       │   ├── _global.scss
-        │       │   └── _pagination.scss
-        │       ├── blocks
-        │       │   └── core
-        │       │       ├── ...
-        │       │   └── custom
-        │       │       ├── _custom.scss
-        │       ├── components
-        │       │   ├── _components.scss
-        │       │   └── _forms.scss
-        │       ├── index.scss
-        │       ├── layout
-        │       │   ├── _footer.scss
-        │       │   ├── _header.scss
-        │       │   └── _layout.scss
-        │       └── pages
-        │           ├── _404.scss
-        │           ├── _archive.scss
-        │           ├── _pages.scss
-        │           └── _search.scss
-        ├── composer.json
-        ├── composer.lock
-        ├── functions.php
-        ├── inc
-        │   ├── functions
-        │   │   └── security.php
-        │   ├── hooks
-        │   │   ├── enable-svg.php
-        │   │   ├── enqueue-block-stylesheet.php
-        │   │   ├── register-block-categories.php
-        │   │   ├── register-block-pattern-categories.php
-        │   │   ├── register-block-styles.php
-        │   │   ├── register-block-variations.php
-        │   │   ├── remove-archive-title-prefix.php
-        │   │   └── unregister-block-variations.php
-        │   └── setup
-        │       ├── preload-scripts.php
-        │       ├── scripts.php
-        │       └── setup.php
-        ├── lefthook.yml
-        ├── package-lock.json
-        ├── package.json
-        ├── parts
-        │   ├── footer.html
-        │   └── header.html
-        ├── patterns
-        │   ├── footer-default.php
-        │   └── header-default.php
-        ├── phpcs.xml.dist
-        ├── postcss.config.js
-        ├── readme.txt
-        ├── screenshot.png
-        ├── style.css
-        ├── styles
-        │   └── dark.json
-        ├── templates
-        │   ├── 404.html
-        │   ├── archive.html
-        │   ├── index.html
-        │   ├── page-blank.html
-        │   ├── page-no-title.html
-        │   ├── page.html
-        │   ├── search.html
-        │   └── single.html
-        ├── theme.json
-        ├── webpack.config.js
-        └── webpack.prod.js
-  
- 
+ Theme Structure +
+		
+			└── wds=bt/
+				├── CONTRIBUTING.md
+				├── README.md
+				├── a11y.cjs
+				├── assets
+				│   ├── fonts
+				│   ├── images
+				│   ├── index.js
+				│   ├── js
+				│   │   ├── block-filters
+				│   │   │   ├── index.js
+				│   │   │   └── unregister-core-embed.js
+				│   │   ├── block-variations
+				│   │   │   └── index.js
+				│   │   ├── global
+				│   │   │   ├── header.js
+				│   │   │   ├── index.js
+				│   │   │   └── table.js
+				│   │   ├── index.js
+				│   │   └── templates
+				│   │       └── index.js
+				│   └── scss
+				│       ├── _index.scss
+				│       ├── abstracts
+				│       │   ├── _index.scss
+				│       │   ├── mobile-only-mixins.scss
+				│       │   ├── responsive-mixins.scss
+				│       │   └── utility.scss
+				│       ├── base
+				│       │   ├── _index.scss
+				|       |   ├── forms.scss
+				│       │   ├── global.scss
+				│       │   └── pagination.scss
+				│       ├── blocks
+				│       │   └── core
+				│       │       ├── audio.scss
+				│       │       ├── button.scss
+				│       │       ├── calendar.scss
+				│       │       ├── code.scss
+				│       │       ├── comments.scss
+				│       │       ├── cover.scss
+				│       │       ├── file.scss
+				│       │       ├── footnotes.scss
+				│       │       ├── gallery.scss
+				│       │       ├── group.scss
+				│       │       ├── latest-comments.scss
+				│       │       ├── latest-posts.scss
+				│       │       ├── list.scss
+				│       │       ├── navigation.scss
+				│       │       ├── page-list.scss
+				│       │       ├── post-author.scss
+				│       │       ├── post-comments-form.scss
+				│       │       ├── post-navigation-link.scss
+				│       │       ├── post-terms.scss
+				│       │       ├── preformatted.scss
+				│       │       ├── pullquote.scss
+				│       │       ├── query-pagination.scss
+				│       │       ├── query.scss
+				│       │       ├── quote.scss
+				│       │       ├── search.scss
+				│       │       ├── separator.scss
+				│       │       ├── social-links.scss
+				│       │       ├── table.scss
+				│       │       ├── tag-cloud.scss
+				│       │       ├── verse.scss
+				│       │       └── video.scss
+				│       ├── template-parts 
+				│       │   ├── _index.scss
+				│       │   ├── footer.scss
+				│       │   └── header.scss
+				│       └── pages
+				│           ├── _index.scss
+				│           ├── 404.scss
+				│           ├── archive.scss
+				│           └── search.scss
+				├── composer.json
+				├── composer.lock
+				├── functions.php
+				├── inc
+				│   ├── functions
+				│   │   └── security.php
+				│   ├── hooks
+				│   │   ├── enable-svg.php
+				│   │   ├── enqueue-block-stylesheet.php
+				│   │   ├── register-block-categories.php
+				│   │   ├── register-block-pattern-categories.php
+				│   │   ├── register-block-styles.php
+				│   │   ├── register-block-variations.php
+				│   │   ├── remove-archive-title-prefix.php
+				│   │   └── unregister-block-variations.php
+				│   └── setup
+				│       ├── preload-scripts.php
+				│       ├── scripts.php
+				│       └── setup.php
+				├── lefthook.yml
+				├── package-lock.json
+				├── package.json
+				├── parts
+				│   ├── footer.html
+				│   └── header.html
+				├── patterns
+				│   ├── footer-default.php
+				│   └── header-default.php
+				├── phpcs.xml.dist
+				├── postcss.config.js
+				├── readme.txt
+				├── screenshot.png
+				├── style.css
+				├── styles
+				│   └── dark.json
+				├── templates
+				│   ├── 404.html
+				│   ├── archive.html
+				│   ├── index.html
+				│   ├── page-blank.html
+				│   ├── page-no-title.html
+				│   ├── page.html
+				│   ├── search.html
+				│   └── single.html
+				├── theme.json
+				├── webpack.config.js
+				└── webpack.prod.js
+		
+	
From ed2fc1adf7c9a10bf4a08c5a6599b1060adf602d Mon Sep 17 00:00:00 2001 From: Amor Kumar Date: Fri, 21 Jun 2024 12:46:39 -0400 Subject: [PATCH 3/7] Fix typos --- README.md | 2 +- assets/scss/editor.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fd7c2c3..472d539 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,7 @@ Meet WDS BT, a stylish block theme, tailored for WordPress, featuring native blo Theme Structure
 		
-			└── wds=bt/
+			└── wds-bt/
 				├── CONTRIBUTING.md
 				├── README.md
 				├── a11y.cjs
diff --git a/assets/scss/editor.scss b/assets/scss/editor.scss
index 94b300f..3d3d903 100644
--- a/assets/scss/editor.scss
+++ b/assets/scss/editor.scss
@@ -1 +1 @@
-/* -- Editor Stykes -- */
+/* -- Editor Styles -- */

From 3f92cf75fda06330b7c297f5aac51a21bbe621ea Mon Sep 17 00:00:00 2001
From: Amor Kumar 
Date: Fri, 21 Jun 2024 12:49:28 -0400
Subject: [PATCH 4/7] Fix gitignore blocks dirs

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 270d45d..8699b80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@ vendor/
 # theme
 build/
 blocks/
+!assets/scss/blocks/
 
 #tests
 pa11y-ci-report/

From 1ac052f79e374d6e1b2cc3bb3a628a8ebc880154 Mon Sep 17 00:00:00 2001
From: Amor Kumar 
Date: Fri, 21 Jun 2024 12:54:50 -0400
Subject: [PATCH 5/7] Fix ignore rules

---
 .gitignore       | 2 --
 .stylelintignore | 1 -
 2 files changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8699b80..54236a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,8 +23,6 @@ vendor/
 
 # theme
 build/
-blocks/
-!assets/scss/blocks/
 
 #tests
 pa11y-ci-report/
diff --git a/.stylelintignore b/.stylelintignore
index c2b1520..ebb4e2c 100644
--- a/.stylelintignore
+++ b/.stylelintignore
@@ -1,4 +1,3 @@
-blocks/
 build/
 vendor/
 node_modules/

From b1209b4e4a8cfb553094600ec8dfc2b0dea761db Mon Sep 17 00:00:00 2001
From: Amor Kumar 
Date: Fri, 21 Jun 2024 12:55:05 -0400
Subject: [PATCH 6/7] Move third party block styles

---
 .../scss/blocks/{custom/_custom.scss => third-party/_index.scss}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename assets/scss/blocks/{custom/_custom.scss => third-party/_index.scss} (100%)

diff --git a/assets/scss/blocks/custom/_custom.scss b/assets/scss/blocks/third-party/_index.scss
similarity index 100%
rename from assets/scss/blocks/custom/_custom.scss
rename to assets/scss/blocks/third-party/_index.scss

From 5d912141bde9a9ee2a31f80e3ed3f0a4a4994444 Mon Sep 17 00:00:00 2001
From: Amor Kumar 
Date: Wed, 26 Jun 2024 16:53:18 -0400
Subject: [PATCH 7/7] Add blocks to gitignore

---
 .gitignore       | 1 +
 .stylelintignore | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 54236a2..5f9fbbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ vendor/
 
 # theme
 build/
+/blocks/
 
 #tests
 pa11y-ci-report/
diff --git a/.stylelintignore b/.stylelintignore
index ebb4e2c..b32bed8 100644
--- a/.stylelintignore
+++ b/.stylelintignore
@@ -1,4 +1,5 @@
 build/
+/blocks/
 vendor/
 node_modules/
 !.*.js