Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-22 23:53:50 +00:00
Code Issues Actions Projects Releases Wiki Activity

Homogenize the styling between vuejs module and twig templates

Browse Source 
New CSS styles are applied to news module for better layout. Relevant templates are updated to use the new styles. Also, entry point is added in webpack configuration file to import the CSS file through index.js.
This commit is contained in:
Julien Fastré
2024-02-19 13:36:11 +01:00
parent e96c246ef9
commit 2b14c132d5
7 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Bundle/ChillMainBundle/Resources/public/module/news/index.js Normal file
View File

@@ -0,0 +1 @@
import './index.scss';

7
src/Bundle/ChillMainBundle/Resources/public/module/news/index.scss Normal file
View File

@@ -0,0 +1,7 @@
div.flex-table {
.news-content {
p {
margin-top: 1rem;
}
}
}

4
src/Bundle/ChillMainBundle/Resources/views/NewsItem/_show.html.twig
View File

@@ -8,6 +8,8 @@
</p>
</div>
<div class="item-bloc">
{{ entity.content|chill_markdown_to_html }}
<div class="news-content">
{{ entity.content|chill_markdown_to_html }}
</div>
</div>
</div>

11
src/Bundle/ChillMainBundle/Resources/views/NewsItem/news_items_history.html.twig
View File

@@ -4,6 +4,11 @@
{{ 'news.title'|trans }}
{% endblock title %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('mod_news') }}
{% endblock %}
{% block content %}
<div class="col-md-10 asideactivity-list">
<h2>{{ 'news.title'|trans }}</h2>
@@ -42,12 +47,14 @@
</div>
<div class="item-row separator">
{{ entity.content|u.truncate(350, '… [' ~ ('news.read_more'|trans) ~ '](' ~ chill_path_add_return_path('chill_main_single_news_item', { 'id': entity.id } ) ~ ')', false)|chill_markdown_to_html }}
<div>
{{ entity.content|u.truncate(350, '… [' ~ ('news.read_more'|trans) ~ '](' ~ chill_path_add_return_path('chill_main_single_news_item', { 'id': entity.id } ) ~ ')', false)|chill_markdown_to_html }}
</div>
</div>
<div class="item-row">
<ul class="record_actions">
<li>
<a href="{{ chill_path_add_return_path('chill_main_single_news_item', { 'id': entity.id } ) }}" class="btn btn-show btn-mini"></a>
<a href="{{ chill_path_add_return_path('chill_main_single_news_item', { 'id': entity.id } ) }}" class="btn btn-show btn-sm read-more">{{ 'news.read_more'|trans }}</a>
</li>
</ul>
</div>

5
src/Bundle/ChillMainBundle/Resources/views/NewsItem/show.html.twig
View File

@@ -2,6 +2,11 @@
{% block title 'news.show_details'|trans %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('mod_news') }}
{% endblock %}
{% block content %}
<div class="col-md-10 col-xxl">
<div class="news-item-show">

5
src/Bundle/ChillMainBundle/Resources/views/NewsItem/view_admin.html.twig
View File

@@ -4,6 +4,11 @@
{% include('@ChillMain/CRUD/_view_title.html.twig') %}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('mod_news') }}
{% endblock %}
{% block admin_content %}
<div class="col-md-10 col-xxl">

1
src/Bundle/ChillMainBundle/chill.webpack.config.js
View File

@@ -76,6 +76,7 @@ module.exports = function(encore, entries)
encore.addEntry('mod_pick_postal_code', __dirname + '/Resources/public/module/pick-postal-code/index.js');
encore.addEntry('mod_pick_rolling_date', __dirname + '/Resources/public/module/pick-rolling-date/index.js');
encore.addEntry('mod_address_details', __dirname + '/Resources/public/module/address-details/index');
encore.addEntry('mod_news', __dirname + '/Resources/public/module/news/index.js');
// Vue entrypoints
encore.addEntry('vue_address', __dirname + '/Resources/public/vuejs/Address/index.js');