Skip to content

Commit

Permalink
Merge pull request #491 from verdigado/fix-487
Browse files Browse the repository at this point in the history 
Fix unify CSS classes of person-block and fix style in backend
  • Loading branch information
@albig
albig committed Feb 2, 2024
2 parents 1f03133 + a0ab5b8 commit dc52d54
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 33 deletions.
3 changes: 3 additions & 0 deletions assets/css/editor-style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,12 @@ body {
margin-bottom: 10px;
}

.wp-block-media-text.person .h4,
.wp-block-media-text.person .person-name {
font-size: 27px;
font-weight: 700;
font-family: "GrueneType";
margin-bottom: 1rem;
}

.d-flex .wp-block-group__inner-container {
Expand Down
16 changes: 9 additions & 7 deletions functions/block-patterns/elemente/person-2.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
<div class="wp-block-column mb-md-4"><!-- wp:columns -->
<div class="wp-block-columns"><!-- wp:column -->
<div class="wp-block-column"><!-- wp:media-text {"mediaId":152,"mediaLink":"http://localhost/demo/?attachment_id=152","mediaType":"image","className":"person has-shadow"} -->
<div class="wp-block-media-text alignwide is-stacked-on-mobile person has-shadow"><figure class="wp-block-media-text__media"><img src="https://sunflower-theme.de/demo/wp-content/uploads/sites/6/2021/01/sunflower-flower-summer-blossom-4298808-1024x682.jpg" alt="Sunflower Flower Summer Blossom - Bru-nO / Pixabay" class="wp-image-152 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Inhalt…","className":"person-name"} -->
<div class="wp-block-media-text alignwide is-stacked-on-mobile person has-shadow"><figure class="wp-block-media-text__media"><img src="https://sunflower-theme.de/demo/wp-content/uploads/sites/6/2021/01/sunflower-flower-summer-blossom-4298808-1024x682.jpg" alt="Sunflower Flower Summer Blossom - Bru-nO / Pixabay" class="wp-image-152 size-full"/></figure><div class="wp-block-media-text__content">
<!-- wp:paragraph {"placeholder":"Inhalt…","className":"person-name"} -->
<p class="person-name">Vorname Nachname-Doppelname</p>
<!-- /wp:paragraph -->

Expand Down Expand Up @@ -45,16 +46,17 @@

<!-- wp:column -->
<div class="wp-block-column"><!-- wp:media-text {"mediaId":152,"mediaLink":"http://localhost/demo/?attachment_id=152","mediaType":"image","className":"person has-shadow"} -->
<div class="wp-block-media-text alignwide is-stacked-on-mobile person has-shadow"><figure class="wp-block-media-text__media"><img src="https://sunflower-theme.de/demo/wp-content/uploads/sites/6/2021/01/sunflower-flower-summer-blossom-4298808-1024x682.jpg" alt="Sunflower Flower Summer Blossom - Bru-nO / Pixabay" class="wp-image-152 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Inhalt…","className":"h4"} -->
<p class="h4">Vorname Nachname</p>
<div class="wp-block-media-text alignwide is-stacked-on-mobile person has-shadow"><figure class="wp-block-media-text__media"><img src="https://sunflower-theme.de/demo/wp-content/uploads/sites/6/2021/01/sunflower-flower-summer-blossom-4298808-1024x682.jpg" alt="Sunflower Flower Summer Blossom - Bru-nO / Pixabay" class="wp-image-152 size-full"/></figure><div class="wp-block-media-text__content">
<!-- wp:paragraph {"placeholder":"Inhalt…","className":"person-name"} -->
<p class="person-name">Vorname Nachname</p>
<!-- /wp:paragraph -->

<!-- wp:paragraph -->
<p>Kurze Beschreibung, Amt, Mandat und/oder Zitat.</p>
<!-- wp:paragraph {"className":"person-description"} -->
<p class="person-description">Kurze Beschreibung, Amt, Mandat und/oder Zitat.</p>
<!-- /wp:paragraph -->

<!-- wp:paragraph {"className":"no-link"} -->
<p class="no-link"><a href="mailto:[email protected]">[email protected]</a></p>
<!-- wp:paragraph {"className":"person-mail no-link"} -->
<p class="person-mail no-link"><a href="mailto:[email protected]">[email protected]</a></p>
<!-- /wp:paragraph -->

<!-- wp:group {"className":"d-flex p-0"} -->
Expand Down
29 changes: 16 additions & 13 deletions functions/block-patterns/elemente/person-3.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
<div class="wp-block-column mb-md-4"><!-- wp:columns -->
<div class="wp-block-columns"><!-- wp:column -->
<div class="wp-block-column"><!-- wp:media-text {"mediaId":152,"mediaLink":"http://localhost/demo/?attachment_id=152","mediaType":"image","className":"person has-shadow"} -->
<div class="wp-block-media-text alignwide is-stacked-on-mobile person has-shadow"><figure class="wp-block-media-text__media"><img src="https://sunflower-theme.de/demo/wp-content/uploads/sites/6/2021/01/sunflower-flower-summer-blossom-4298808-1024x682.jpg" alt="Sunflower Flower Summer Blossom - Bru-nO / Pixabay" class="wp-image-152 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Inhalt…","className":"person-name"} -->
<div class="wp-block-media-text alignwide is-stacked-on-mobile person has-shadow"><figure class="wp-block-media-text__media"><img src="https://sunflower-theme.de/demo/wp-content/uploads/sites/6/2021/01/sunflower-flower-summer-blossom-4298808-1024x682.jpg" alt="Sunflower Flower Summer Blossom - Bru-nO / Pixabay" class="wp-image-152 size-full"/></figure><div class="wp-block-media-text__content">
<!-- wp:paragraph {"placeholder":"Inhalt…","className":"person-name"} -->
<p class="person-name">Vorname Nachname-Doppelname</p>
<!-- /wp:paragraph -->

Expand Down Expand Up @@ -45,16 +46,17 @@

<!-- wp:column -->
<div class="wp-block-column"><!-- wp:media-text {"mediaId":152,"mediaLink":"http://localhost/demo/?attachment_id=152","mediaType":"image","className":"person has-shadow"} -->
<div class="wp-block-media-text alignwide is-stacked-on-mobile person has-shadow"><figure class="wp-block-media-text__media"><img src="https://sunflower-theme.de/demo/wp-content/uploads/sites/6/2021/01/sunflower-flower-summer-blossom-4298808-1024x682.jpg" alt="Sunflower Flower Summer Blossom - Bru-nO / Pixabay" class="wp-image-152 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Inhalt…","className":"h4"} -->
<p class="h4">Vorname Nachname</p>
<div class="wp-block-media-text alignwide is-stacked-on-mobile person has-shadow"><figure class="wp-block-media-text__media"><img src="https://sunflower-theme.de/demo/wp-content/uploads/sites/6/2021/01/sunflower-flower-summer-blossom-4298808-1024x682.jpg" alt="Sunflower Flower Summer Blossom - Bru-nO / Pixabay" class="wp-image-152 size-full"/></figure><div class="wp-block-media-text__content">
<!-- wp:paragraph {"placeholder":"Inhalt…","className":"person-name"} -->
<p class="person-name">Vorname Nachname</p>
<!-- /wp:paragraph -->

<!-- wp:paragraph -->
<p>Kurze Beschreibung, Amt, Mandat und/oder Zitat.</p>
<!-- wp:paragraph {"className":"person-description"} -->
<p class="person-description">Kurze Beschreibung, Amt, Mandat und/oder Zitat.</p>
<!-- /wp:paragraph -->

<!-- wp:paragraph {"className":"no-link"} -->
<p class="no-link"><a href="mailto:[email protected]">[email protected]</a></p>
<!-- wp:paragraph {"className":"person-mail no-link"} -->
<p class="person-mail no-link"><a href="mailto:[email protected]">[email protected]</a></p>
<!-- /wp:paragraph -->

<!-- wp:group {"className":"d-flex p-0"} -->
Expand Down Expand Up @@ -91,16 +93,17 @@

<!-- wp:column -->
<div class="wp-block-column"><!-- wp:media-text {"mediaId":152,"mediaLink":"http://localhost/demo/?attachment_id=152","mediaType":"image","className":"person has-shadow"} -->
<div class="wp-block-media-text alignwide is-stacked-on-mobile person has-shadow"><figure class="wp-block-media-text__media"><img src="https://sunflower-theme.de/demo/wp-content/uploads/sites/6/2021/01/sunflower-flower-summer-blossom-4298808-1024x682.jpg" alt="Sunflower Flower Summer Blossom - Bru-nO / Pixabay" class="wp-image-152 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Inhalt…","className":"h4"} -->
<p class="h4">Vorname Nachname</p>
<div class="wp-block-media-text alignwide is-stacked-on-mobile person has-shadow"><figure class="wp-block-media-text__media"><img src="https://sunflower-theme.de/demo/wp-content/uploads/sites/6/2021/01/sunflower-flower-summer-blossom-4298808-1024x682.jpg" alt="Sunflower Flower Summer Blossom - Bru-nO / Pixabay" class="wp-image-152 size-full"/></figure><div class="wp-block-media-text__content">
<!-- wp:paragraph {"placeholder":"Inhalt…","className":"person-name"} -->
<p class="person-name">Vorname Nachname</p>
<!-- /wp:paragraph -->

<!-- wp:paragraph -->
<p>Kurze Beschreibung, Amt, Mandat und/oder Zitat.</p>
<!-- wp:paragraph {"className":"person-description"} -->
<p class="person-description">Kurze Beschreibung, Amt, Mandat und/oder Zitat.</p>
<!-- /wp:paragraph -->

<!-- wp:paragraph {"className":"no-link"} -->
<p class="no-link"><a href="mailto:[email protected]">[email protected]</a></p>
<!-- wp:paragraph {"className":"person-mail no-link"} -->
<p class="person-mail no-link"><a href="mailto:[email protected]">[email protected]</a></p>
<!-- /wp:paragraph -->

<!-- wp:group {"className":"d-flex p-0"} -->
Expand Down
5 changes: 0 additions & 5 deletions sass/_fonts.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,3 @@
.ptsans {
font-family: PTSans !important;
}

.bereit {
font-family: BereitBold !important;
font-weight: 500;
}
5 changes: 0 additions & 5 deletions sass/_header.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,6 @@ body {
}
}

.page-title {
color: $darkgreen;
}


// to scroll to correct position with sticky header
// while destination is an anchor
.entry-content {
Expand Down
6 changes: 4 additions & 2 deletions sass/_typography.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ h1,

font-size: 36px;
line-height: 1.2em;
color: $secondary;
}

h2,
Expand All @@ -61,6 +62,7 @@ h2,

font-size: 27px;
line-height: 1.2em;
color: $secondary;
}

h3,
Expand All @@ -73,7 +75,7 @@ h3,

font-weight: 700;
font-size: 25px;
color: $primary;
color: $secondary;
}

h4,
Expand Down Expand Up @@ -102,7 +104,7 @@ h6,
.h6 {

@include themed() {
font-family: t("headingFont");
font-family: t("standardFont");
}

font-weight: 700;
Expand Down
19 changes: 18 additions & 1 deletion sass/wp-blocks/person.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,28 @@
.person {

&-name {
font-size: 27px;
font-size: 30px;
font-weight: 700;

@include themed() {
font-family: t("headingFontBold");
}
}
}

// `h4` is for compatibility - same as class `person-name`
.h4 {
font-size: 30px;
font-weight: 700;

@include themed() {
font-family: t("headingFontBold");
}

margin-bottom: 1rem;

}

.wp-block-media-text__content {
padding: 20px;
align-self: start;
Expand Down

0 comments on commit dc52d54

Please sign in to comment.