Skip to content
Snippets Groups Projects
Commit a5e2f93b authored by Jérémie BRISON's avatar Jérémie BRISON Committed by Hugo SUBTIL
Browse files

fix: typo and color

parent ecff2a37
No related branches found
No related tags found
2 merge requests!85Recette,!84Dev
Showing
with 82 additions and 142 deletions
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
a { a {
color: $white; color: $white;
margin: 0px 0px 0px 10px; margin: 0px 0px 0px 10px;
text-decoration: none;
@include cn-regular-12;
&:hover { &:hover {
text-decoration: underline; text-decoration: underline;
} }
...@@ -35,12 +37,6 @@ ...@@ -35,12 +37,6 @@
text-align: center; text-align: center;
} }
} }
@media #{$desktop} {
font-size: 1em;
}
@media #{$tablet} {
font-size: 0.875em;
}
} }
.metro-title { .metro-title {
......
...@@ -108,7 +108,7 @@ h3 { ...@@ -108,7 +108,7 @@ h3 {
overflow-y: auto; overflow-y: auto;
height: auto; height: auto;
h2 { h2 {
@include cn-bold-28; @include cn-bold-26;
color: $black; color: $black;
margin-bottom: 0; margin-bottom: 0;
span { span {
...@@ -119,7 +119,11 @@ h3 { ...@@ -119,7 +119,11 @@ h3 {
} }
} }
h3 { h3 {
@include cn-bold-22; @include cn-bold-26;
@media #{$tablet} {
@include cn-bold-22;
}
} }
.page { .page {
max-width: 960px; max-width: 960px;
......
...@@ -52,6 +52,7 @@ a { ...@@ -52,6 +52,7 @@ a {
border-bottom: 2px solid $red-default; border-bottom: 2px solid $red-default;
text-decoration: none; text-decoration: none;
} }
@include cn-regular-14;
} }
@media print { @media print {
...@@ -114,19 +115,11 @@ a { ...@@ -114,19 +115,11 @@ a {
} }
.title { .title {
margin-bottom: 35px; margin-bottom: 35px;
@include cn-regular-28; @include cn-regular-26;
span { span {
color: $grey-2; color: $grey-2;
} }
} }
.footer {
a {
height: unset;
display: table-cell;
vertical-align: middle;
margin: auto 0 auto 0;
}
}
.desktop-show { .desktop-show {
display: block; display: block;
......
...@@ -76,6 +76,14 @@ ...@@ -76,6 +76,14 @@
stroke-width: unset !important; stroke-width: unset !important;
} }
} }
&:hover {
svg {
fill: $red-info;
&.mdm {
fill: #bd9e6a;
}
}
}
} }
::ng-deep .leaflet-left { ::ng-deep .leaflet-left {
...@@ -97,12 +105,15 @@ ...@@ -97,12 +105,15 @@
h1 { h1 {
color: $grey-1; color: $grey-1;
@include cn-bold-20; @include cn-bold-20;
font-size: 18px;
margin: 0; margin: 0;
} }
p { p {
color: $grey-3; color: $grey-3;
@include cn-regular-16; @include cn-regular-16;
font-size: 16px;
margin: 0 0 13px 0; margin: 0 0 13px 0;
font-style: italic;
} }
.pop-up { .pop-up {
text-align: center; text-align: center;
...@@ -111,6 +122,7 @@ ...@@ -111,6 +122,7 @@
button { button {
@include btn-search-filter; @include btn-search-filter;
@include cn-bold-14; @include cn-bold-14;
font-size: 16px;
} }
} }
span { span {
...@@ -127,7 +139,6 @@ ...@@ -127,7 +139,6 @@
::ng-deep .leaflet-popup-tip-container { ::ng-deep .leaflet-popup-tip-container {
display: none; display: none;
} }
@media print { @media print {
.map-wrapper { .map-wrapper {
display: none; display: none;
......
...@@ -9,16 +9,9 @@ import { MarkerType } from '../components/markerType.enum'; ...@@ -9,16 +9,9 @@ import { MarkerType } from '../components/markerType.enum';
export class MapService { export class MapService {
private static markersList = {}; private static markersList = {};
private isMarkerActive = false; private isMarkerActive = false;
public markerIconHover = divIcon({
className: null,
html: '<svg width="40" height="46"><use xlink:href="assets/ico/sprite.svg#map-marker-locate"></use></svg>',
iconSize: [40, 46],
iconAnchor: [20, 46],
popupAnchor: [0, -46],
});
public markerIconActive = divIcon({ public markerIconActive = divIcon({
className: null, className: null,
html: '<svg width="40" height="46" fill="#d50000"><use xlink:href="assets/ico/sprite.svg#map-marker"></use></svg>', html: '<svg width="40" height="46" fill="#A00000"><use xlink:href="assets/ico/sprite.svg#map-marker"></use></svg>',
iconSize: [40, 46], iconSize: [40, 46],
iconAnchor: [20, 46], iconAnchor: [20, 46],
popupAnchor: [0, -46], popupAnchor: [0, -46],
...@@ -33,13 +26,8 @@ export class MapService { ...@@ -33,13 +26,8 @@ export class MapService {
}); });
public markerIconMdm = divIcon({ public markerIconMdm = divIcon({
className: null, className: null,
html: '<svg width="19" height="24"><use xlink:href="assets/ico/sprite.svg#mdm"></use></svg>', html:
iconSize: [19, 24], '<svg width="19" height="24" fill="#D4C4A9" class="mdm"><use xlink:href="assets/ico/sprite.svg#mdm"></use></svg>',
iconAnchor: [9, 0],
});
public markerIconMdmHover = divIcon({
className: null,
html: '<svg width="19" height="24"><use xlink:href="assets/ico/sprite.svg#mdm-hover"></use></svg>',
iconSize: [19, 24], iconSize: [19, 24],
iconAnchor: [9, 0], iconAnchor: [9, 0],
}); });
...@@ -63,7 +51,7 @@ export class MapService { ...@@ -63,7 +51,7 @@ export class MapService {
if (id) { if (id) {
MapService.markersList[id] = marker; MapService.markersList[id] = marker;
} }
return this.bindMouseEventOnMarker(marker, this.getMarkerIcon(markerType), this.getMarkerIconHover(markerType)); return marker;
} }
private getLayerAttributton(markerType: MarkerType): string { private getLayerAttributton(markerType: MarkerType): string {
...@@ -82,32 +70,11 @@ export class MapService { ...@@ -82,32 +70,11 @@ export class MapService {
} }
} }
private getMarkerIconHover(markerType: MarkerType): DivIcon {
if (markerType === MarkerType.mdm) {
return this.markerIconMdmHover;
} else {
return this.markerIconHover;
}
}
private bindMouseEventOnMarker(marker: Marker, regularIcon: DivIcon, hoverIcon: DivIcon): Marker {
marker.on('mouseover', (e) => {
if (marker.getIcon() === regularIcon) {
marker.setIcon(hoverIcon);
}
});
marker.on('mouseout', (e) => {
marker.setIcon(regularIcon);
});
return marker;
}
/** /**
* @param id marker id * @param id marker id
*/ */
public setActiveMarker(id: string): void { public setActiveMarker(id: string): void {
this.getMarker(id).setIcon(this.getMarkerIconHover(MarkerType.structure)); this.getMarker(id).setIcon(this.markerIconActive);
} }
public setUnactiveMarker(id: string): void { public setUnactiveMarker(id: string): void {
......
...@@ -47,6 +47,8 @@ button { ...@@ -47,6 +47,8 @@ button {
vertical-align: middle; vertical-align: middle;
border-radius: 4px; border-radius: 4px;
@include btn-bold; @include btn-bold;
font-size: 16px;
border-radius: 4px;
&.withIcon { &.withIcon {
color: $black; color: $black;
height: 36px; height: 36px;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
width: 100%; width: 100%;
} }
h3 { h3 {
@include cn-bold-24; @include cn-bold-26;
color: $black; color: $black;
margin-top: 0; margin-top: 0;
} }
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
color: $orange-warning; color: $orange-warning;
} }
h3 { h3 {
@include cn-bold-24; @include cn-bold-26;
color: $black; color: $black;
margin-top: 0; margin-top: 0;
} }
......
@import '../../../../assets/scss/color'; @import '../../../../assets/scss/color';
.alert { .alert {
color: $red-metro; color: $red-default;
} }
...@@ -14,17 +14,18 @@ ...@@ -14,17 +14,18 @@
.typeStructure { .typeStructure {
color: $grey-3; color: $grey-3;
@include cn-regular-16; @include cn-regular-16;
font-style: italic;
} }
.structure-name { .structure-name {
color: $grey-1; color: $grey-1;
@include cn-bold-20; @include cn-bold-18;
padding-bottom: 5px; padding-bottom: 5px;
width: 100%; width: 100%;
text-transform: capitalize; text-transform: capitalize;
} }
.distanceStructure { .distanceStructure {
@include cn-regular-16; @include cn-regular-16;
color: $grey-1; color: $grey-3;
width: 50%; width: 50%;
} }
&:last-child { &:last-child {
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
.titleFilter { .titleFilter {
display: none !important; display: none !important;
margin: 27px 25px 0px 25px; margin: 27px 25px 0px 25px;
@include cn-bold-28; @include cn-bold-26;
@media #{$large-phone} { @media #{$large-phone} {
display: flex !important; display: flex !important;
} }
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
padding: 5px 0; padding: 5px 0;
} }
h4 { h4 {
@include cn-bold-14; @include cn-bold-16;
line-height: 17px; line-height: 17px;
text-transform: uppercase; text-transform: uppercase;
color: $grey-3; color: $grey-3;
......
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
(change)="numericPassCheck($event, 'labelsQualifications')" (change)="numericPassCheck($event, 'labelsQualifications')"
/> />
<span class="customCheck"></span> <span class="customCheck"></span>
<div class="label">Pass numérique</div> <div class="label pass">Pass numérique</div>
</label> </label>
</div> </div>
</div> </div>
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
} }
.header { .header {
.title { .title {
@include cn-bold-20; @include cn-bold-26;
padding: 16px 0 16px 0; padding: 16px 0 16px 0;
display: flex; display: flex;
align-items: center; align-items: center;
......
...@@ -64,7 +64,7 @@ a { ...@@ -64,7 +64,7 @@ a {
h2 { h2 {
margin-top: 0; margin-top: 0;
margin-bottom: 5px; margin-bottom: 5px;
@include cn-regular-24; @include cn-regular-26;
} }
h3 { h3 {
margin: 0; margin: 0;
......
<svg xmlns="http://www.w3.org/2000/svg"> <svg xmlns="http://www.w3.org/2000/svg">
<symbol id="map-marker" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg"><path d="M19.72 43.73l.706.66.683-.683c2.038-2.04 4.04-3.864 5.934-5.588l.179-.163c6.32-5.755 11.624-10.585 11.624-18.493C38.846 9.267 30.59 1 20.402 1 10.214 1 1.957 9.267 1.957 19.463c0 4.152 1.08 7.233 3.179 10.152 2.04 2.84 5.05 5.523 8.833 8.899l.078.07c1.717 1.531 3.607 3.217 5.672 5.147zm6.508-24.267a5.83 5.83 0 01-5.826 5.833 5.83 5.83 0 01-5.826-5.833 5.83 5.83 0 015.826-5.833 5.83 5.83 0 015.826 5.833z"/></symbol> <symbol id="map-marker" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg"><path d="M19.72 43.73l.706.66.683-.683c2.038-2.04 4.04-3.864 5.934-5.588l.179-.163c6.32-5.755 11.624-10.585 11.624-18.493C38.846 9.267 30.59 1 20.402 1 10.214 1 1.957 9.267 1.957 19.463c0 4.152 1.08 7.233 3.179 10.152 2.04 2.84 5.05 5.523 8.833 8.899l.078.07c1.717 1.531 3.607 3.217 5.672 5.147zm6.508-24.267a5.83 5.83 0 01-5.826 5.833 5.83 5.83 0 01-5.826-5.833 5.83 5.83 0 015.826-5.833 5.83 5.83 0 015.826 5.833z"/></symbol>
<symbol id="map-marker-locate" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg"><path d="M19.72 43.73l.706.66.683-.683c2.038-2.04 4.04-3.864 5.934-5.588l.179-.163c6.32-5.755 11.624-10.585 11.624-18.493C38.846 9.267 30.59 1 20.402 1 10.214 1 1.957 9.267 1.957 19.463c0 4.152 1.08 7.233 3.179 10.152 2.04 2.84 5.05 5.523 8.833 8.899l.078.07c1.717 1.531 3.607 3.217 5.672 5.147zm6.508-24.267a5.83 5.83 0 01-5.826 5.833 5.83 5.83 0 01-5.826-5.833 5.83 5.83 0 015.826-5.833 5.83 5.83 0 015.826 5.833z" fill="#a00000" stroke="#fff" stroke-width="2"/></symbol>
<symbol id="adress" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg"> <symbol id="adress" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M11 2C12.6055 2.0145 14.1397 2.68885 15.265 3.87463C16.3902 5.06042 17.0142 6.66048 16.9998 8.32269C16.9998 11.8208 12.1242 19 11 19C9.87584 19 5.00025 11.8208 5.00025 8.32269C4.98578 6.66048 5.60982 5.06042 6.73504 3.87463C7.86026 2.68885 9.39446 2.0145 11 2ZM10.9999 5.55695C12.0865 5.53677 13.0768 6.19906 13.5059 7.23274C13.9349 8.26643 13.7173 9.4661 12.9553 10.2683C12.1933 11.0704 11.0384 11.3157 10.0329 10.8888C9.02744 10.4619 8.37129 9.44779 8.37266 8.32272C8.36215 6.80858 9.53743 5.57133 10.9999 5.55695Z" fill="#333333"/> <path fill-rule="evenodd" clip-rule="evenodd" d="M11 2C12.6055 2.0145 14.1397 2.68885 15.265 3.87463C16.3902 5.06042 17.0142 6.66048 16.9998 8.32269C16.9998 11.8208 12.1242 19 11 19C9.87584 19 5.00025 11.8208 5.00025 8.32269C4.98578 6.66048 5.60982 5.06042 6.73504 3.87463C7.86026 2.68885 9.39446 2.0145 11 2ZM10.9999 5.55695C12.0865 5.53677 13.0768 6.19906 13.5059 7.23274C13.9349 8.26643 13.7173 9.4661 12.9553 10.2683C12.1933 11.0704 11.0384 11.3157 10.0329 10.8888C9.02744 10.4619 8.37129 9.44779 8.37266 8.32272C8.36215 6.80858 9.53743 5.57133 10.9999 5.55695Z" fill="#333333"/>
</symbol> </symbol>
...@@ -224,16 +222,7 @@ ...@@ -224,16 +222,7 @@
<path fill-rule="evenodd" clip-rule="evenodd" d="M2.84054 5.57617C1.72559 6.04339 1 7.13416 1 8.34305V23H8V18.5C8 17.6716 8.67157 17 9.5 17C10.3284 17 11 17.6716 11 18.5V23H18V8.40362C18 7.1644 17.2381 6.05271 16.0823 5.60565L14.5555 5.01505C14.1291 4.85011 13.746 4.5899 13.4355 4.2543L10.9183 1.5332C10.1451 0.6974 8.83121 0.674761 8.0297 1.48343L5.19821 4.34019C4.92065 4.62023 4.5906 4.84281 4.22694 4.9952L2.84054 5.57617Z"/> <path fill-rule="evenodd" clip-rule="evenodd" d="M2.84054 5.57617C1.72559 6.04339 1 7.13416 1 8.34305V23H8V18.5C8 17.6716 8.67157 17 9.5 17C10.3284 17 11 17.6716 11 18.5V23H18V8.40362C18 7.1644 17.2381 6.05271 16.0823 5.60565L14.5555 5.01505C14.1291 4.85011 13.746 4.5899 13.4355 4.2543L10.9183 1.5332C10.1451 0.6974 8.83121 0.674761 8.0297 1.48343L5.19821 4.34019C4.92065 4.62023 4.5906 4.84281 4.22694 4.9952L2.84054 5.57617Z"/>
</mask> </mask>
<path d="M2.84054 5.57617L3.03378 6.03731L2.84054 5.57617ZM1 23H0.5V23.5H1V23ZM8 23V23.5H8.5V23H8ZM11 23H10.5V23.5H11V23ZM18 23V23.5H18.5V23H18ZM16.0823 5.60565L16.2627 5.13932L16.0823 5.60565ZM14.5555 5.01505L14.3751 5.48138H14.3751L14.5555 5.01505ZM13.4355 4.2543L13.0685 4.59383V4.59383L13.4355 4.2543ZM10.9183 1.5332L11.2854 1.19366V1.19366L10.9183 1.5332ZM8.0297 1.48343L8.38482 1.8354V1.8354L8.0297 1.48343ZM5.19821 4.34019L4.84309 3.98821L5.19821 4.34019ZM4.22694 4.9952L4.42019 5.45634L4.22694 4.9952ZM1.5 8.34305C1.5 7.33564 2.10466 6.42666 3.03378 6.03731L2.6473 5.11502C1.34652 5.66011 0.5 6.93268 0.5 8.34305H1.5ZM1.5 23V8.34305H0.5V23H1.5ZM8 22.5H1V23.5H8V22.5ZM8.5 23V18.5H7.5V23H8.5ZM8.5 18.5C8.5 17.9477 8.94772 17.5 9.5 17.5V16.5C8.39543 16.5 7.5 17.3954 7.5 18.5H8.5ZM9.5 17.5C10.0523 17.5 10.5 17.9477 10.5 18.5H11.5C11.5 17.3954 10.6046 16.5 9.5 16.5V17.5ZM10.5 18.5V23H11.5V18.5H10.5ZM18 22.5H11V23.5H18V22.5ZM17.5 8.40362V23H18.5V8.40362H17.5ZM15.9019 6.07197C16.865 6.44453 17.5 7.37094 17.5 8.40362H18.5C18.5 6.95786 17.6111 5.66089 16.2627 5.13932L15.9019 6.07197ZM14.3751 5.48138L15.9019 6.07197L16.2627 5.13932L14.7359 4.54872L14.3751 5.48138ZM13.0685 4.59383C13.4307 4.98537 13.8776 5.28895 14.3751 5.48138L14.7359 4.54872C14.3805 4.41127 14.0613 4.19443 13.8026 3.91476L13.0685 4.59383ZM10.5513 1.87273L13.0685 4.59383L13.8026 3.91476L11.2854 1.19366L10.5513 1.87273ZM8.38482 1.8354C8.98595 1.22891 9.97141 1.24589 10.5513 1.87273L11.2854 1.19366C10.3189 0.148915 8.67647 0.120616 7.67458 1.13145L8.38482 1.8354ZM5.55333 4.69216L8.38482 1.8354L7.67458 1.13145L4.84309 3.98821L5.55333 4.69216ZM4.42019 5.45634C4.84445 5.27856 5.22951 5.01888 5.55333 4.69216L4.84309 3.98821C4.61179 4.22158 4.33675 4.40706 4.0337 4.53405L4.42019 5.45634ZM3.03378 6.03731L4.42019 5.45634L4.0337 4.53405L2.6473 5.11502L3.03378 6.03731Z" fill="white" mask="url(#path-1-outside-1)"/> <path d="M2.84054 5.57617L3.03378 6.03731L2.84054 5.57617ZM1 23H0.5V23.5H1V23ZM8 23V23.5H8.5V23H8ZM11 23H10.5V23.5H11V23ZM18 23V23.5H18.5V23H18ZM16.0823 5.60565L16.2627 5.13932L16.0823 5.60565ZM14.5555 5.01505L14.3751 5.48138H14.3751L14.5555 5.01505ZM13.4355 4.2543L13.0685 4.59383V4.59383L13.4355 4.2543ZM10.9183 1.5332L11.2854 1.19366V1.19366L10.9183 1.5332ZM8.0297 1.48343L8.38482 1.8354V1.8354L8.0297 1.48343ZM5.19821 4.34019L4.84309 3.98821L5.19821 4.34019ZM4.22694 4.9952L4.42019 5.45634L4.22694 4.9952ZM1.5 8.34305C1.5 7.33564 2.10466 6.42666 3.03378 6.03731L2.6473 5.11502C1.34652 5.66011 0.5 6.93268 0.5 8.34305H1.5ZM1.5 23V8.34305H0.5V23H1.5ZM8 22.5H1V23.5H8V22.5ZM8.5 23V18.5H7.5V23H8.5ZM8.5 18.5C8.5 17.9477 8.94772 17.5 9.5 17.5V16.5C8.39543 16.5 7.5 17.3954 7.5 18.5H8.5ZM9.5 17.5C10.0523 17.5 10.5 17.9477 10.5 18.5H11.5C11.5 17.3954 10.6046 16.5 9.5 16.5V17.5ZM10.5 18.5V23H11.5V18.5H10.5ZM18 22.5H11V23.5H18V22.5ZM17.5 8.40362V23H18.5V8.40362H17.5ZM15.9019 6.07197C16.865 6.44453 17.5 7.37094 17.5 8.40362H18.5C18.5 6.95786 17.6111 5.66089 16.2627 5.13932L15.9019 6.07197ZM14.3751 5.48138L15.9019 6.07197L16.2627 5.13932L14.7359 4.54872L14.3751 5.48138ZM13.0685 4.59383C13.4307 4.98537 13.8776 5.28895 14.3751 5.48138L14.7359 4.54872C14.3805 4.41127 14.0613 4.19443 13.8026 3.91476L13.0685 4.59383ZM10.5513 1.87273L13.0685 4.59383L13.8026 3.91476L11.2854 1.19366L10.5513 1.87273ZM8.38482 1.8354C8.98595 1.22891 9.97141 1.24589 10.5513 1.87273L11.2854 1.19366C10.3189 0.148915 8.67647 0.120616 7.67458 1.13145L8.38482 1.8354ZM5.55333 4.69216L8.38482 1.8354L7.67458 1.13145L4.84309 3.98821L5.55333 4.69216ZM4.42019 5.45634C4.84445 5.27856 5.22951 5.01888 5.55333 4.69216L4.84309 3.98821C4.61179 4.22158 4.33675 4.40706 4.0337 4.53405L4.42019 5.45634ZM3.03378 6.03731L4.42019 5.45634L4.0337 4.53405L2.6473 5.11502L3.03378 6.03731Z" fill="white" mask="url(#path-1-outside-1)"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2.84054 5.57617C1.72559 6.04339 1 7.13416 1 8.34305V23H8V18.5C8 17.6716 8.67157 17 9.5 17C10.3284 17 11 17.6716 11 18.5V23H18V8.40362C18 7.1644 17.2381 6.05271 16.0823 5.60565L14.5555 5.01505C14.1291 4.85011 13.746 4.5899 13.4355 4.2543L10.9183 1.5332C10.1451 0.6974 8.83121 0.674761 8.0297 1.48343L5.19821 4.34018C4.92065 4.62023 4.5906 4.84281 4.22694 4.9952L2.84054 5.57617ZM11 4.5C11 5.32843 10.3284 6 9.5 6C8.67157 6 8 5.32843 8 4.5C8 3.67157 8.67157 3 9.5 3C10.3284 3 11 3.67157 11 4.5ZM4.25 15.9354C3.54057 16.0544 3 16.6714 3 17.4146V18.75H4.25V15.9354ZM3 21.9146V19.25H4.25V21.9146H3ZM4.75 21.9146V19.25H6V21.9146H4.75ZM6 17.4146V18.75H4.75V15.9354C5.45943 16.0544 6 16.6714 6 17.4146ZM13 17.4146C13 16.6714 13.5406 16.0544 14.25 15.9354V18.75H13V17.4146ZM13 19.25V21.9146H14.25V19.25H13ZM14.75 19.25V21.9146H16V19.25H14.75ZM16 18.75V17.4146C16 16.6714 15.4594 16.0544 14.75 15.9354V18.75H16ZM14.25 8C13.5406 8.11902 13 8.73601 13 9.47926V10.8146H14.25V8ZM13 13.9793V11.3146H14.25V13.9793H13ZM14.75 13.9793V11.3146H16V13.9793H14.75ZM16 9.47926V10.8146H14.75V8C15.4594 8.11902 16 8.73601 16 9.47926ZM8 9.47926C8 8.73601 8.54057 8.11902 9.25 8V10.8146H8V9.47926ZM8 11.3146V13.9793H9.25V11.3146H8ZM9.75 11.3146V13.9793H11V11.3146H9.75ZM11 10.8146V9.47926C11 8.73601 10.4594 8.11902 9.75 8V10.8146H11ZM4.25 8C3.54057 8.11902 3 8.73601 3 9.47926V10.8146H4.25V8ZM3 13.9793V11.3146H4.25V13.9793H3ZM4.75 13.9793V11.3146H6V13.9793H4.75ZM6 9.47926V10.8146H4.75V8C5.45943 8.11902 6 8.73601 6 9.47926Z" fill="#D4C4A9"/> <path fill-rule="evenodd" clip-rule="evenodd" d="M2.84054 5.57617C1.72559 6.04339 1 7.13416 1 8.34305V23H8V18.5C8 17.6716 8.67157 17 9.5 17C10.3284 17 11 17.6716 11 18.5V23H18V8.40362C18 7.1644 17.2381 6.05271 16.0823 5.60565L14.5555 5.01505C14.1291 4.85011 13.746 4.5899 13.4355 4.2543L10.9183 1.5332C10.1451 0.6974 8.83121 0.674761 8.0297 1.48343L5.19821 4.34018C4.92065 4.62023 4.5906 4.84281 4.22694 4.9952L2.84054 5.57617ZM11 4.5C11 5.32843 10.3284 6 9.5 6C8.67157 6 8 5.32843 8 4.5C8 3.67157 8.67157 3 9.5 3C10.3284 3 11 3.67157 11 4.5ZM4.25 15.9354C3.54057 16.0544 3 16.6714 3 17.4146V18.75H4.25V15.9354ZM3 21.9146V19.25H4.25V21.9146H3ZM4.75 21.9146V19.25H6V21.9146H4.75ZM6 17.4146V18.75H4.75V15.9354C5.45943 16.0544 6 16.6714 6 17.4146ZM13 17.4146C13 16.6714 13.5406 16.0544 14.25 15.9354V18.75H13V17.4146ZM13 19.25V21.9146H14.25V19.25H13ZM14.75 19.25V21.9146H16V19.25H14.75ZM16 18.75V17.4146C16 16.6714 15.4594 16.0544 14.75 15.9354V18.75H16ZM14.25 8C13.5406 8.11902 13 8.73601 13 9.47926V10.8146H14.25V8ZM13 13.9793V11.3146H14.25V13.9793H13ZM14.75 13.9793V11.3146H16V13.9793H14.75ZM16 9.47926V10.8146H14.75V8C15.4594 8.11902 16 8.73601 16 9.47926ZM8 9.47926C8 8.73601 8.54057 8.11902 9.25 8V10.8146H8V9.47926ZM8 11.3146V13.9793H9.25V11.3146H8ZM9.75 11.3146V13.9793H11V11.3146H9.75ZM11 10.8146V9.47926C11 8.73601 10.4594 8.11902 9.75 8V10.8146H11ZM4.25 8C3.54057 8.11902 3 8.73601 3 9.47926V10.8146H4.25V8ZM3 13.9793V11.3146H4.25V13.9793H3ZM4.75 13.9793V11.3146H6V13.9793H4.75ZM6 9.47926V10.8146H4.75V8C5.45943 8.11902 6 8.73601 6 9.47926Z" stroke="none"/>
</symbol>
<symbol id="mdm-hover" viewBox="0 0 19 24" xmlns="http://www.w3.org/2000/svg">
<mask id="path-1-outside-1" maskUnits="userSpaceOnUse" x="0" y="-0.108661" width="19" height="24" fill="black">
<rect fill="white" y="-0.108661" width="19" height="24"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2.84054 5.57617C1.72559 6.04339 1 7.13416 1 8.34305V23H8V18.5C8 17.6716 8.67157 17 9.5 17C10.3284 17 11 17.6716 11 18.5V23H18V8.40362C18 7.1644 17.2381 6.05271 16.0823 5.60565L14.5555 5.01505C14.1291 4.85011 13.746 4.5899 13.4355 4.2543L10.9183 1.5332C10.1451 0.6974 8.83121 0.674761 8.0297 1.48343L5.19821 4.34019C4.92065 4.62023 4.5906 4.84281 4.22694 4.9952L2.84054 5.57617Z"/>
</mask>
<path d="M2.84054 5.57617L3.03378 6.03731L2.84054 5.57617ZM1 23H0.5V23.5H1V23ZM8 23V23.5H8.5V23H8ZM11 23H10.5V23.5H11V23ZM18 23V23.5H18.5V23H18ZM16.0823 5.60565L16.2627 5.13932L16.0823 5.60565ZM14.5555 5.01505L14.3751 5.48138H14.3751L14.5555 5.01505ZM13.4355 4.2543L13.0685 4.59383V4.59383L13.4355 4.2543ZM10.9183 1.5332L11.2854 1.19366V1.19366L10.9183 1.5332ZM8.0297 1.48343L8.38482 1.8354V1.8354L8.0297 1.48343ZM5.19821 4.34019L4.84309 3.98821L5.19821 4.34019ZM4.22694 4.9952L4.42019 5.45634L4.22694 4.9952ZM1.5 8.34305C1.5 7.33564 2.10466 6.42666 3.03378 6.03731L2.6473 5.11502C1.34652 5.66011 0.5 6.93268 0.5 8.34305H1.5ZM1.5 23V8.34305H0.5V23H1.5ZM8 22.5H1V23.5H8V22.5ZM8.5 23V18.5H7.5V23H8.5ZM8.5 18.5C8.5 17.9477 8.94772 17.5 9.5 17.5V16.5C8.39543 16.5 7.5 17.3954 7.5 18.5H8.5ZM9.5 17.5C10.0523 17.5 10.5 17.9477 10.5 18.5H11.5C11.5 17.3954 10.6046 16.5 9.5 16.5V17.5ZM10.5 18.5V23H11.5V18.5H10.5ZM18 22.5H11V23.5H18V22.5ZM17.5 8.40362V23H18.5V8.40362H17.5ZM15.9019 6.07197C16.865 6.44453 17.5 7.37094 17.5 8.40362H18.5C18.5 6.95786 17.6111 5.66089 16.2627 5.13932L15.9019 6.07197ZM14.3751 5.48138L15.9019 6.07197L16.2627 5.13932L14.7359 4.54872L14.3751 5.48138ZM13.0685 4.59383C13.4307 4.98537 13.8776 5.28895 14.3751 5.48138L14.7359 4.54872C14.3805 4.41127 14.0613 4.19443 13.8026 3.91476L13.0685 4.59383ZM10.5513 1.87273L13.0685 4.59383L13.8026 3.91476L11.2854 1.19366L10.5513 1.87273ZM8.38482 1.8354C8.98595 1.22891 9.97141 1.24589 10.5513 1.87273L11.2854 1.19366C10.3189 0.148915 8.67647 0.120616 7.67458 1.13145L8.38482 1.8354ZM5.55333 4.69216L8.38482 1.8354L7.67458 1.13145L4.84309 3.98821L5.55333 4.69216ZM4.42019 5.45634C4.84445 5.27856 5.22951 5.01888 5.55333 4.69216L4.84309 3.98821C4.61179 4.22158 4.33675 4.40706 4.0337 4.53405L4.42019 5.45634ZM3.03378 6.03731L4.42019 5.45634L4.0337 4.53405L2.6473 5.11502L3.03378 6.03731Z" fill="white" mask="url(#path-1-outside-1)"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2.84054 5.57617C1.72559 6.04339 1 7.13416 1 8.34305V23H8V18.5C8 17.6716 8.67157 17 9.5 17C10.3284 17 11 17.6716 11 18.5V23H18V8.40362C18 7.1644 17.2381 6.05271 16.0823 5.60565L14.5555 5.01505C14.1291 4.85011 13.746 4.5899 13.4355 4.2543L10.9183 1.5332C10.1451 0.6974 8.83121 0.674761 8.0297 1.48343L5.19821 4.34018C4.92065 4.62023 4.5906 4.84281 4.22694 4.9952L2.84054 5.57617ZM11 4.5C11 5.32843 10.3284 6 9.5 6C8.67157 6 8 5.32843 8 4.5C8 3.67157 8.67157 3 9.5 3C10.3284 3 11 3.67157 11 4.5ZM4.25 15.9354C3.54057 16.0544 3 16.6714 3 17.4146V18.75H4.25V15.9354ZM3 21.9146V19.25H4.25V21.9146H3ZM4.75 21.9146V19.25H6V21.9146H4.75ZM6 17.4146V18.75H4.75V15.9354C5.45943 16.0544 6 16.6714 6 17.4146ZM13 17.4146C13 16.6714 13.5406 16.0544 14.25 15.9354V18.75H13V17.4146ZM13 19.25V21.9146H14.25V19.25H13ZM14.75 19.25V21.9146H16V19.25H14.75ZM16 18.75V17.4146C16 16.6714 15.4594 16.0544 14.75 15.9354V18.75H16ZM14.25 8C13.5406 8.11902 13 8.73601 13 9.47926V10.8146H14.25V8ZM13 13.9793V11.3146H14.25V13.9793H13ZM14.75 13.9793V11.3146H16V13.9793H14.75ZM16 9.47926V10.8146H14.75V8C15.4594 8.11902 16 8.73601 16 9.47926ZM8 9.47926C8 8.73601 8.54057 8.11902 9.25 8V10.8146H8V9.47926ZM8 11.3146V13.9793H9.25V11.3146H8ZM9.75 11.3146V13.9793H11V11.3146H9.75ZM11 10.8146V9.47926C11 8.73601 10.4594 8.11902 9.75 8V10.8146H11ZM4.25 8C3.54057 8.11902 3 8.73601 3 9.47926V10.8146H4.25V8ZM3 13.9793V11.3146H4.25V13.9793H3ZM4.75 13.9793V11.3146H6V13.9793H4.75ZM6 9.47926V10.8146H4.75V8C5.45943 8.11902 6 8.73601 6 9.47926Z" fill="#BD9E6A"/>
</symbol> </symbol>
<symbol id="borne" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg"> <symbol id="borne" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
line-break: 18px; line-break: 18px;
} }
@mixin btn-search-addStructure { @mixin btn-search-addStructure {
@include btn-bold-sousligne; @include btn-bold-underline;
color: $secondary-color; color: $secondary-color;
outline: none; outline: none;
} }
......
...@@ -18,11 +18,10 @@ $orange-warning: #da6c2e; ...@@ -18,11 +18,10 @@ $orange-warning: #da6c2e;
$blue: #348899; $blue: #348899;
$blue-hover: #117083; $blue-hover: #117083;
$blue-active: #8cb6be; $blue-active: #8cb6be;
$red-metro: #d50000;
$red-info: #a00000; $red-info: #a00000;
$red-default: #ed3939; $red-default: #ed3939;
/* APP COLORS */ /* APP COLORS */
$primary-color: $red-metro; $primary-color: $red-default;
$secondary-color: $blue; $secondary-color: $blue;
$default-link-color: $grey-2; $default-link-color: $grey-2;
$button-secondary: $blue; $button-secondary: $blue;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
padding: 8px 8px 6px 8px; padding: 8px 8px 6px 8px;
color: $secondary-color; color: $secondary-color;
outline: none; outline: none;
@include btn-bold-sousligne; @include btn-bold-underline;
&:hover { &:hover {
color: $blue-hover; color: $blue-hover;
} }
......
...@@ -5,12 +5,12 @@ $title-font: 'Trebuchet MS', 'Helvetica', sans-serif; ...@@ -5,12 +5,12 @@ $title-font: 'Trebuchet MS', 'Helvetica', sans-serif;
$font-size-xxsmall: 0.75em; // 12px $font-size-xxsmall: 0.75em; // 12px
$font-size-xsmall: 0.875em; // 14px $font-size-xsmall: 0.875em; // 14px
$font-size-small: 1em; // 16px $font-size-small: 1em; // 16px
$font-size-smedium: 1.25em; // 20px
$font-size-medium: 1.375em; // 22px $font-size-smedium: 1.125em; // 18px
$font-size-xmedium: 1.5em; // 24px $font-size-medium: 1.25em; // 20px
$font-size-large: 1.75em; // 28px $font-size-xmedium: 1.375em; // 22px
$font-size-xlarge: 2em; // 32px
$font-size-medium-mobile: 1.1em; $font-size-large: 1.625em; // 26px
html, html,
body, body,
...@@ -37,116 +37,73 @@ h6, ...@@ -37,116 +37,73 @@ h6,
font-family: $title-font; font-family: $title-font;
} }
@mixin btn-bold {
@include cn-bold-16;
line-height: 18px;
}
@mixin btn-bold-sousligne {
@include btn-bold;
text-decoration: underline;
}
@mixin btn-normal {
@include cn-regular-16;
line-height: 19px;
}
@mixin btn-pass {
@include cn-regular-18;
line-height: 21px;
}
@mixin arial-regular-16 { @mixin arial-regular-16 {
font-family: $footer-text-font; font-family: $footer-text-font;
font-style: normal; font-style: normal;
font-size: $font-size-small; font-size: $font-size-small;
} }
@mixin cn-bold-36 { @mixin cn-bold-26 {
font-family: $text-font;
font-style: normal;
font-weight: bold;
font-size: $font-size-large;
}
@mixin cn-bold-32 {
font-family: $title-font;
font-style: normal;
font-weight: bold;
font-size: $font-size-xlarge;
}
@mixin cn-bold-28 {
font-family: $title-font; font-family: $title-font;
font-style: normal; font-style: normal;
font-weight: bold; font-weight: bold;
font-size: $font-size-large; font-size: $font-size-large;
} }
@mixin cn-regular-28 { @mixin cn-regular-26 {
font-family: $text-font; font-family: $text-font;
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
font-size: $font-size-large; font-size: $font-size-large;
} }
@mixin cn-regular-24 {
font-family: $text-font;
font-style: normal;
font-weight: normal;
font-size: $font-size-xmedium;
}
@mixin cn-bold-24 {
font-family: $text-font;
font-style: normal;
font-weight: bold;
font-size: $font-size-xmedium;
}
@mixin cn-regular-22 { @mixin cn-regular-22 {
font-family: $text-font; font-family: $text-font;
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
font-size: $font-size-medium; font-size: $font-size-xmedium;
} }
@mixin cn-bold-22 { @mixin cn-bold-22 {
font-family: $text-font; font-family: $text-font;
font-style: normal; font-style: normal;
font-weight: bold; font-weight: bold;
font-size: $font-size-medium; font-size: $font-size-xmedium;
} }
@mixin cn-bold-20 { @mixin cn-bold-20 {
font-family: $text-font; font-family: $text-font;
font-style: normal; font-style: normal;
font-weight: bold; font-weight: bold;
font-size: $font-size-smedium; font-size: $font-size-medium;
} }
@mixin cn-regular-20 { @mixin cn-regular-20 {
font-family: $text-font; font-family: $text-font;
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
font-size: $font-size-smedium; font-size: $font-size-medium;
} }
@mixin cn-bold-20 { @mixin cn-bold-20 {
font-family: $title-font; font-family: $title-font;
font-style: normal; font-style: normal;
font-weight: bold; font-weight: bold;
font-size: $font-size-smedium; font-size: $font-size-medium;
} }
@mixin cn-regular-20 { @mixin cn-regular-20 {
font-family: $title-font; font-family: $title-font;
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
font-size: $font-size-smedium; font-size: $font-size-medium;
} }
@mixin cn-regular-18 { @mixin cn-regular-18 {
font-family: $title-font; font-family: $title-font;
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
font-size: $font-size-medium-mobile; font-size: $font-size-smedium;
} }
@mixin cn-bold-18 { @mixin cn-bold-18 {
font-family: $title-font; font-family: $title-font;
font-style: normal; font-style: normal;
font-weight: bold; font-weight: bold;
font-size: $font-size-medium-mobile; font-size: $font-size-smedium;
} }
@mixin cn-bold-16 { @mixin cn-bold-16 {
font-family: $text-font; font-family: $text-font;
...@@ -184,3 +141,22 @@ h6, ...@@ -184,3 +141,22 @@ h6,
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
@mixin btn-bold {
@include cn-bold-16;
line-height: 18px;
}
@mixin btn-bold-underline {
@include btn-bold;
text-decoration: underline;
}
@mixin btn-normal {
@include cn-regular-16;
line-height: 19px;
}
@mixin btn-pass {
@include cn-regular-14;
line-height: 21px;
}
...@@ -26,7 +26,6 @@ body { ...@@ -26,7 +26,6 @@ body {
min-height: 100vh; min-height: 100vh;
min-height: -webkit-fill-available; min-height: -webkit-fill-available;
} }
a { a {
color: $default-link-color; color: $default-link-color;
text-decoration: none; text-decoration: none;
...@@ -127,6 +126,9 @@ button { ...@@ -127,6 +126,9 @@ button {
padding-left: 16px; padding-left: 16px;
padding-right: 10px; padding-right: 10px;
@include btn-pass; @include btn-pass;
&.pass {
@include cn-regular-18;
}
} }
.customCheck { .customCheck {
display: inline-grid; display: inline-grid;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment