Compare commits

..

No commits in common. "fc64b2a8594e16aec088eaa6276d24b99a4d1c33" and "72cea08e621f187ec3a89520a323accf5aa56aaa" have entirely different histories.

9 changed files with 38 additions and 87 deletions

View File

@ -1927,13 +1927,11 @@ Add your custom styles in this file so it is easier to update the theme.
padding-bottom: 4rem; padding-bottom: 4rem;
} }
.edit-post-visual-editor__content-area .editor-styles-wrapper .site-main > article.xarxaprod-ajut, .edit-post-visual-editor__content-area .editor-styles-wrapper .site-main > article.xarxaprod-ajut {
.edit-post-visual-editor__content-area .editor-styles-wrapper .site-main > article.category-activitats {
display: grid; display: grid;
} }
.edit-post-visual-editor__content-area .editor-styles-wrapper .site-main > article.xarxaprod-ajut > *, .edit-post-visual-editor__content-area .editor-styles-wrapper .site-main > article.xarxaprod-ajut > * {
.edit-post-visual-editor__content-area .editor-styles-wrapper .site-main > article.category-activitats > * {
max-width: 40rem; max-width: 40rem;
} }
@ -1954,14 +1952,6 @@ Add your custom styles in this file so it is easier to update the theme.
max-width: unset; max-width: unset;
} }
.edit-post-visual-editor__content-area .editor-styles-wrapper .site-main > article > header {
margin-bottom: 1rem;
}
.edit-post-visual-editor__content-area .editor-styles-wrapper .site-main > article > aside {
margin-bottom: 1rem;
}
.edit-post-visual-editor__content-area .editor-styles-wrapper .site-main > section { .edit-post-visual-editor__content-area .editor-styles-wrapper .site-main > section {
padding-bottom: 4rem; padding-bottom: 4rem;
} }
@ -2010,7 +2000,6 @@ Add your custom styles in this file so it is easier to update the theme.
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin-bottom: 1rem;
} }
.edit-post-visual-editor__content-area .editor-styles-wrapper .xarxaprod-faqs-aside .xarxaprod-search-form:hover, .edit-post-visual-editor__content-area .editor-styles-wrapper .xarxaprod-faqs-aside .xarxaprod-search-form:hover,
@ -2794,6 +2783,7 @@ Add your custom styles in this file so it is easier to update the theme.
.edit-post-visual-editor__content-area .editor-styles-wrapper .xarxaprod-cards .wp-block-post-title, .edit-post-visual-editor__content-area .editor-styles-wrapper .xarxaprod-cards .wp-block-post-title,
.edit-post-visual-editor__content-area .editor-styles-wrapper .category-convocatories .wp-block-post-title, .edit-post-visual-editor__content-area .editor-styles-wrapper .category-convocatories .wp-block-post-title,
.edit-post-visual-editor__content-area .editor-styles-wrapper .category-rec .wp-block-post-title { .edit-post-visual-editor__content-area .editor-styles-wrapper .category-rec .wp-block-post-title {
text-transform: lowercase;
font-size: 1.5rem; font-size: 1.5rem;
margin-bottom: 0.5em; margin-bottom: 0.5em;
padding-bottom: 0.5em; padding-bottom: 0.5em;
@ -2980,9 +2970,7 @@ Add your custom styles in this file so it is easier to update the theme.
} }
.edit-post-visual-editor__content-area .editor-styles-wrapper .single-xarxaprod-convo .xarxaprod-convo-info-fields li, .edit-post-visual-editor__content-area .editor-styles-wrapper .single-xarxaprod-convo .xarxaprod-convo-info-fields li,
.edit-post-visual-editor__content-area .editor-styles-wrapper .single-xarxaprod-convo .xarxaprod-agenda-info li, .edit-post-visual-editor__content-area .editor-styles-wrapper .single-xarxaprod-convo .xarxaprod-agenda-info li {
.edit-post-visual-editor__content-area .editor-styles-wrapper .single-post .category-activitats .xarxaprod-convo-info-fields li,
.edit-post-visual-editor__content-area .editor-styles-wrapper .single-post .category-activitats .xarxaprod-agenda-info li {
font-size: 1.5rem; font-size: 1.5rem;
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -404,6 +404,7 @@
justify-content: flex-end; justify-content: flex-end;
padding-bottom: $font__size-body * 2; padding-bottom: $font__size-body * 2;
.wp-block-post-title { .wp-block-post-title {
text-transform: lowercase;
font-size: $font__size-body*1.5; font-size: $font__size-body*1.5;
margin-bottom: 0.5em; margin-bottom: 0.5em;
padding-bottom: 0.5em; padding-bottom: 0.5em;
@ -596,8 +597,7 @@
.archive-posts { .archive-posts {
//grid-template-columns: repeat(2 , minmax(0,1fr)); //grid-template-columns: repeat(2 , minmax(0,1fr));
} }
.single-xarxaprod-convo, .single-xarxaprod-convo {
.single-post .category-activitats{
.xarxaprod-convo-info-fields, .xarxaprod-convo-info-fields,
.xarxaprod-agenda-info { .xarxaprod-agenda-info {
li { li {

View File

@ -206,8 +206,7 @@
padding-top: 4rem; padding-top: 4rem;
> article { > article {
padding-bottom: 4rem; padding-bottom: 4rem;
&.xarxaprod-ajut, &.xarxaprod-ajut {
&.category-activitats {
display: grid; display: grid;
> * { > * {
max-width: 40rem; max-width: 40rem;
@ -230,12 +229,6 @@
max-width: unset; max-width: unset;
} }
} }
> header {
margin-bottom: 1rem;
}
> aside {
margin-bottom: 1rem;
}
} }
> section { > section {
padding-bottom: 4rem; padding-bottom: 4rem;
@ -281,7 +274,6 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin-bottom: 1rem;
.xarxaprod-search-form { .xarxaprod-search-form {
&:hover,&:active,&:focus,&:target { &:hover,&:active,&:focus,&:target {
flex-grow: 1; flex-grow: 1;

View File

@ -1792,13 +1792,11 @@ textarea {
padding-bottom: 4rem; padding-bottom: 4rem;
} }
.site-main > article.xarxaprod-ajut, .site-main > article.xarxaprod-ajut {
.site-main > article.category-activitats {
display: grid; display: grid;
} }
.site-main > article.xarxaprod-ajut > *, .site-main > article.xarxaprod-ajut > * {
.site-main > article.category-activitats > * {
max-width: 40rem; max-width: 40rem;
} }
@ -1819,14 +1817,6 @@ textarea {
max-width: unset; max-width: unset;
} }
.site-main > article > header {
margin-bottom: 1rem;
}
.site-main > article > aside {
margin-bottom: 1rem;
}
.site-main > section { .site-main > section {
padding-bottom: 4rem; padding-bottom: 4rem;
} }
@ -1875,7 +1865,6 @@ textarea {
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin-bottom: 1rem;
} }
.xarxaprod-faqs-aside .xarxaprod-search-form:hover, .xarxaprod-faqs-aside .xarxaprod-search-form:hover,
@ -2632,6 +2621,7 @@ textarea {
.xarxaprod-cards .wp-block-post-title, .xarxaprod-cards .wp-block-post-title,
.category-convocatories .wp-block-post-title, .category-convocatories .wp-block-post-title,
.category-rec .wp-block-post-title { .category-rec .wp-block-post-title {
text-transform: lowercase;
font-size: 1.5rem; font-size: 1.5rem;
margin-bottom: 0.5em; margin-bottom: 0.5em;
padding-bottom: 0.5em; padding-bottom: 0.5em;
@ -2831,9 +2821,7 @@ textarea {
} }
.single-xarxaprod-convo .xarxaprod-convo-info-fields li, .single-xarxaprod-convo .xarxaprod-convo-info-fields li,
.single-xarxaprod-convo .xarxaprod-agenda-info li, .single-xarxaprod-convo .xarxaprod-agenda-info li {
.single-post .category-activitats .xarxaprod-convo-info-fields li,
.single-post .category-activitats .xarxaprod-agenda-info li {
font-size: 1.5rem; font-size: 1.5rem;
} }

File diff suppressed because one or more lines are too long

View File

@ -12,45 +12,23 @@
<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<header class="entry-header"> <header class="entry-header">
<h1 class="entry-title"> <h1 class="entry-title">
<?php the_title(); ?> <?php the_title(); ?>
</h1> </h1>
<?php
if ( 'post' === get_post_type() ) :
?>
<div class="entry-meta">
<?php if ( in_category('faq') ){
// display each faq category of the post as label
xarxaprod_display_each_faq_categories();
} ;?>
</div><!-- .entry-meta -->
<?php endif; ?>
</header><!-- .entry-header --> </header><!-- .entry-header -->
<?php
if ( 'post' === get_post_type() ) : <div class="entry-content">
?>
<?php if ( in_category('faq') ){ ?>
<aside class="entry-meta">
<?php xarxaprod_display_each_faq_categories(); // display each faq category of the post as label ?>
</aside><!-- .entry-meta -->
<?php } ;?>
<?php endif; ?>
<?php if ( in_category('activitats') ){ ?>
<aside class="xarxaprod-activity-info xarxaprod-agenda-info">
<ul>
<li class="activity-organizer organiza-activitat">
<?php if( get_field('xxp_agenda_free_text') ): ?>
<p class="item-xxp-agenda-free-text">
<?php the_field('xxp_agenda_free_text'); ?>
</p>
<?php endif; ?>
</li>
<?php if( get_field('xxp_agenda_date_start') || get_field('xxp_agenda_date_start') || get_field('xxp_agenda_free_text') ): ?>
<li class="agenda-date agenda-data">
<p>
<?php if( get_field('xxp_agenda_date_start') ){ ?>
<span class="item-xxp-agenda-date-start">el <?php the_field('xxp_agenda_date_start'); ?></span>
<?php } elseif ( get_field('xxp_agenda_date_end') ){ ?>
<span class="item-xxp-agenda-date-end">fins al<?php the_field('xxp_agenda_date_end'); ?></span>
<?php } elseif ( get_field('xxp_agenda_free_text') ){?>
<span class="item-xxp-agenda-free-text"><?php the_field('xxp_agenda_free_text'); ?></span>
<?php }; ?>
</p>
</li>
<?php endif; ?>
</ul>
</aside>
<?php }; ?>
<main class="entry-content">
<?php <?php
the_content( the_content(
sprintf( sprintf(
@ -74,7 +52,7 @@
) )
); );
?> ?>
</main><!-- .entry-content --> </div><!-- .entry-content -->
<footer class="entry-footer"> <footer class="entry-footer">
<?php //xarxaprod_entry_footer(); ?> <?php //xarxaprod_entry_footer(); ?>

View File

@ -56,9 +56,14 @@
</a> </a>
</header><!-- .entry-header --> </header><!-- .entry-header -->
<section class="activity-organizer organiza-activitat"> <section class="activity-organizer organiza-activitat">
<?php if( get_field('xxp_agenda_free_text') ): ?> <?php if( get_field('xxp_agenda_who') ): ?>
<p class="item-xxp-agenda-free-text"> <?php $allwhoproposes = get_field('xxp_agenda_who'); ?>
<?php the_field('xxp_agenda_free_text'); ?> <p class="item-xxp-agenda-who">
<?php
foreach( $allwhoproposes as $eachwhoproposes ):
echo $eachwhoproposes['label'];
endforeach;
?>
</p> </p>
<?php endif; ?> <?php endif; ?>
</section> </section>