Commit c91fbaf4 authored by Yoan VALLET's avatar Yoan VALLET
Browse files

Merge branch 'dev' into 'master'

Merge from dev into master

See merge request web-et-numerique/llle_project/ecolyo!6
parents 1fe5b58f a62abed9
<svg width="50" height="36" viewBox="0 0 50 36" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M25.0493 10.0001C23.0025 10.0049 20.1039 10.373 18.8572 10.5528L18 10.6765V11.5426V22.0319C18 22.0501 17.9998 22.0696 17.9996 22.0906C17.9971 22.3717 17.9923 22.8952 18.3839 23.3651C18.8395 24.037 20.1562 25.6992 22.3365 27.3504L22.3458 27.3574L22.3553 27.3643C22.6659 27.5883 22.9268 27.7789 23.1499 27.9422L23.2608 28.0234C23.4353 28.1512 23.5879 28.263 23.721 28.3589C24.0311 28.5827 24.2911 28.7623 24.5493 28.8927L25.0203 29.1305L25.4824 28.8759L25 28C25.4824 28.8759 25.4825 28.8759 25.4826 28.8758L25.4829 28.8757L25.4834 28.8754L25.4848 28.8746L25.4886 28.8725L25.5005 28.8658L25.5408 28.843C25.5746 28.8237 25.6224 28.796 25.6823 28.7603C25.802 28.689 25.9706 28.5856 26.1738 28.4529C26.5753 28.1905 27.1183 27.8094 27.6884 27.3311C28.8898 26.3965 29.8249 25.5011 30.4916 24.7558C30.8259 24.3821 31.0987 24.0394 31.3056 23.7423C31.455 23.5278 31.5972 23.2991 31.6962 23.0777C31.8754 22.8141 31.9375 22.5372 31.9642 22.3756C32.0002 22.1577 32 21.953 32 21.862V21.8619L32 21.8511V20.5422C31.6584 20.4349 31.3247 20.3098 31 20.1679V21.8511C31 22.0319 31 22.3936 30.8209 22.5745C30.6417 23.117 29.388 24.7447 27.0597 26.5532C25.985 27.4575 25 28 25 28C24.7467 27.8721 24.4486 27.6538 23.8525 27.2172C23.6055 27.0364 23.3075 26.8181 22.9403 26.5532C20.791 24.9255 19.5373 23.2979 19.1791 22.7553C19 22.5646 19 22.3743 19 22.0319V11.5426C20.2348 11.3644 23.0335 11.0109 25 11.0003C25 11.0002 25 11.0001 25 11C25 10.6625 25.0167 10.329 25.0493 10.0001Z" fill="#A0A0A0"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M25.0352 10.1551L24.5 9.80511L23.9527 10.1631C21.8729 11.5233 19.6608 12.3222 17.1758 12.4368L16.2772 12.4783L16.2236 13.3762C16.2058 13.6743 16.1874 13.9705 16.1691 14.2647L16.1691 14.2647C15.9702 17.4643 15.7863 20.4211 16.6118 22.9662C17.5579 25.8831 19.7604 28.1383 24.1208 29.9253L24.5 30.0807L24.8793 29.9253C29.2396 28.1383 31.4422 25.8831 32.3883 22.9662C32.6159 22.2645 32.7667 21.5316 32.8617 20.7709C32.5306 20.6987 32.2056 20.6102 31.8876 20.5062C31.4776 24.0783 29.7971 26.8291 24.5 29C16.4666 25.7077 16.7515 21.0816 17.1704 14.2794C17.1875 14.0018 17.2049 13.7206 17.2218 13.4358C19.9078 13.3119 22.2906 12.4449 24.5 11C24.6673 11.1094 24.8356 11.2155 25.005 11.3182C25.0017 11.2125 25 11.1065 25 11C25 10.7154 25.0119 10.4336 25.0352 10.1551Z" fill="#A0A0A0"/>
<circle cx="35" cy="11" r="9" fill="#58FFFF"/>
<circle cx="35" cy="11" r="9" fill="url(#paint0_radial)" fill-opacity="0.5"/>
<defs>
......
<svg width="50" height="36" viewBox="0 0 50 36" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M31.5 11.5426V11.1664L31.1386 11.0621C30.4597 10.8663 29.3861 10.7279 28.2873 10.6373C27.1771 10.5458 25.9992 10.5 25.0895 10.5C23.08 10.5 20.1829 10.8667 18.9286 11.0477L18.5 11.1095V11.5426V22.0319C18.5 22.0483 18.4999 22.065 18.4999 22.0819C18.4989 22.3725 18.4976 22.7341 18.783 23.0626C19.1942 23.6752 20.4789 25.3163 22.6384 26.9518L22.6384 26.9519L22.6478 26.9587C22.9598 27.1838 23.2218 27.3751 23.4453 27.5388C23.4835 27.5667 23.5206 27.5939 23.5567 27.6203C23.7312 27.7481 23.8821 27.8586 24.0135 27.9534C24.3253 28.1783 24.556 28.336 24.7747 28.4463L25.0101 28.5652L25.2412 28.438L25 28C25.2412 28.438 25.2413 28.4379 25.2413 28.4379L25.2415 28.4378L25.2418 28.4376L25.2428 28.4371L25.2458 28.4354L25.2559 28.4298L25.2926 28.409C25.3241 28.391 25.3693 28.3648 25.4265 28.3307C25.541 28.2626 25.7036 28.1628 25.9004 28.0343C26.2914 27.7788 26.8204 27.4074 27.3741 26.9421C28.5568 26.0227 29.4722 25.1455 30.1189 24.4224C30.4428 24.0604 30.7023 23.7336 30.8954 23.4565C31.0523 23.2312 31.181 23.0165 31.2584 22.8308C31.3952 22.6476 31.4472 22.438 31.4709 22.2942C31.5001 22.1177 31.5 21.948 31.5 21.8583L31.5 21.8511V11.5426Z" stroke="#A0A0A0"/>
<path d="M24.3104 29.4627L24.5 29.5404L24.6896 29.4627C28.9601 27.7125 31.0253 25.5476 31.9126 22.8119C32.7071 20.3625 32.5302 17.5035 32.3304 14.2741C32.3126 13.9877 32.2947 13.6983 32.2773 13.406L32.2505 12.957L31.8012 12.9363C29.2157 12.8171 26.9183 11.9841 24.7737 10.5815L24.5 10.4026L24.2263 10.5815C22.0817 11.9841 19.7843 12.8171 17.1988 12.9363L16.7495 12.957L16.7227 13.406C16.7053 13.6983 16.6874 13.9877 16.6696 14.2741C16.4698 17.5035 16.2929 20.3625 17.0874 22.8119C17.9747 25.5476 20.0399 27.7125 24.3104 29.4627Z" stroke="#A0A0A0"/>
</svg>
<svg width="50" height="36" viewBox="0 0 50 36" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M31.5 11.5426V11.1664L31.1386 11.0621C30.4597 10.8663 29.3861 10.7279 28.2873 10.6373C27.1771 10.5458 25.9992 10.5 25.0895 10.5C23.08 10.5 20.1829 10.8667 18.9286 11.0477L18.5 11.1095V11.5426V22.0319C18.5 22.0483 18.4999 22.065 18.4999 22.0819C18.4989 22.3725 18.4976 22.7341 18.783 23.0626C19.1942 23.6752 20.4789 25.3163 22.6384 26.9518L22.6384 26.9519L22.6478 26.9587C22.9598 27.1838 23.2218 27.3751 23.4453 27.5388C23.4835 27.5667 23.5206 27.5939 23.5567 27.6203C23.7312 27.7481 23.8821 27.8586 24.0135 27.9534C24.3253 28.1783 24.556 28.336 24.7747 28.4463L25.0101 28.5652L25.2412 28.438L25 28C25.2412 28.438 25.2413 28.4379 25.2413 28.4379L25.2415 28.4378L25.2418 28.4376L25.2428 28.4371L25.2458 28.4354L25.2559 28.4298L25.2926 28.409C25.3241 28.391 25.3693 28.3648 25.4265 28.3307C25.541 28.2626 25.7036 28.1628 25.9004 28.0343C26.2914 27.7788 26.8204 27.4074 27.3741 26.9421C28.5568 26.0227 29.4722 25.1455 30.1189 24.4224C30.4428 24.0604 30.7023 23.7336 30.8954 23.4565C31.0523 23.2312 31.181 23.0165 31.2584 22.8308C31.3952 22.6476 31.4472 22.438 31.4709 22.2942C31.5001 22.1177 31.5 21.948 31.5 21.8583L31.5 21.8511V11.5426Z" fill="#E3B82A" stroke="#E3B82A"/>
<path d="M24.5 29C32.8613 25.5734 32.2114 20.7018 31.7782 13.4358C29.0922 13.3119 26.7095 12.445 24.5 11C22.2905 12.445 19.9078 13.3119 17.2218 13.4358C16.7886 20.7018 16.1387 25.5734 24.5 29Z" fill="#E3B82A"/>
</svg>
......@@ -34,7 +34,7 @@
.timeline-line {
background-color: $text-bright;
width: 1px;
height: calc(100vh - 126px);
height: calc(100vh);
grid-column: 1;
grid-row: 1;
position: unset;
......@@ -430,12 +430,12 @@
max-width: 53rem;
.cp-left-button {
margin-right: 0.25rem;
margin-left: 1.25rem;
margin-left: 0;
width: 100%;
}
.cp-right-button {
margin-left: 0.25rem;
margin-right: 1.25rem;
margin-right: 0;
width: 100%;
}
}
......
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