diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4a8318d8cf46c9dd88a901513e52fb2b1fe7b7d..055beca06777be940c486ec94d9df4790cb253cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [2.4.0] - 26-02-2019
+### Fixed
+- Issue with Preview Card styling not loading on Preview List
+- Error when placing date format under date in Preview Card
+
+
+### Added
+- Color for preview-list titles
+- Text-shadow on Preview Cards' elements
+
+### Changed
+- Removed top margin from Preview List component
+
+
## [2.3.2] - 31-01-2019
### Fixed
- Issue that video resources are displayed very slim
diff --git a/cern_components.info.yml b/cern_components.info.yml
index 4868e9b70b19d480a1b61426ce2411473c511734..5e44f1cbd4ed29d8e8df75abb67c6f673687e96f 100755
--- a/cern_components.info.yml
+++ b/cern_components.info.yml
@@ -2,7 +2,7 @@ name: "CERN Components"
type: module
description: "Provides all the necessary modules regarding CERN Web Components."
core: 8.x
-version: 2.3.2
+version: 2.4.0
package: CERN Components
dependencies:
- components:components (>=8.x-1.1-alpha1)
diff --git a/patterns/molecules/preview-card/css/component-preview-card.css b/patterns/molecules/preview-card/css/component-preview-card.css
index b6f8a95c92526c68c7229758a3bf6374185d875f..7aaa7b86935a2f3c3ec7e48a424468ac955be2d0 100644
--- a/patterns/molecules/preview-card/css/component-preview-card.css
+++ b/patterns/molecules/preview-card/css/component-preview-card.css
@@ -118,7 +118,8 @@
.component-preview-cards .preview-card__title h3 a {
display: block !important;
position: relative;
- line-height: 26px !important; }
+ line-height: 26px !important;
+ text-shadow: 1px 0px 1px black, 0px 1px 1px black, -1px 0px 1px black, 0px -1px 1px black, 0 0 1px black; }
.component-preview-cards .preview-card__title h3 a span {
width: 100%; }
.component-preview-cards .preview-card__title h3 a:hover {
@@ -151,6 +152,7 @@
min-height: 18px;
height: 18px; }
.component-preview-cards .preview-card__category, .component-preview-cards .preview-card__date, .component-preview-cards .preview-card__author {
+ text-shadow: 1px 0px 1px black, 0px 1px 1px black, -1px 0px 1px black, 0px -1px 1px black, 0 0 1px black;
font-family: 'sourcesans-light';
font-size: 14px;
font-size: 1.4rem;
diff --git a/patterns/molecules/preview-card/preview-card.html.twig b/patterns/molecules/preview-card/preview-card.html.twig
index 9f6b039ec00b80f91fdf3c10634800665a9cd132..d78396021eabffc92a66f017333df30705723848 100755
--- a/patterns/molecules/preview-card/preview-card.html.twig
+++ b/patterns/molecules/preview-card/preview-card.html.twig
@@ -162,8 +162,7 @@
{# Date field #}
{% if date | render %}
<div class="preview-card__date" style="color:{{variants.textcolor.color}}">
- {{ date|format_date_field('custom', 'j F') }},
- {{ date|format_date_field('custom', 'y') }}
+ {{ date }}
</div>
{% endif %}
</div>
diff --git a/patterns/molecules/preview-card/sass/component-preview-card.scss b/patterns/molecules/preview-card/sass/component-preview-card.scss
index 8393bac12b50edafecdfa091a64a682dcb5c47c4..eb3b7d0ed662765a850773f57a0b400184bb6d93 100755
--- a/patterns/molecules/preview-card/sass/component-preview-card.scss
+++ b/patterns/molecules/preview-card/sass/component-preview-card.scss
@@ -155,6 +155,7 @@
display: block !important;
position: relative;
line-height: 26px !important;
+ text-shadow: 1px 0px 1px black, 0px 1px 1px black, -1px 0px 1px black, 0px -1px 1px black, 0 0 1px black;
span {
//display: block;
width: 100%;
@@ -195,6 +196,7 @@
&__category,
&__date,
&__author {
+ text-shadow: 1px 0px 1px black, 0px 1px 1px black, -1px 0px 1px black, 0px -1px 1px black, 0 0 1px black;
font-family: 'sourcesans-light';
@include font-size(1.4);
display: inline-block;
diff --git a/patterns/molecules/preview-list/css/preview-list.component.css b/patterns/molecules/preview-list/css/preview-list.component.css
index 75cdeb298fecbaaf0a099420a0ca5a11ad1b5f32..7e8de5e1af47e5ad1dc1cf9796a938489d2e8b0c 100644
--- a/patterns/molecules/preview-list/css/preview-list.component.css
+++ b/patterns/molecules/preview-list/css/preview-list.component.css
@@ -1,83 +1,60 @@
.preview-list-component {
- display: block;
-}
-
-.preview-list-component .preview-list-image {
- width: 300px;
- height: 170px;
- background: #ddd;
- margin-right: 15px;
- float: left;
- overflow: hidden;
- background-image: url(../images/cern.png);
- background-repeat: no-repeat;
- background-position: center;
- background-size: 100%;
- border: 0;
- box-shadow: 0 1px 3px 0 #bfbfbf;
-}
-
-.preview-list-component .preview-list-news-info {
- float: left;
- width: calc(100% - 315px);
-}
-
-.preview-list-component .preview-list-news-info .preview-list-topic {
- display: inline;
-}
-
-.preview-list-component .preview-list-news-info .preview-list-topic a {
- color: black;
-}
-
-.preview-list-component .preview-list-news-info .preview-list-title {
- margin-top: 5px;
-}
-
-.preview-list-component .preview-list-news-info .preview-list-strap {
- margin-bottom: 2rem;
-}
-
-.preview-list-component .preview-list-news-info .preview-list-news-format {
- display: inline;
-}
-
-.preview-list-component .preview-list-news-info .preview-list-news-format * {
- display: inline;
-}
-
-.preview-list-component .preview-list-news-info .preview-list-news-format a {
- color: black;
-}
-
-.preview-list-component .preview-list-news-info .preview-list-topic.has-separator,
-.preview-list-component .preview-list-news-info .preview-list-date.has-separator {
- display: inline;
-}
-
-.preview-list-component .preview-list-news-info .preview-list-topic.has-separator:before,
-.preview-list-component .preview-list-news-info .preview-list-date.has-separator:before {
- content: '|';
- position: relative;
- display: inline-block;
- margin: 0 5px;
-}
+ display: block; }
+ .preview-list-component .preview-list-image {
+ width: 300px;
+ height: 170px;
+ background: #ddd;
+ margin-right: 15px;
+ float: left;
+ overflow: hidden;
+ background-image: url(../images/cern.png);
+ background-repeat: no-repeat;
+ background-position: center;
+ background-size: 100%;
+ border: 0;
+ box-shadow: 0 1px 3px 0 #bfbfbf; }
+ .preview-list-component .preview-list-news-info {
+ float: left;
+ width: calc(100% - 315px); }
+ .preview-list-component .preview-list-news-info .preview-list-topic {
+ display: inline; }
+ .preview-list-component .preview-list-news-info .preview-list-topic a {
+ color: black; }
+ .preview-list-component .preview-list-news-info .preview-list-title {
+ margin-top: 0; }
+ .preview-list-component .preview-list-news-info .preview-list-title a {
+ color: #2574b9; }
+ .preview-list-component .preview-list-news-info .preview-list-title a:hover {
+ color: #044873; }
+ .preview-list-component .preview-list-news-info .preview-list-strap {
+ margin-bottom: 2rem; }
+ .preview-list-component .preview-list-news-info .preview-list-news-format {
+ display: inline; }
+ .preview-list-component .preview-list-news-info .preview-list-news-format * {
+ display: inline; }
+ .preview-list-component .preview-list-news-info .preview-list-news-format a {
+ color: black; }
+ .preview-list-component .preview-list-news-info .preview-list-topic.has-separator,
+ .preview-list-component .preview-list-news-info .preview-list-date.has-separator {
+ display: inline; }
+ .preview-list-component .preview-list-news-info .preview-list-topic.has-separator:before,
+ .preview-list-component .preview-list-news-info .preview-list-date.has-separator:before {
+ content: '|';
+ position: relative;
+ display: inline-block;
+ margin: 0 5px; }
.preview-list-responsive {
- display: none;
-}
+ display: none; }
@media only screen and (max-width: 767px) {
.preview-list-component {
- display: none;
- }
- .preview-list-responsive {
- display: block;
- }
-}
+ display: none; }
+ .preview-list-responsive {
+ display: block; } }
@media only screen and (max-width: 991px) {
.preview-list-component .preview-list-news-info .preview-list-title {
- font-size: 2rem;
- }
-}
+ font-size: 2rem; } }
+
+/*# sourceMappingURL=preview-list.component.css.map */
diff --git a/patterns/molecules/preview-list/preview-list.ui_patterns.yml b/patterns/molecules/preview-list/preview-list.ui_patterns.yml
index a91aaa6de2ea12453c2710e0589ffb5023429a57..037fddb188bde1e2d2369547110af56893840f84 100755
--- a/patterns/molecules/preview-list/preview-list.ui_patterns.yml
+++ b/patterns/molecules/preview-list/preview-list.ui_patterns.yml
@@ -59,6 +59,7 @@ preview_list:
css:
component:
css/preview-list.component.css: {}
+ ../preview-card/css/component-preview-card.css: {}
js:
js/preview-list.js: {}
use: "@cern_components/molecules/preview-list/preview-list.ui_patterns.html.twig"
diff --git a/patterns/molecules/preview-list/scss/preview-list.component.scss b/patterns/molecules/preview-list/scss/preview-list.component.scss
index 985386c425dc61a7e5bfd15f338b7b7a48a8d376..3e3c28037dc8a25d0cf0a8387f163ba179710c1e 100755
--- a/patterns/molecules/preview-list/scss/preview-list.component.scss
+++ b/patterns/molecules/preview-list/scss/preview-list.component.scss
@@ -29,7 +29,15 @@
}
}
.preview-list-title {
- margin-top: 5px;
+ margin-top: 0;
+
+ a{
+ color: #2574b9;
+
+ &:hover{
+ color: #044873;
+ }
+ }
}
.preview-list-strap {
margin-bottom: 2rem;
diff --git a/src/TwigExtension/CernComponentsTwigExtension.php b/src/TwigExtension/CernComponentsTwigExtension.php
index 2f861af3e0707278a84e38658e5dc86ca0317eba..fef3331b1aa75bcc9ae9ccac14c7e118b73034a4 100755
--- a/src/TwigExtension/CernComponentsTwigExtension.php
+++ b/src/TwigExtension/CernComponentsTwigExtension.php
@@ -629,19 +629,19 @@ class CernComponentsTwigExtension extends \Twig_Extension {
$languages = $node->getTranslationLanguages();
// Get node nid
$nid = $node->id();
- // if $node is string (for revisions)
+ // if $node is string (for revisions)
} else if (is_string($node)) {
// Get node nid
$node = node_load($node);
}
if (isset($node)) {
- if ($language == 'en' && $node->hasTranslation('fr') && $node->hasTranslation('en')) {
+ if ($language == 'en' && $node->hasTranslation('fr') && $node->hasTranslation('en') && $node->getTranslation('fr')->isPublished()) {
$node_url = $node->getTranslation('fr')->toUrl()->toString();
$sentence = array(
'#markup' => '<p>Voir en</p> <a href="' . $node_url . '">français</a>',
);
}
- else if ($language == 'fr' && $node->hasTranslation('en') && $node->hasTranslation('fr')) {
+ else if ($language == 'fr' && $node->hasTranslation('en') && $node->hasTranslation('fr') && $node->getTranslation('en')->isPublished()) {
$node_url = $node->getTranslation('en')->toUrl()->toString();
$sentence = array(
'#markup' => '<p>View in</p> <a href="' . $node_url . '">English</a>',