Commit cb4a4722 authored by Jeff Lothéal's avatar Jeff Lothéal
Browse files

Merge branch 'DOS0141194' into development

parents 529793d9 acd7f8cd
Pipeline #16006 passed with stages
in 7 minutes and 59 seconds
This diff is collapsed.
<div class="page-header-container">
<app-page-header [pageInfo]="pageHeaderInfo"></app-page-header>
<p *ngIf="intro">{{ intro }}</p>
<p *ngIf="intro" class="chapo">{{ intro }}</p>
</div>
<div class="main-content">
<div class="filter-button-touch column is-hidden-desktop"
......
......@@ -22,10 +22,6 @@ $sticky-distance: $header-bar-height + 32px;
margin-bottom: 0rem;
border-radius: 8px;
box-shadow: 0px 6px 12px rgb(129 128 128 / 10%);
p {
padding-bottom:2em;
}
}
@media (max-width: $tablet) {
......
......@@ -2,7 +2,7 @@
<div class="page-header-container">
<app-page-header [pageInfo]="pageHeaderInfo"></app-page-header>
<p class="description">
<p class="chapo">
<ng-container i18n="@@changelog.description">
Your recommendations to improve this portal are regularly integrated.
Here is the list of the last evolutions of the portal. If you wish to contribute to the optimization of the
......
......@@ -10,10 +10,6 @@ $line: 2px;
/* Base */
.description {
font-size: 1rem;
font-weight: 600;
padding-bottom: 1.875rem;
line-height: normal;
@media screen and (min-width: $desktop) {
margin-left: 6rem;
......
......@@ -2,7 +2,7 @@
<div class="page-container is-fullwidth">
<div class="page-header-container">
<app-page-header [pageInfo]="pageHeaderInfo"></app-page-header>
<p *ngIf="intro">{{ intro }}</p>
<p *ngIf="intro" class="chapo">{{ intro }}</p>
</div>
<div class="posts">
<div class="post-container">
......
......@@ -9,10 +9,6 @@
.page-header-container {
background-color: white;
padding: 0 1.25rem 0 1.25rem;
p {
padding-bottom:2em;
}
}
.posts {
......
......@@ -6,19 +6,21 @@
<img src="./assets/img/illu-contributions.svg" alt="Illustrationde la contribution">
</div>
<p class="section-title" i18n="@@contribution.title">Do you want to contribute ?</p>
<div class="chapo">
<p class="section-title" i18n="@@contribution.title">Do you want to contribute ?</p>
<p i18n="@@contribution.mainText">The Métropole de Lyon encourages all players in the area
(citizens, companies, associations, research laboratories, schools, etc.) to make available all the data they
produce.</p>
<br />
<p>
<span i18n="@@contribution.text2">
To publish data on the data.grandlyon.com platform,
</span>
<a [routerLink]="['/', AppRoutes.contact.uri]" [queryParams]="{ subject: contactTrad.contributionSubject }"
i18n="@@contribution.contactUs">contact us</a>.
</p>
<p i18n="@@contribution.mainText">The Métropole de Lyon encourages all players in the area
(citizens, companies, associations, research laboratories, schools, etc.) to make available all the data they
produce.</p>
<br />
<p>
<span i18n="@@contribution.text2">
To publish data on the data.grandlyon.com platform,
</span>
<a [routerLink]="['/', AppRoutes.contact.uri]" [queryParams]="{ subject: contactTrad.contributionSubject }"
i18n="@@contribution.contactUs">contact us</a>.
</p>
</div>
</div>
</section>
\ No newline at end of file
@import '../../../../../node_modules/bulma/sass/utilities/_all.sass';
p,
span {
font-size: 1.125rem;
}
.feature-image {
margin-top: 2rem;
margin-bottom: 2rem;
......
<div class="page-container is-fullwidth">
<div class="page-header-container">
<app-page-header [pageInfo]="pageHeaderInfo"></app-page-header>
<p class="description" i18n="@@credits.description">
<p class="chapo" i18n="@@credits.description">
Here are the open source tools used by data.grandlyon.com.
</p>
</div>
......
......@@ -7,13 +7,6 @@
margin-bottom: 1rem;
}
.description {
font-size: 17px;
font-weight: 600;
padding-bottom: 1.875rem;
line-height: normal;
}
img {
max-height: 100px;
}
......
<div class="page-container is-fullwidth">
<div class="page-header-container ghost-style">
<app-page-header [pageInfo]="pageHeaderInfo"></app-page-header>
<p class="description">
<ng-container i18n="@@organizations.description_first">
They have chosen to make their data available on data.grandlyon.com: Welcome to the partners of the Métropole de Lyon!
</ng-container>
</p>
<p class="description">
<ng-container i18n="@@organizations.description_middle">
For the players in the territory who wish to distribute their data, in open access or in exclusive sharing,
the data team of the Métropole de Lyon is at your disposal and offers you two types of partnership framework:
</ng-container>
</p>
<ul>
<div class="chapo">
<p>
<li>
<a href="{{ opendata_url }}" i18n="@@organizations.opendata_conv">An open data distribution agreement</a>
</li>
<li>
<a href="{{ privatedata_url }}" i18n="@@organizations.privatedata_conv">A private access data distribution agreement</a>
</li>
<ng-container i18n="@@organizations.description_first">
They have chosen to make their data available on data.grandlyon.com: Welcome to the partners of the Métropole de Lyon!
</ng-container>&nbsp;
<ng-container i18n="@@organizations.description_middle">
For the players in the territory who wish to distribute their data, in open access or in exclusive sharing,
the data team of the Métropole de Lyon is at your disposal and offers you two types of partnership framework:
</ng-container>
</p>
</ul>
<p class="description">
<ng-container i18n="@@organizations.description_last">
Together, let's make data the catalyst for responsible development in Greater Lyon!
</ng-container>
</p>
<ul>
<p>
<li>
<a href="{{ opendata_url }}" i18n="@@organizations.opendata_conv">An open data distribution agreement</a>
</li>
<li>
<a href="{{ privatedata_url }}" i18n="@@organizations.privatedata_conv">A private access data distribution agreement</a>
</li>
</p>
</ul>
<p>
<ng-container i18n="@@organizations.description_last">
Together, let's make data the catalyst for responsible development in Greater Lyon!
</ng-container>
</p>
</div>
</div>
<div class="masonry">
......
......@@ -7,16 +7,7 @@
margin-bottom: 1rem;
}
.description {
font-size: 17px;
font-weight: 600;
line-height: normal;
}
.ghost-style {
padding-bottom: 1.875rem;
ul p {
padding-top:0px;
}
......
<div class="page-container is-fullwidth">
<div class="page-header-container">
<app-page-header [pageInfo]="pageHeaderInfo"></app-page-header>
<p class="description">
<p class="chapo">
<span i18n="@@reuses.description.part1">
The Métropole de Lyon promotes the reuse of territorial data: analysis, map, site, service, application...
</span>
......
......@@ -7,14 +7,6 @@
margin-bottom: 1rem;
}
.description,
.description span {
font-size: 17px;
font-weight: 600;
padding-bottom: 1.875rem;
line-height: normal;
}
a:hover {
text-decoration: none;
}
......
......@@ -4,7 +4,7 @@
p.excerpt {
margin-top: 1.4375rem;
margin-bottom: 1.4375rem;
font-size: 1.125rem;
font-size: 1.0625rem;
font-weight: bold;
}
......@@ -20,9 +20,13 @@
span,
li {
word-break: break-word;
font-size: 1.125rem;
font-size: 1.0625rem;
color: $brand-color;
line-height: 1.5;
a{
font-weight: bold;
}
}
p {
......
......@@ -96,8 +96,13 @@ h5,
font-size: $size-6;
}
span,
p,
.details-container {
p,
span{
font-size: 0.875rem;
}
}
select,
input,
ul,
......@@ -511,4 +516,14 @@ span.required-field,
}
}
.chapo {
font-size: 1.0625rem;
padding-bottom: 1.875rem;
line-height: normal;
a{
font-weight: bold;
}
}
@import "./scss/ghost-style";
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment