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

chore(*): changelog #640

Merged
merged 2 commits into from
Jun 26, 2023
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
356 changes: 355 additions & 1 deletion CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gouvfr/dsfr",
"version": "1.9.3",
"version": "1.10.0-rc.1",
"description": "Système de Design de l'Etat - DSFR",
"repository": "git@github.com:GouvernementFR/dsfr.git",
"author": "Service d'Information du Gouvernement <jean-charles.hourdeaux@pm.gouv.fr>",
Expand Down
2 changes: 1 addition & 1 deletion src/component/accordion/style/_module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
text-align: left;
@include margin(0);
@include animate.caret();

@include after {
@include margin-right(0);
@include margin-left(auto);
Expand Down
1 change: 1 addition & 0 deletions src/component/accordion/style/_scheme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

&__btn {
@include color.text(action-high blue-france, (legacy:$legacy));

&[aria-expanded='true'] {
@include color.background(open blue-france, (legacy: $legacy));
}
Expand Down
1 change: 0 additions & 1 deletion src/component/radio/deprecated/style/_module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
@include margin-top(2v);
@include margin-bottom(4v);


&:last-child {
@include margin-bottom(3v);
}
Expand Down
2 changes: 1 addition & 1 deletion src/component/radio/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
@import 'deprecated/style/module';
@import 'deprecated/style/scheme';

@include _radio-scheme-deprecated;
@include _radio-scheme-deprecated;
1 change: 1 addition & 0 deletions src/component/transcription/style/_scheme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

&__btn {
@include color.text(action-high blue-france, (legacy:$legacy));

&[aria-expanded='true'] {
@include color.background(open blue-france, (legacy: $legacy));
}
Expand Down
48 changes: 31 additions & 17 deletions src/core/example/link/sample/library.ejs
Original file line number Diff line number Diff line change
@@ -1,44 +1,58 @@
<% const sample = getSample(include); %>

<!-- Based on Leaflet Quick Start Guide [https://leafletjs.com/examples/quick-start/] -->
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY=" crossorigin=""/>
<script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js" integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo=" crossorigin=""></script>

<%
let classes = locals.classes || [];
%>


<div <%- includeClasses(classes); %>>
<link
rel="stylesheet"
href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css"
integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY="
crossorigin=""
/>
<script
src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"
integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo="
crossorigin=""
></script>

<% let classes = locals.classes || []; %>

<div <%- includeClasses(classes); %>
>
<div id="map" class="map"></div>

<%- include('../../../../component/toggle/template/ejs/toggle.ejs', {toggle: {state: true, checked: true, label: `Interupteur de la classe <code class="${prefix}-px-1w">${classes[0]}</code>sur le wrapper`, id: classes[0]}}); %>
<%- include('../../../../component/toggle/template/ejs/toggle.ejs', {toggle:
{state: true, checked: true, label: `Interupteur de la classe
<code class="${prefix}-px-1w">${classes[0]}</code>sur le wrapper`, id:
classes[0]}}); %>
</div>

<style>
.map { height: 400px; }
.map {
height: 400px;
}
</style>

<script>
const map = L.map('map', {
center: [48.8588897, 2.320041],
zoom: 13
zoom: 13,
});
const linkClass = '<%- classes[0] %>';

L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
maxZoom: 19,
attribution: '&copy; <a href="http://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a>'
attribution:
'&copy; <a href="http://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a>',
}).addTo(map);

L.marker([48.8588897, 2.320041]).addTo(map)
.bindPopup('20 avenue de Ségur 75007 Paris')
.openPopup();
L.popup({ closeButton: false })
.setLatLng([48.8588897, 2.320041])
.setContent('20 avenue de Ségur 75007 Paris')
.openOn(map);

const toggle = document.getElementById(linkClass);
const wrapper = document.getElementById('map').parentNode;

toggle.addEventListener('change', function() {
toggle.addEventListener('change', function () {
if (this.checked) {
wrapper.classList.add(linkClass);
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/core/style/_outdated.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
:root#{ns-attr(scrolling)} body {
position: sticky;
}

:root {
--underline-thickness: calc(#{$underline-thickness} + 0.25px);
}
Expand Down
3 changes: 2 additions & 1 deletion src/core/style/action/module/_link.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ a {
@include init-underline;
@include enable-underline;
@include enable-external;

--text-decoration: none;
}

Expand All @@ -35,7 +36,7 @@ form {

#{ns(raw-link)} {
--text-decoration: none;

&[href],
[href] {
@include disable-underline;
Expand Down
7 changes: 6 additions & 1 deletion src/core/style/typography/_legacy.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@
@include legacy.is(ie11) {
@include enable-list-style-legacy;

h1, h2, h3, h4, h5, h6 {
h1,
h2,
h3,
h4,
h5,
h6 {
@include margin(0 0 6v);
}
}