From a33f3ac0619f037f79b2fbb4e071ac8b6e2f7f38 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Wed, 29 May 2019 10:56:25 +0200
Subject: [PATCH] =?UTF-8?q?remplacement=20ic=C3=B4ne=20SVG=20"excel"=20par?=
=?UTF-8?q?=20une=20ic=C3=B4ne=20standard=20(plus=20compatible)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/app.component.ts | 6 ------
.../fixedvar-results/fixed-results.component.html | 2 +-
.../fixedvar-results/fixed-results.component.scss | 6 ------
.../components/fixedvar-results/var-results.component.html | 2 +-
.../components/fixedvar-results/var-results.component.scss | 3 ---
.../components/pab-results/pab-results-table.component.html | 2 +-
.../components/pab-results/pab-results-table.component.scss | 3 ---
src/assets/icons/file-excel-box.svg | 1 -
src/assets/icons/file-excel.svg | 1 -
9 files changed, 3 insertions(+), 23 deletions(-)
delete mode 100644 src/assets/icons/file-excel-box.svg
delete mode 100644 src/assets/icons/file-excel.svg
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index c4ebf521a..cf38a7c63 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -124,12 +124,6 @@ export class AppComponent implements OnInit, OnDestroy, Observer {
this.showLoading(false);
}
});
-
- // icônes personnalisées
- this.matIconRegistry.addSvgIcon(
- "file_excel",
- this.domSanitizer.bypassSecurityTrustResourceUrl("../../assets/icons/file-excel.svg")
- );
}
/**
diff --git a/src/app/components/fixedvar-results/fixed-results.component.html b/src/app/components/fixedvar-results/fixed-results.component.html
index 1c2c8f0b4..d915732d8 100644
--- a/src/app/components/fixedvar-results/fixed-results.component.html
+++ b/src/app/components/fixedvar-results/fixed-results.component.html
@@ -2,7 +2,7 @@
<div class="fixed-results-buttons">
<button mat-icon-button (click)="exportAsSpreadsheet()">
- <mat-icon color="primary" svgIcon="file_excel" class="scaled09"></mat-icon>
+ <mat-icon color="primary">file_download</mat-icon>
</button>
</div>
diff --git a/src/app/components/fixedvar-results/fixed-results.component.scss b/src/app/components/fixedvar-results/fixed-results.component.scss
index 5a8e48d7a..c2fee955e 100644
--- a/src/app/components/fixedvar-results/fixed-results.component.scss
+++ b/src/app/components/fixedvar-results/fixed-results.component.scss
@@ -16,12 +16,6 @@
button {
margin-left: 3px;
width: auto;
-
- mat-icon {
- &.scaled09 {
- transform: scale(0.9);
- }
- }
}
}
diff --git a/src/app/components/fixedvar-results/var-results.component.html b/src/app/components/fixedvar-results/var-results.component.html
index 30d0afac8..e7bbd993f 100644
--- a/src/app/components/fixedvar-results/var-results.component.html
+++ b/src/app/components/fixedvar-results/var-results.component.html
@@ -2,7 +2,7 @@
<div fxFlex="1 1 100%">
<div class="var-results-buttons">
<button mat-icon-button (click)="exportAsSpreadsheet()">
- <mat-icon color="primary" svgIcon="file_excel" class="scaled09"></mat-icon>
+ <mat-icon color="primary">file_download</mat-icon>
</button>
<button mat-icon-button *ngIf="! isFullscreen" (click)="setFullscreen(variableResults)">
<mat-icon color="primary" class="scaled12">fullscreen</mat-icon>
diff --git a/src/app/components/fixedvar-results/var-results.component.scss b/src/app/components/fixedvar-results/var-results.component.scss
index aa3f8ec31..12d1148fc 100644
--- a/src/app/components/fixedvar-results/var-results.component.scss
+++ b/src/app/components/fixedvar-results/var-results.component.scss
@@ -21,9 +21,6 @@
&.scaled12 {
transform: scale(1.2)
}
- &.scaled09 {
- transform: scale(0.9);
- }
}
}
}
diff --git a/src/app/components/pab-results/pab-results-table.component.html b/src/app/components/pab-results/pab-results-table.component.html
index bbdbf38db..4a86d0a98 100644
--- a/src/app/components/pab-results/pab-results-table.component.html
+++ b/src/app/components/pab-results/pab-results-table.component.html
@@ -3,7 +3,7 @@
<div fxFlex="1 1 100%">
<div class="pab-results-table-buttons">
<button mat-icon-button (click)="exportAsSpreadsheet()">
- <mat-icon color="primary" svgIcon="file_excel" class="scaled09"></mat-icon>
+ <mat-icon color="primary">file_download</mat-icon>
</button>
<button mat-icon-button *ngIf="! isFullscreen" (click)="setFullscreen(pabResultsTable)">
<mat-icon color="primary" class="scaled12">fullscreen</mat-icon>
diff --git a/src/app/components/pab-results/pab-results-table.component.scss b/src/app/components/pab-results/pab-results-table.component.scss
index 780da209d..7e227e04e 100644
--- a/src/app/components/pab-results/pab-results-table.component.scss
+++ b/src/app/components/pab-results/pab-results-table.component.scss
@@ -21,9 +21,6 @@
&.scaled12 {
transform: scale(1.2)
}
- &.scaled09 {
- transform: scale(0.9);
- }
}
}
}
diff --git a/src/assets/icons/file-excel-box.svg b/src/assets/icons/file-excel-box.svg
deleted file mode 100644
index f0be5069b..000000000
--- a/src/assets/icons/file-excel-box.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M16.2,17H14.2L12,13.2L9.8,17H7.8L11,12L7.8,7H9.8L12,10.8L14.2,7H16.2L13,12M19,3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3Z" /></svg>
\ No newline at end of file
diff --git a/src/assets/icons/file-excel.svg b/src/assets/icons/file-excel.svg
deleted file mode 100644
index 77acecd83..000000000
--- a/src/assets/icons/file-excel.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M6,2H14L20,8V20A2,2 0 0,1 18,22H6A2,2 0 0,1 4,20V4A2,2 0 0,1 6,2M13,3.5V9H18.5L13,3.5M17,11H13V13H14L12,14.67L10,13H11V11H7V13H8L11,15.5L8,18H7V20H11V18H10L12,16.33L14,18H13V20H17V18H16L13,15.5L16,13H17V11Z" /></svg>
\ No newline at end of file
--
GitLab