From 83ea88f74f4f1c7d5dd84be9671df4e05ed3a89c Mon Sep 17 00:00:00 2001
From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com>
Date: Thu, 25 Feb 2021 12:09:34 +0100
Subject: [PATCH] fix: icon color + alignements
---
src/app/form/form.component.scss | 6 +++++-
src/app/shared/components/svg-icon/svg-icon.component.scss | 4 ++++
.../structure-details/structure-details.component.html | 2 +-
src/assets/ico/sprite.svg | 2 +-
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/app/form/form.component.scss b/src/app/form/form.component.scss
index 6a6f572f7..ee642eea1 100644
--- a/src/app/form/form.component.scss
+++ b/src/app/form/form.component.scss
@@ -87,7 +87,7 @@ h3 {
.content {
.editHome {
height: calc(
- 100vh - #{$header-height} - #{$footer-height} - 81px - 1px - 55px
+ 100vh - #{$header-height} - #{$footer-height} - 81px - 1px - 55px - 24px
) !important; // -1px because of header border
}
@media #{$tablet} {
@@ -512,9 +512,13 @@ img {
.headerEditMode {
max-width: 960px;
margin: auto;
+ margin-top: 24px;
h2 {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
+ @media #{$tablet} {
+ margin-top: 0;
+ }
}
diff --git a/src/app/shared/components/svg-icon/svg-icon.component.scss b/src/app/shared/components/svg-icon/svg-icon.component.scss
index 30dac9094..b6117f5ca 100644
--- a/src/app/shared/components/svg-icon/svg-icon.component.scss
+++ b/src/app/shared/components/svg-icon/svg-icon.component.scss
@@ -13,6 +13,10 @@
fill: $grey-3;
stroke: $grey-3;
}
+ &.grey-1 {
+ fill: $grey-1;
+ stroke: $grey-1;
+ }
}
svg {
diff --git a/src/app/structure-list/components/structure-details/structure-details.component.html b/src/app/structure-list/components/structure-details/structure-details.component.html
index f0393fbff..9eda0b470 100644
--- a/src/app/structure-list/components/structure-details/structure-details.component.html
+++ b/src/app/structure-list/components/structure-details/structure-details.component.html
@@ -108,7 +108,7 @@
fxLayoutAlign="none center"
fxLayoutGap="13px"
>
- <app-svg-icon [type]="'ico'" [icon]="'email'"></app-svg-icon>
+ <app-svg-icon [type]="'ico'" [iconClass]="'grey-1'" [icon]="'email'"></app-svg-icon>
<p>{{ structure.contactMail }}</p>
</div>
<div *ngIf="structure.hasPassNumeric()" fxLayout="row" fxLayoutAlign="none center" fxLayoutGap="13px">
diff --git a/src/assets/ico/sprite.svg b/src/assets/ico/sprite.svg
index 83c868b1b..748235c0a 100644
--- a/src/assets/ico/sprite.svg
+++ b/src/assets/ico/sprite.svg
@@ -78,7 +78,7 @@
</symbol>
<symbol id ="email" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M3.5 4H19.5C20.3284 4 21 4.67157 21 5.5V16.0714C21 16.8998 20.3284 17.5714 19.5 17.5714H3.5C2.67157 17.5714 2 16.8998 2 16.0714V5.5C2 4.67157 2.67157 4 3.5 4ZM2.91716 6.02444C3.04832 5.78143 3.35163 5.69075 3.59464 5.8219L11.2431 9.94966C11.5474 10.1138 11.9148 10.1093 12.2149 9.93753L19.3945 5.82797C19.6341 5.69079 19.9396 5.77387 20.0768 6.01353C20.214 6.25318 20.1309 6.55867 19.8913 6.69585L12.7116 10.8054C12.1116 11.1489 11.3767 11.1581 10.7682 10.8297L3.11971 6.70192C2.8767 6.57077 2.78602 6.26745 2.91716 6.02444Z" fill="#333333"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.5 4H19.5C20.3284 4 21 4.67157 21 5.5V16.0714C21 16.8998 20.3284 17.5714 19.5 17.5714H3.5C2.67157 17.5714 2 16.8998 2 16.0714V5.5C2 4.67157 2.67157 4 3.5 4ZM2.91716 6.02444C3.04832 5.78143 3.35163 5.69075 3.59464 5.8219L11.2431 9.94966C11.5474 10.1138 11.9148 10.1093 12.2149 9.93753L19.3945 5.82797C19.6341 5.69079 19.9396 5.77387 20.0768 6.01353C20.214 6.25318 20.1309 6.55867 19.8913 6.69585L12.7116 10.8054C12.1116 11.1489 11.3767 11.1581 10.7682 10.8297L3.11971 6.70192C2.8767 6.57077 2.78602 6.26745 2.91716 6.02444Z" stroke="none"/>
</symbol>
<symbol id="password" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
--
GitLab