Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SGD8-1963: Change timeline templates #966

Merged
merged 4 commits into from
Jan 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
203 changes: 203 additions & 0 deletions css/editor.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,203 @@
/*Load fonts in ckeditor*/
@font-face {
font-family: "Fira Sans";
font-style: normal;
font-weight: 400;
src: url("../../../../contrib/gent_base/build/styleguide/googlefonts/fira-sans-v16-latin-ext_latin-regular.eot"), local("Fira Sans"), url("../../../../contrib/gent_base/build/styleguide/googlefonts/fira-sans-v16-latin-ext_latin-regular.eot?#iefix") format("embedded-opentype"), url("../../../../contrib/gent_base/build/styleguide/googlefonts/fira-sans-v16-latin-ext_latin-regular.woff2") format("woff2"), url("../../../../contrib/gent_base/build/styleguide/googlefonts/fira-sans-v16-latin-ext_latin-regular.woff") format("woff"), url("../../../../contrib/gent_base/build/styleguide/googlefonts/fira-sans-v16-latin-ext_latin-regular.ttf") format("truetype"), url("../../../../contrib/gent_base/build/styleguide/googlefonts/fira-sans-v16-latin-ext_latin-regular.svg#FiraSans") format("svg");
font-display: swap
}

@font-face {
font-family: "Fira Sans";
font-style: normal;
font-weight: 600;
src: url("../../../../contrib/gent_base/build/styleguide/googlefonts/fira-sans-v16-latin-ext_latin-600.eot"), local("Fira Sans"), url("../../../../contrib/gent_base/build/styleguide/googlefonts/fira-sans-v16-latin-ext_latin-600.eot?#iefix") format("embedded-opentype"), url("../../../../contrib/gent_base/build/styleguide/googlefonts/fira-sans-v16-latin-ext_latin-600.woff2") format("woff2"), url("../../../../contrib/gent_base/build/styleguide/googlefonts/fira-sans-v16-latin-ext_latin-600.woff") format("woff"), url("../../../../contrib/gent_base/build/styleguide/googlefonts/fira-sans-v16-latin-ext_latin-600.ttf") format("truetype"), url("../../../../contrib/gent_base/build/styleguide/googlefonts/fira-sans-v16-latin-ext_latin-600.svg#FiraSans") format("svg");
font-display: swap
}

@font-face {
font-family: "Fira Sans";
font-style: normal;
font-weight: 700;
src: url("../../../../contrib/gent_base/build/styleguide/googlefonts/fira-sans-v16-latin-ext_latin-700.eot"), local("Fira Sans"), url("../../../../contrib/gent_base/build/styleguide/googlefonts/fira-sans-v16-latin-ext_latin-700.eot?#iefix") format("embedded-opentype"), url("../../../../contrib/gent_base/build/styleguide/googlefonts/fira-sans-v16-latin-ext_latin-700.woff2") format("woff2"), url("../../../../contrib/gent_base/build/styleguide/googlefonts/fira-sans-v16-latin-ext_latin-700.woff") format("woff"), url("../../../../contrib/gent_base/build/styleguide/googlefonts/fira-sans-v16-latin-ext_latin-700.ttf") format("truetype"), url("../../../../contrib/gent_base/build/styleguide/googlefonts/fira-sans-v16-latin-ext_latin-700.svg#FiraSans") format("svg");
font-display: swap
}

@font-face {
font-family: "Fira Sans";
font-style: normal;
font-weight: 800;
src: url("../../../../contrib/gent_base/build/styleguide/googlefonts/fira-sans-v16-latin-ext_latin-800.eot"), local("Fira Sans"), url("../../../../contrib/gent_base/build/styleguide/googlefonts/fira-sans-v16-latin-ext_latin-800.eot?#iefix") format("embedded-opentype"), url("../../../../contrib/gent_base/build/styleguide/googlefonts/fira-sans-v16-latin-ext_latin-800.woff2") format("woff2"), url("../../../../contrib/gent_base/build/styleguide/googlefonts/fira-sans-v16-latin-ext_latin-800.woff") format("woff"), url("../../../../contrib/gent_base/build/styleguide/googlefonts/fira-sans-v16-latin-ext_latin-800.ttf") format("truetype"), url("../../../../contrib/gent_base/build/styleguide/googlefonts/fira-sans-v16-latin-ext_latin-800.svg#FiraSans") format("svg");
font-display: swap
}

@font-face{
font-family:"gent-icons-v6";
src:url("/themes/contrib/gent_base/build/styleguide/fonts/gent-icons-v6.eot?v=322");
src:url("/themes/contrib/gent_base/build/styleguide/fonts/gent-icons-v6.eot?#iefix?v=322") format("eot"),
url("/themes/contrib/gent_base/build/styleguide/fonts/gent-icons-v6.woff2?v=322") format("woff2"),
url("/themes/contrib/gent_base/build/styleguide/fonts/gent-icons-v6.woff?v=322") format("woff"),
url("/themes/contrib/gent_base/build/styleguide/fonts/gent-icons-v6.ttf?v=322") format("truetype"),
url("/themes/contrib/gent_base/build/styleguide/fonts/gent-icons-v6.svg#gent-icons-v6?v=322") format("svg");font-display:swap
}

.cke_editable {
font: 400 .9rem "Fira Sans",sans-serif;
line-height: 177.8%;
}

/*Colored table styling*/
th.success,
tr.success,
td.success {
background-color: #ebf7ea;
}

th.warning,
tr.warning,
td.warning {
background-color: #feeee6;
}

th.error,
tr.error,
td.error {
background-color: #fee7eb;
}

.messages::before,
.important-note::before {
margin-right: 13px;
font-family: "gent-icons-v6";
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-style: normal;
font-size: 1.6rem;
font-variant: normal;
font-weight: normal;
speak: none;
text-decoration: none;
text-transform: none;
}

/*Status messages*/
.messages {
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
border-bottom: 3px solid;
flex-direction: column;
font-size: .9rem;
margin-bottom: 20px;
margin-right: 0;
margin-top: 20px;
max-width: 970px;
padding: 40px;
position: relative;
color: #001823;
border-color: #009de0;
background-color: #e6f8ff;
}

.messages::before {
display: block;
width: 60px;
margin-right: 0;
padding-bottom: 20px;
font-size: 2rem;
line-height: 1;
text-align: center;
color: inherit;
}

.messages p:last-child {
margin-bottom: 0;
}

@media (min-width: 576px) {
.messages {
padding: 60px 60px 60px 125px;
}

.messages::before {
position: absolute;
top: 60px;
left: 60px;
}
}

.messages--warning {
background-color: #fff2e5;
border-color: #e06c00;
}

.messages--error {
background-color: #ffe8ec;
border-color: #ea0d33;
}

.messages--status {
background-color: #e1fde1;
border-color: #2c8726;
}

.messages--info::before,
.messages--warning::before {
content: "";
}

.messages--info::before {
color: #009de0;
}

.messages--warning::before {
color: #e06c00;
}

.messages--error::before {
content: "";
color: #ea0d33;
}

.messages--status::before {
content: "";
color: #2c8726;
}

/*Important note style*/
.important-note {
display: flex;
align-items: center;
font-size: .9rem;
font-weight: 600;
line-height: 177.778%;
}

.note--important {
color: #005ba9;
}

.note--payment,
.note--timebound {
color: #e06c00;
}

.note--unmissable {
color: #ea0d33;
}

.important-note::before {
line-height: 87.5%;
}

.note--important::before,
.note--unmissable::before {
content: "";
}

.note--payment::before {
content: "";
}

.note--timebound::before {
content: "";
}
11 changes: 11 additions & 0 deletions gent_base.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ regions:
libraries:
- gent_base/menu
- gent_base/tables

# Unset all theming features.
features:
-

# Removes all the classy stylesheets.
libraries-override:
classy/base: false
Expand All @@ -38,8 +40,17 @@ libraries-override:
css:
theme:
css/better_exposed_filters.css: false

stylesheets-remove:
- core/themes/stable/css/node/node.preview.css
- modules/contrib/video_embed_field/css/video_embed_field.responsive-video.css

'interface translation project': gent_base
'interface translation server pattern': themes/contrib/gent_base/translations/%language.po

#Set specific styles for ckeditor(5)
ckeditor_stylesheets:
- css/editor.css

ckeditor5-stylesheets:
- css/editor.css
15 changes: 2 additions & 13 deletions gent_base.theme
Original file line number Diff line number Diff line change
Expand Up @@ -441,17 +441,6 @@ function gent_base_preprocess_field(&$variables) {
$timelineOdd = ($timelineItems % 2 !== 0);
$variables['items'][$key]['content']['reversed'][0] = $reversed;

$timelineItems = count($entity->get('timeline_items')->referencedEntities());
$variables['items'][$key]['content']['counter'][0] = $timelineItemTotal;
$timelineItemTotal += $timelineItems;

if ($timelineOdd) {
$reversed = !$reversed;
}

$timelineOdd = ($timelineItems % 2 !== 0);
$variables['items'][$key]['content']['reversed'][0] = $reversed;

// It's the first timeline frame.
if ($firstTimeline === FALSE) {
$firstTimeline = TRUE;
Expand All @@ -470,8 +459,8 @@ function gent_base_preprocess_field(&$variables) {
break;
case 'roadmap':
$variables['items'][$key]['content']['#prefix'] =
'<div class="roadmap-wrapper"><h2 class="visually-hidden">' . t('roadmap') . '</h2>' .
'<dl class="roadmap accordion">';
'<div class="roadmap-wrapper">' .
'<dl class="roadmap">';
break;
}
}
Expand Down
2 changes: 1 addition & 1 deletion source/js/accordion.bindings.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
return;
}

$(once('gent_base_accordion', '.accordion', context)).each(function () {
$(once('gent_base_accordion', '.accordion, .accordion--link', context)).each(function () {

// Temp fix Mijn Gent block accordion.
var headerAccordion = document.querySelector('header .accordion');
Expand Down
12 changes: 5 additions & 7 deletions templates/contrib/paragraphs/paragraph--faq.html.twig
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{% extends 'paragraph.html.twig' %}

{% block paragraph %}
{% block content %}
<h2>{{ content.title }}</h2>
{{ content.field_faq }}
{% endblock %}
{% endblock paragraph %}
{% if content.title|render|striptags|trim is not empty %}
{{ content.title|merge({'#attributes': {'class': 'mt-10'}}) }}
{% endif %}

{{ content.field_faq }}
Original file line number Diff line number Diff line change
Expand Up @@ -39,25 +39,9 @@
*/
#}

{% set items_total = content.counter.0 %}
{% set reversed = content.reversed.0 %}

{% set classes = [
'timeline-slot',
items_total is odd ? 'timeline-slot-odd' : 'timeline-slot-even',
reversed ? 'timeline-slot-reverse' : ''
] %}

{% block paragraph %}
{% block content %}
<div{{ attributes.addClass(classes) }} role="listitem">
{% if content.title %}
<dt>
<h3 class="dt-title">{{ content.title }}</h3>
</dt>
{% endif %}

{{ content.timeline_items }}
</div>
<h2 class="visually-hidden">{{ content.title }}</h2>
{{ content.timeline_items }}
{% endblock %}
{% endblock paragraph %}
Loading