Skip to content

Commit

Permalink
Merge branch 'master' into add/twenty-twenty-global-styles
Browse files Browse the repository at this point in the history
  • Loading branch information
kjellr authored Jun 23, 2020
2 parents a261eec + 2abc1c0 commit 523f12d
Show file tree
Hide file tree
Showing 16 changed files with 472 additions and 188 deletions.
12 changes: 6 additions & 6 deletions gutenberg-starter-theme-blocks/css/blocks.css
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
}

.entry-content > .alignwide,
.site-header > .alignwide
.site-header > .alignwide,
.site-footer > .alignwide {
max-width: 1070px;
}
Expand All @@ -56,8 +56,8 @@
.site-header > *,
.site-footer > *,
.site-content > h1 {
padding-left: 0px;
padding-right: 0px;
padding-left: 0;
padding-right: 0;
}
}

Expand Down Expand Up @@ -203,7 +203,7 @@ ul.wp-block-latest-posts.is-grid.alignwide {

.entry-content li,
.site-header li,
.site-footer li, {
.site-footer li {
margin-left: 2.5em;
}

Expand All @@ -229,7 +229,7 @@ ul.wp-block-latest-posts.is-grid.alignwide {
.site-header ul ul li,
.site-header ol ol li,
.site-header ul ol li,
.site-header ol ul li
.site-header ol ul li,
.site-footer ul ul li,
.site-footer ol ol li,
.site-footer ul ol li,
Expand Down Expand Up @@ -370,4 +370,4 @@ ul.wp-block-latest-posts.is-grid.alignwide {

.has-very-dark-gray-background-color {
background-color: #444;
}
}
11 changes: 0 additions & 11 deletions parisienne/block-template-parts/about.html

This file was deleted.

37 changes: 0 additions & 37 deletions parisienne/block-template-parts/contact.html

This file was deleted.

9 changes: 0 additions & 9 deletions parisienne/block-template-parts/cover.html

This file was deleted.

8 changes: 6 additions & 2 deletions parisienne/block-template-parts/footer.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<!-- wp:group {"align":"full", "tagName": "footer", "className": "site-footer"} -->
<footer class="wp-block-group alignfull site-footer">
<!-- wp:separator {"className":"is-style-wide"} -->
<hr class="wp-block-separator is-style-wide"/>
<hr class="wp-block-separator is-style-default"/>
<!-- /wp:separator -->

<!-- wp:paragraph {"align":"center"} -->
<p class="has-text-align-center">337 Bedford Ave, Brooklyn, New York 11211</p>
<!-- /wp:paragraph -->
<!-- /wp:paragraph -->
</footer>
<!-- /wp:group -->
18 changes: 9 additions & 9 deletions parisienne/block-template-parts/header.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- wp:group {"align":"full"} -->
<div class="wp-block-group alignfull"><div class="wp-block-group__inner-container"><!-- wp:columns {"align":"full"} -->
<div class="wp-block-columns alignfull"><!-- wp:column {"width":20} -->
<div class="wp-block-column" style="flex-basis:20%"><!-- wp:navigation {"className":"is-style-dark"} -->
<!-- wp:group {"align":"full", "tagName": "header", "className": "site-header"} -->
<header class="wp-block-group alignfull"><div class="wp-block-group__inner-container"><!-- wp:columns {"align":"full"} -->
<div class="wp-block-columns alignfull"><!-- wp:column {"width":25} -->
<div class="wp-block-column" style="flex-basis:25%"><!-- wp:navigation -->
<!-- wp:navigation-link {"label":"Home","title":"Home","type":"page","id":185,"url":"/"} /-->

<!-- wp:navigation-link {"label":"About","title":"About","url":"/about"} /-->
Expand All @@ -10,12 +10,12 @@
<!-- /wp:navigation --></div>
<!-- /wp:column -->

<!-- wp:column {"width":60} -->
<div class="wp-block-column" style="flex-basis:60%"><!-- wp:site-title /--></div>
<!-- wp:column {"width":50} -->
<div class="wp-block-column" style="flex-basis:50%"><!-- wp:site-title /--></div>
<!-- /wp:column -->

<!-- wp:column {"width":20} -->
<div class="wp-block-column" style="flex-basis:20%"><!-- wp:group -->
<!-- wp:column {"width":25} -->
<div class="wp-block-column" style="flex-basis:25%"><!-- wp:group -->
<div class="wp-block-group"><div class="wp-block-group__inner-container"><!-- wp:group -->
<div class="wp-block-group"><div class="wp-block-group__inner-container"><!-- wp:paragraph {"fontSize":"small"} -->
<p class="has-small-font-size address-align">337 Bedford Ave, Brooklyn, New York 11211</p>
Expand All @@ -31,5 +31,5 @@

<!-- wp:separator {"customColor":"#decabf","className":"is-style-default"} -->
<hr class="wp-block-separator has-text-color has-background is-style-default" style="background-color:#decabf;color:#decabf"/>
<!-- /wp:separator --></div></div>
<!-- /wp:separator --></div></header>
<!-- /wp:group -->
5 changes: 0 additions & 5 deletions parisienne/block-template-parts/image-quote.html

This file was deleted.

25 changes: 0 additions & 25 deletions parisienne/block-template-parts/quick-facts.html

This file was deleted.

12 changes: 4 additions & 8 deletions parisienne/block-templates/index.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
<!-- wp:group {"align":"full","className":"site-header"} -->
<div class="wp-block-group alignfull site-header"><div class="wp-block-group__inner-container"><!-- wp:template-part {"slug":"header","theme":"parisienne"} /--></div></div>
<!-- /wp:group -->
<!-- wp:template-part {"slug":"header","theme":"parisienne"} /-->

<!-- wp:group {"align":"full","className":"site-content"} -->
<div class="wp-block-group alignfull site-content"><div class="wp-block-group__inner-container"><!-- wp:post-content /--></div></div>
<!-- wp:group {"tagName": "main", "align":"full"} -->
<main class="wp-block-group alignfull"><!-- wp:post-content /--></main>
<!-- /wp:group -->

<!-- wp:group {"align":"full","className":"site-footer"} -->
<div class="wp-block-group alignfull site-footer"><div class="wp-block-group__inner-container"><!-- wp:template-part {"slug":"footer","theme":"parisienne"} /--></div></div>
<!-- /wp:group -->
<!-- wp:template-part {"slug":"footer","theme":"parisienne"} /-->
Loading

0 comments on commit 523f12d

Please sign in to comment.