Skip to content

Commit

Permalink
Merge branch 'release/1.8.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@pvert
pvert committed Dec 28, 2017
2 parents add32c0 + 4716dee commit 3c894f0
Show file tree
Hide file tree
Showing 9 changed files with 276 additions and 243 deletions.
26 changes: 24 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,32 @@
Wordpress - Thème Aeris
===

Thème construit à partir du starter theme `_s`, or `underscores`. http://underscores.me/
## Release notes
### 1.8.0

- Correctif sur l'image des posts: ajout de l'image size "single-article"
- Nouvelle page d'accueil par défaut home.php, intégrant les zones de widgets "homepage", en remplacement de homepage custom (template-homepage.php)
- add template pour les posts embarqués (figure / titre / date / tags )
- correctifs css sur les zones de widgets "homepage"


### 1.7.10

Ajout d'une condition sur les items de menu pour l'utilisation du modèle de page "Catalogue / application Webcomponents" > inc/custom-nav.php

1.7.9 >> FAIL sur numéro de version dans CSS

### 1.7.8

Ajout du modèle de page "Catalogue / application Webcomponents" > template-catalogue.php
CSS pour redimensionner le header et supprimer le footer
Suppression du modèle de page "Page vierge pour divi builder" > template-blank.php

### 1.7.7

ajout gestion des nouvelles couleurs dans le customizer avec color picker > inc/customizer.php


Doc à rédiger...
---------------


29 changes: 24 additions & 5 deletions css/boxes.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ body {
.default[id="content-area"] main,
aside > section,
.home main > article,
[role="listNews"] article {
[role="listNews"] article,
[role="homepage-mdleft-widget-area"] > section,
.widget[class*="feed"] ul {
background: #fff none repeat scroll 0 0;
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
}
Expand All @@ -37,6 +39,9 @@ aside > section,
.default[id="content-area"] main {
margin-bottom: 20px;
margin-top: 20px;
}

.default[id="content-area"] main {
padding-bottom: 40px;
}

Expand Down Expand Up @@ -64,18 +69,32 @@ section.widget_calendar {
padding-bottom: 0;
}

aside > section .calendar_wrap {
aside > section .calendar_wrap,
[role="listNews"] article > header > :not(figure),
.post-excerpt,
[role="homepage-mdleft-widget-area"] > section > h2{
padding:20px;
}

.widget[class*="feed"] ul {
padding:10px;
}

[role="listNews"] article {
border:none;
padding: 0;
}

[role="listNews"] article > header > :not(figure),
.post-excerpt {
padding: 20px;
[role="listNews"] article[role="short-embed-post"]:not(:last-child) {
border:none;
}

[role="listNews"] article[role="short-embed-post"] header > figure ~ * {
padding: 0 0 0 10px;
}
[role="listNews"] article[role="short-embed-post"] {
margin-bottom:20px;
padding: 10px;
}

[role="listNews"] article > header > h3 {
Expand Down
118 changes: 52 additions & 66 deletions home.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,77 +7,63 @@

?>

<div id="content-area" class="wrapper ">
<div id="content-area" class="wrapper">
<main id="main" class="site-main" role="main">

<!--<section role="listNews">
<h2>News</h2>-->
<?php
/******* WP_QUERY
* Liste des derniers articles (actus)
*/

// $argsListPost = array (
// 'post_type' => array( 'post' ),
// 'post_status' => array( 'publish' ),
// 'order' => 'DESC'
// );

// list_pages($argsListPost, false);

?>
<!--</section>-->


<section role="listNews" class="posts">
<?php
/******* WP_QUERY
* Liste des derniers articles (actus)
*/

// $argsListPost = array (
// 'post_type' => array( 'post' ),
// 'post_status' => array( 'publish' ),
// 'order' => 'DESC'
// );

// list_pages($argsListPost, false);
global $post;
$argsListPost = array(
'posts_per_page' => 10,
'offset' => 0,
'category' => '',
'category_name' => '',
'orderby' => 'date',
'order' => 'DESC',
'include' => '',
'exclude' => '',
'meta_key' => '',
'meta_value' => '',
'post_type' => 'post',
'post_mime_type' => '',
'post_parent' => '',
'author' => '',
'author_name' => '',
'post_status' => 'publish',
'suppress_filters' => true
);

$postsList = get_posts ($argsListPost);

foreach ($postsList as $post) :
setup_postdata( $post );

<?php
if ( is_active_sidebar( 'homepage-top-widget-area' ) ) {
?>
<section role="homepage-top-widget-area">
<?php
dynamic_sidebar( 'homepage-top-widget-area' );
?>
</section>
<?php
}
?>
<?php
if ( ( is_active_sidebar( 'homepage-mdleft-widget-area' ) )||( is_active_sidebar( 'homepage-mdright-widget-area' ) ) )
{
?>
<div role="homepage-md">
<?php
if ( is_active_sidebar( 'homepage-mdleft-widget-area' ) ) {
?>
<div class="post-container">
<section role="homepage-mdleft-widget-area">
<?php
get_template_part( 'template-parts/content', get_post_format() );
dynamic_sidebar( 'homepage-mdleft-widget-area' );
?>
</div>
</section>
<?php
}
?>

<?php
if ( is_active_sidebar( 'homepage-mdright-widget-area' ) ) {
?>
<section role="homepage-mdright-widget-area">
<?php
endforeach;
wp_reset_postdata();
?>
</section>
dynamic_sidebar( 'homepage-mdright-widget-area' );
?>
</section>
<?php
}
?>
</div>
<?php
}
?>
<?php
if ( is_active_sidebar( 'homepage-footer-widget-area' ) ) {
?>
<section role="homepage-footer-widget-area">
<?php
dynamic_sidebar( 'homepage-footer-widget-area' );
?>
</section>
<?php
}
?>
</main><!-- #main -->
<?php
// get_sidebar();
Expand Down
7 changes: 5 additions & 2 deletions inc/customizer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,8 @@ function theme_aeris_color_style() {
.main-navigation .nav-menu > .current-menu-item > a,
.main-navigation .nav-menu > .current_page_ancestor > a,
.main-navigation .nav-menu > .current-menu-ancestor > a,
[role="listNews"] article > header > h3 {
[role="listNews"] article > header > h3,
.Aeris-seeAllButton {
border-color: <?php echo $code_color;?>;
}

Expand All @@ -276,7 +277,9 @@ function theme_aeris_color_style() {
aside .widget-title,
.bkg,
[role="listNews"] article.format-quote > header > blockquote,
[role="listProgram"] > header > h2 {
[role="listProgram"] > header > h2,
.Aeris-seeAllButton:hover
{
background: <?php echo $code_color;?>;
color:<?php echo get_theme_mod( 'theme_aeris_text_color_code' );?>;
}
Expand Down
1 change: 1 addition & 0 deletions inc/extras.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ function theme_aeris_show_categories($categories) {
*/
function images_setup() {
add_image_size( 'illustration-article', 1024, 500, true );
add_image_size( 'single-article', 1024, 500, false );
add_image_size( 'embed-article', 1024, 250, false );
add_image_size( 'post-image', 945, 9999 );
add_image_size( 'logo-partenaire', 100, 40, false );
Expand Down
45 changes: 5 additions & 40 deletions single.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,56 +24,21 @@

<header>
<?php theme_aeris_show_categories($categories);?>
</header>
</header>

<?php
if ($format == 'gallery') { ?>

<section class="featured-media">
<?php theme_aeris_flexslider('post-image', $post); ?>

</section> <!-- /featured-media -->


<?php }
elseif ($format == 'quote') { ?>

<section class="wrapper-content post-quote">

<?php

// Fetch post content
$content = get_post_field( 'post_content', get_the_ID() );

// Get content parts
$content_parts = get_extended( $content );

echo $content_parts['main'];

?>
</section>
<?php
}
elseif (get_the_post_thumbnail()) {
<?php
if (get_the_post_thumbnail()) {
?>
<figure>
<?php the_post_thumbnail( 'illustration-article' ); ?>
<?php the_post_thumbnail( 'single-article' ); ?>
</figure>

<?php
}
?>

<section class="wrapper-content">

<?php
if ($format == 'link' || $format == 'quote' || $format == 'video') {
$content = $content_parts['extended'];
$content = apply_filters('the_content', $content);
echo $content;
} else {
the_content();
}
the_content();
?>
</section>

Expand Down
Loading

0 comments on commit 3c894f0

Please sign in to comment.