Skip to content

Commit

Permalink
Merge pull request #52 from Netzberufler/master
Browse files Browse the repository at this point in the history
Ambitious: Added Query Loop block and updated styling of post meta and navigation blocks
  • Loading branch information
jffng authored Oct 22, 2020
2 parents e3ff68d + ceaa4b4 commit 26ed514
Show file tree
Hide file tree
Showing 21 changed files with 134 additions and 117 deletions.
2 changes: 1 addition & 1 deletion ambitious/assets/js/navigation.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
(function( $ ) {
var masthead, menuToggle, siteNavContain, siteNavigation;

masthead = $( '.wp-site-blocks > .site-header' );
masthead = $( '.wp-site-blocks .site-header' );
menuToggle = masthead.find( '.menu-toggle' );
siteNavContain = masthead.find( '.main-navigation' );
siteNavigation = masthead.find( '.main-navigation > ul.wp-block-navigation__container' );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,13 @@ <h1 class="has-white-color has-text-color has-text-align-center intro-heading ha
</div>
</div>
<!-- /wp:group -->

<!-- wp:group {"className":"type-page"} -->
<div class="wp-block-group type-page">
<div class="wp-block-group__inner-container">

<!-- wp:post-content /-->

</div>
</div>
<!-- /wp:group -->
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<div class="wp-block-group type-post">
<div class="wp-block-group__inner-container">

<!-- wp:template-part {"slug":"entry/entry-title","theme":"ambitious"} /-->
<!-- wp:template-part {"slug":"entry/entry-meta","theme":"ambitious"} /-->
<!-- wp:template-part {"slug":"entry-header","theme":"ambitious"} /-->
<!-- wp:post-excerpt /-->

</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<div class="wp-block-group type-page">
<div class="wp-block-group__inner-container">

<!-- wp:template-part {"slug":"entry-header","theme":"ambitious"} /-->
<!-- wp:post-content /-->

</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
<div class="wp-block-group type-post">
<div class="wp-block-group__inner-container">

<!-- wp:template-part {"slug":"entry/entry-title","theme":"ambitious"} /-->
<!-- wp:template-part {"slug":"entry/entry-meta","theme":"ambitious"} /-->
<!-- wp:template-part {"slug":"entry-header","theme":"ambitious"} /-->

<!-- wp:post-content /-->

<!-- wp:post-tags /-->

</div>
</div>
<!-- /wp:group -->
10 changes: 0 additions & 10 deletions ambitious/block-template-parts/content/content-page.html

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
<div class="wp-block-group entry-header">
<div class="wp-block-group__inner-container">

<!-- wp:post-date /-->
<!-- wp:post-title {"className":"entry-title"} /-->
<!-- wp:post-author /-->

<!-- wp:featured-image /-->

</div>
</div>
Expand Down
10 changes: 0 additions & 10 deletions ambitious/block-template-parts/entry/entry-meta.html

This file was deleted.

File renamed without changes.
51 changes: 51 additions & 0 deletions ambitious/block-template-parts/header.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<!-- wp:group {"className":"site-header"} -->
<div class="wp-block-group site-header">
<div class="wp-block-group__inner-container">

<!-- wp:columns {"className":"header-main"} -->
<div class="wp-block-columns header-main">

<!-- wp:column {"className":"site-branding"} -->
<div class="wp-block-column site-branding">
<!-- wp:heading {"level":1,"className":"site-title"} -->
<h1 class="site-title"><a href="/">Ambitious</a></h1>
<!-- /wp:heading -->
</div>
<!-- /wp:column -->

<!-- wp:column {"className":"main-menu-toggle"} -->
<div class="wp-block-column main-menu-toggle">
<!-- wp:html -->
<button class="menu-toggle" aria-controls="top-menu" aria-expanded="false">
<svg class="icon icon-menu" aria-hidden="true" role="img">
<use xlink:href="/wp-content/themes/ambitious/assets/icons/genericons-neue.svg#menu"></use>
</svg>
<svg class="icon icon-close" aria-hidden="true" role="img">
<use xlink:href="/wp-content/themes/ambitious/assets/icons/genericons-neue.svg#close"></use>
</svg>
<span class="menu-toggle-text">Menu</span>
</button>
<!-- /wp:html -->
</div>
<!-- /wp:column -->

<!-- wp:column {"className":"primary-navigation"} -->
<div class="wp-block-column primary-navigation">
<!-- wp:navigation {"className":"main-navigation","itemsJustification":"right"} -->
<!-- wp:navigation-link {"label":"Home","title":"Home","type":"page","url":"/"} /-->

<!-- wp:navigation-link {"label":"Services","title":"Services","url":"/services"} /-->

<!-- wp:navigation-link {"label":"About","title":"About","url":"/about"} /-->

<!-- wp:navigation-link {"label":"Blog","title":"Blog","url":"/blog"} /-->
<!-- /wp:navigation -->
</div>
<!-- /wp:column -->

</div>
<!-- /wp:columns -->

</div>
</div>
<!-- /wp:group -->
23 changes: 0 additions & 23 deletions ambitious/block-template-parts/layout/header.html

This file was deleted.

29 changes: 0 additions & 29 deletions ambitious/block-template-parts/layout/navigation.html

This file was deleted.

6 changes: 3 additions & 3 deletions ambitious/block-templates/404.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- wp:template-part {"slug":"layout/header","theme":"ambitious"} /-->
<!-- wp:template-part {"slug":"header","theme":"ambitious"} /-->

<!-- wp:group {"className":"site-content"} -->
<div class="wp-block-group site-content">
Expand All @@ -8,7 +8,7 @@
<div class="wp-block-group site-main">
<div class="wp-block-group__inner-container">

<!-- wp:template-part {"slug":"content/content-404","theme":"ambitious"} /-->
<!-- wp:template-part {"slug":"content-404","theme":"ambitious"} /-->

</div>
</div>
Expand All @@ -18,4 +18,4 @@
</div>
<!-- /wp:group -->

<!-- wp:template-part {"slug":"layout/footer","theme":"ambitious"} /-->
<!-- wp:template-part {"slug":"footer","theme":"ambitious"} /-->
10 changes: 7 additions & 3 deletions ambitious/block-templates/archive.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- wp:template-part {"slug":"layout/header","theme":"ambitious"} /-->
<!-- wp:template-part {"slug":"header","theme":"ambitious"} /-->

<!-- wp:group {"className":"site-content"} -->
<div class="wp-block-group site-content">
Expand All @@ -14,7 +14,11 @@
</p>
<!-- /wp:paragraph -->

<!-- wp:template-part {"slug":"content/content-home","theme":"ambitious"} /-->
<!-- wp:query-loop -->

<!-- wp:template-part {"slug":"content-home","theme":"ambitious"} /-->

<!-- /wp:query-loop -->

</div>
</div>
Expand All @@ -24,4 +28,4 @@
</div>
<!-- /wp:group -->

<!-- wp:template-part {"slug":"layout/footer","theme":"ambitious"} /-->
<!-- wp:template-part {"slug":"footer","theme":"ambitious"} /-->
7 changes: 3 additions & 4 deletions ambitious/block-templates/front-page.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- wp:template-part {"slug":"layout/header","theme":"ambitious"} /-->
<!-- wp:template-part {"slug":"header","theme":"ambitious"} /-->

<!-- wp:group {"className":"site-content front-page"} -->
<div class="wp-block-group site-content front-page">
Expand All @@ -8,8 +8,7 @@
<div class="wp-block-group site-main">
<div class="wp-block-group__inner-container">

<!-- wp:template-part {"slug":"front-page/front-page-intro","theme":"ambitious"} /-->
<!-- wp:template-part {"slug":"front-page/content-front-page","theme":"ambitious"} /-->
<!-- wp:template-part {"slug":"content-front-page","theme":"ambitious"} /-->

</div>
</div>
Expand All @@ -19,4 +18,4 @@
</div>
<!-- /wp:group -->

<!-- wp:template-part {"slug":"layout/footer","theme":"ambitious"} /-->
<!-- wp:template-part {"slug":"footer","theme":"ambitious"} /-->
10 changes: 7 additions & 3 deletions ambitious/block-templates/home.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- wp:template-part {"slug":"layout/header","theme":"ambitious"} /-->
<!-- wp:template-part {"slug":"header","theme":"ambitious"} /-->

<!-- wp:group {"className":"site-content"} -->
<div class="wp-block-group site-content">
Expand All @@ -8,7 +8,11 @@
<div class="wp-block-group site-main">
<div class="wp-block-group__inner-container">

<!-- wp:template-part {"slug":"content/content-home","theme":"ambitious"} /-->
<!-- wp:query-loop -->

<!-- wp:template-part {"slug":"content-home","theme":"ambitious"} /-->

<!-- /wp:query-loop -->

</div>
</div>
Expand All @@ -18,4 +22,4 @@
</div>
<!-- /wp:group -->

<!-- wp:template-part {"slug":"layout/footer","theme":"ambitious"} /-->
<!-- wp:template-part {"slug":"footer","theme":"ambitious"} /-->
6 changes: 3 additions & 3 deletions ambitious/block-templates/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- wp:template-part {"slug":"layout/header","theme":"ambitious"} /-->
<!-- wp:template-part {"slug":"header","theme":"ambitious"} /-->

<!-- wp:group {"className":"site-content"} -->
<div class="wp-block-group site-content">
Expand All @@ -8,7 +8,7 @@
<div class="wp-block-group site-main">
<div class="wp-block-group__inner-container">

<!-- wp:template-part {"slug":"content/content-page","theme":"ambitious"} /-->
<!-- wp:template-part {"slug":"content-page","theme":"ambitious"} /-->

</div>
</div>
Expand All @@ -18,4 +18,4 @@
</div>
<!-- /wp:group -->

<!-- wp:template-part {"slug":"layout/footer","theme":"ambitious"} /-->
<!-- wp:template-part {"slug":"footer","theme":"ambitious"} /-->
6 changes: 3 additions & 3 deletions ambitious/block-templates/page.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- wp:template-part {"slug":"layout/header","theme":"ambitious"} /-->
<!-- wp:template-part {"slug":"header","theme":"ambitious"} /-->

<!-- wp:group {"className":"site-content"} -->
<div class="wp-block-group site-content">
Expand All @@ -8,7 +8,7 @@
<div class="wp-block-group site-main">
<div class="wp-block-group__inner-container">

<!-- wp:template-part {"slug":"content/content-page","theme":"ambitious"} /-->
<!-- wp:template-part {"slug":"content-page","theme":"ambitious"} /-->

</div>
</div>
Expand All @@ -18,4 +18,4 @@
</div>
<!-- /wp:group -->

<!-- wp:template-part {"slug":"layout/footer","theme":"ambitious"} /-->
<!-- wp:template-part {"slug":"footer","theme":"ambitious"} /-->
6 changes: 3 additions & 3 deletions ambitious/block-templates/single.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- wp:template-part {"slug":"layout/header","theme":"ambitious"} /-->
<!-- wp:template-part {"slug":"header","theme":"ambitious"} /-->

<!-- wp:group {"className":"site-content"} -->
<div class="wp-block-group site-content">
Expand All @@ -8,7 +8,7 @@
<div class="wp-block-group site-main">
<div class="wp-block-group__inner-container">

<!-- wp:template-part {"slug":"content/content-single","theme":"ambitious"} /-->
<!-- wp:template-part {"slug":"content-single","theme":"ambitious"} /-->

</div>
</div>
Expand All @@ -18,4 +18,4 @@
</div>
<!-- /wp:group -->

<!-- wp:template-part {"slug":"layout/footer","theme":"ambitious"} /-->
<!-- wp:template-part {"slug":"footer","theme":"ambitious"} /-->
Loading

0 comments on commit 26ed514

Please sign in to comment.