From 2be44dac0ed1189e5c9e752792703c8827a5c146 Mon Sep 17 00:00:00 2001
From: Oussama <oussama.zerouali@smile.fr>
Date: Wed, 17 Feb 2021 17:55:39 +0100
Subject: [PATCH] fix more rebase issues

---
 .../src/main/config/sass/_font-styles.scss    | 112 ++++++++++++++++++
 .../src/main/resources/static/css/cas.css     | 112 ++++++++++++++++++
 .../src/sass/fonts/font-styles.css            | 112 ++++++++++++++++++
 ui/ui-frontend/package-lock.json              |   2 +-
 ui/ui-frontend/projects/demo/src/index.html   |   8 --
 .../projects/identity/src/index.html          |  10 --
 ui/ui-frontend/projects/portal/src/index.html |  15 +--
 .../projects/starter-kit/src/index.html       |  11 +-
 8 files changed, 343 insertions(+), 39 deletions(-)

diff --git a/cas/cas-server/src/main/config/sass/_font-styles.scss b/cas/cas-server/src/main/config/sass/_font-styles.scss
index 6d4b4d18a..4c40d515d 100644
--- a/cas/cas-server/src/main/config/sass/_font-styles.scss
+++ b/cas/cas-server/src/main/config/sass/_font-styles.scss
@@ -6,6 +6,102 @@
   src: url('fontStyles/mulishFont200.woff2?7pptag') format('woff2');
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
+/* latin */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 300;
+  src: url('fontStyles/mulishFont200.woff2?7pptag') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 400;
+  src: url('fontStyles/mulishFont200.woff2?7pptag') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 500;
+  src: url('fontStyles/mulishFont200.woff2?7pptag') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 600;
+  src: url('fontStyles/mulishFont200.woff2?7pptag') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 700;
+  src: url('fontStyles/mulishFont200.woff2?7pptag') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 800;
+  src: url('fontStyles/mulishFont200.woff2?7pptag') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 900;
+  src: url('fontStyles/mulishFont200.woff2?7pptag') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 200;
+  src: url('fontStyles/mulishFont700.woff2?7pptag') format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 300;
+  src: url('fontStyles/mulishFont700.woff2?7pptag') format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 400;
+  src: url('fontStyles/mulishFont700.woff2?7pptag') format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 500;
+  src: url('fontStyles/mulishFont700.woff2?7pptag') format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 600;
+  src: url('fontStyles/mulishFont700.woff2?7pptag') format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
 /* latin-ext */
 @font-face {
   font-family: 'Mulish';
@@ -14,5 +110,21 @@
   src: url('fontStyles/mulishFont700.woff2?7pptag') format('woff2');
   unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
+/* latin-ext */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 800;
+  src: url('fontStyles/mulishFont700.woff2?7pptag') format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 900;
+  src: url('fontStyles/mulishFont700.woff2?7pptag') format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
 
 
diff --git a/cas/cas-server/src/main/resources/static/css/cas.css b/cas/cas-server/src/main/resources/static/css/cas.css
index e8dccf0aa..06d614bdf 100644
--- a/cas/cas-server/src/main/resources/static/css/cas.css
+++ b/cas/cas-server/src/main/resources/static/css/cas.css
@@ -38,6 +38,102 @@
   src: url("fontStyles/mulishFont200.woff2?7pptag") format("woff2");
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; }
 
+/* latin */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 300;
+  src: url("fontStyles/mulishFont200.woff2?7pptag") format("woff2");
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; }
+
+/* latin */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 400;
+  src: url("fontStyles/mulishFont200.woff2?7pptag") format("woff2");
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; }
+
+/* latin */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 500;
+  src: url("fontStyles/mulishFont200.woff2?7pptag") format("woff2");
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; }
+
+/* latin */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 600;
+  src: url("fontStyles/mulishFont200.woff2?7pptag") format("woff2");
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; }
+
+/* latin */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 700;
+  src: url("fontStyles/mulishFont200.woff2?7pptag") format("woff2");
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; }
+
+/* latin */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 800;
+  src: url("fontStyles/mulishFont200.woff2?7pptag") format("woff2");
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; }
+
+/* latin */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 900;
+  src: url("fontStyles/mulishFont200.woff2?7pptag") format("woff2");
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; }
+
+/* latin-ext */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 200;
+  src: url("fontStyles/mulishFont700.woff2?7pptag") format("woff2");
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; }
+
+/* latin-ext */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 300;
+  src: url("fontStyles/mulishFont700.woff2?7pptag") format("woff2");
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; }
+
+/* latin-ext */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 400;
+  src: url("fontStyles/mulishFont700.woff2?7pptag") format("woff2");
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; }
+
+/* latin-ext */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 500;
+  src: url("fontStyles/mulishFont700.woff2?7pptag") format("woff2");
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; }
+
+/* latin-ext */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 600;
+  src: url("fontStyles/mulishFont700.woff2?7pptag") format("woff2");
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; }
+
 /* latin-ext */
 @font-face {
   font-family: 'Mulish';
@@ -46,6 +142,22 @@
   src: url("fontStyles/mulishFont700.woff2?7pptag") format("woff2");
   unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; }
 
+/* latin-ext */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 800;
+  src: url("fontStyles/mulishFont700.woff2?7pptag") format("woff2");
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; }
+
+/* latin-ext */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 900;
+  src: url("fontStyles/mulishFont700.woff2?7pptag") format("woff2");
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; }
+
 .mat-menu-panel.nav-menu {
   border-radius: 10px;
   margin-top: 4px; }
diff --git a/ui/ui-frontend-common/src/sass/fonts/font-styles.css b/ui/ui-frontend-common/src/sass/fonts/font-styles.css
index 6d4b4d18a..4c40d515d 100644
--- a/ui/ui-frontend-common/src/sass/fonts/font-styles.css
+++ b/ui/ui-frontend-common/src/sass/fonts/font-styles.css
@@ -6,6 +6,102 @@
   src: url('fontStyles/mulishFont200.woff2?7pptag') format('woff2');
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
+/* latin */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 300;
+  src: url('fontStyles/mulishFont200.woff2?7pptag') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 400;
+  src: url('fontStyles/mulishFont200.woff2?7pptag') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 500;
+  src: url('fontStyles/mulishFont200.woff2?7pptag') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 600;
+  src: url('fontStyles/mulishFont200.woff2?7pptag') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 700;
+  src: url('fontStyles/mulishFont200.woff2?7pptag') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 800;
+  src: url('fontStyles/mulishFont200.woff2?7pptag') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 900;
+  src: url('fontStyles/mulishFont200.woff2?7pptag') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 200;
+  src: url('fontStyles/mulishFont700.woff2?7pptag') format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 300;
+  src: url('fontStyles/mulishFont700.woff2?7pptag') format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 400;
+  src: url('fontStyles/mulishFont700.woff2?7pptag') format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 500;
+  src: url('fontStyles/mulishFont700.woff2?7pptag') format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 600;
+  src: url('fontStyles/mulishFont700.woff2?7pptag') format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
 /* latin-ext */
 @font-face {
   font-family: 'Mulish';
@@ -14,5 +110,21 @@
   src: url('fontStyles/mulishFont700.woff2?7pptag') format('woff2');
   unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
+/* latin-ext */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 800;
+  src: url('fontStyles/mulishFont700.woff2?7pptag') format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Mulish';
+  font-style: normal;
+  font-weight: 900;
+  src: url('fontStyles/mulishFont700.woff2?7pptag') format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
 
 
diff --git a/ui/ui-frontend/package-lock.json b/ui/ui-frontend/package-lock.json
index 1367d3ffb..24907ed96 100644
--- a/ui/ui-frontend/package-lock.json
+++ b/ui/ui-frontend/package-lock.json
@@ -16638,7 +16638,7 @@
     },
     "ui-frontend-common": {
       "version": "file:../ui-frontend-common/ui-frontend-common-2.1.0.tgz",
-      "integrity": "sha512-J6XDKRraz6ZKrA9/y7ICcEia3urC3YOqU+/QMv/CaDJA4h7VEnp3j6Fz5xUZeCjfTfZJJyGGFY+xguCMSFMfAw==",
+      "integrity": "sha512-WFRuWqvO0PM+UkAwZKPtsHl90bwvSomn4Iph1q41wPYgj51+hwFqYoUBzHkL9E14xKrnc2daT6FQEW3+cvKFDg==",
       "requires": {
         "@angular/material-moment-adapter": "^10.2.3",
         "@ngx-translate/core": "^12.0.0",
diff --git a/ui/ui-frontend/projects/demo/src/index.html b/ui/ui-frontend/projects/demo/src/index.html
index 29ebd5680..167547525 100644
--- a/ui/ui-frontend/projects/demo/src/index.html
+++ b/ui/ui-frontend/projects/demo/src/index.html
@@ -7,15 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
-<<<<<<< HEAD
-  <link rel="preconnect" href="https://fonts.googleapis.com">
-  <link rel="dns-prefetch" href="https://fonts.googleapis.com">
-  <link rel="preconnect" href="https://fonts.gstatic.com">
-  <link rel="dns-prefetch" href="https://fonts.gstatic.com">
-  <link href="https://fonts.googleapis.com/css?family=Mulish:200,300,400,500,600,700,800,900&amp;display=swap" rel="stylesheet">
-=======
 
->>>>>>> 7f97a853a... import Mulish googleApi fonts
 </head>
 <body>
   <demo-root></demo-root>
diff --git a/ui/ui-frontend/projects/identity/src/index.html b/ui/ui-frontend/projects/identity/src/index.html
index 41bf5e5cc..35e17280d 100644
--- a/ui/ui-frontend/projects/identity/src/index.html
+++ b/ui/ui-frontend/projects/identity/src/index.html
@@ -7,16 +7,6 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
-<<<<<<< HEAD
-  <link rel="preconnect" href="https://fonts.googleapis.com">
-  <link rel="dns-prefetch" href="https://fonts.googleapis.com">
-  <link rel="preconnect" href="https://fonts.gstatic.com">
-  <link rel="dns-prefetch" href="https://fonts.gstatic.com">
-  <link href="https://fonts.googleapis.com/css?family=Mulish:200,300,400,500,600,700,800,900&amp;display=swap" rel="stylesheet">
-  <meta name="theme-color" content="#1976d2">
-=======
-
->>>>>>> 7f97a853a... import Mulish googleApi fonts
 </head>
 <body>
   <app-root> <!-- selector from app.component.ts -->
diff --git a/ui/ui-frontend/projects/portal/src/index.html b/ui/ui-frontend/projects/portal/src/index.html
index 70835c8d9..c7c95a122 100644
--- a/ui/ui-frontend/projects/portal/src/index.html
+++ b/ui/ui-frontend/projects/portal/src/index.html
@@ -4,24 +4,15 @@
   <meta charset="utf-8">
   <title>Portail</title>
   <base href="/">
-  
+
   <meta name="Description" content="Portail des applications de l'archivage.">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
-<<<<<<< HEAD
-  <link rel="preconnect" href="https://fonts.googleapis.com">
-  <link rel="dns-prefetch" href="https://fonts.googleapis.com">
-  <link rel="preconnect" href="https://fonts.gstatic.com">
-  <link rel="dns-prefetch" href="https://fonts.gstatic.com">
-  <link href="https://fonts.googleapis.com/css?family=Mulish:200,300,400,500,600,700,800,900&amp;display=swap" rel="stylesheet">
-  <meta name="theme-color" content="#1976d2">
-=======
 
->>>>>>> 7f97a853a... import Mulish googleApi fonts
 </head>
 <body>
   <app-root> <!-- selector from app.component.ts -->
-    
+
     <!-- loading layout replaced by app after startupp -->
     <div class="app-loading">
       <div class="logo"></div>
@@ -30,7 +21,7 @@
         </circle>
       </svg>
     </div>
-    
+
   </app-root>
   <noscript>Please enable JavaScript to continue using this application.</noscript>
 </body>
diff --git a/ui/ui-frontend/projects/starter-kit/src/index.html b/ui/ui-frontend/projects/starter-kit/src/index.html
index 9c51fd529..5da5d3203 100644
--- a/ui/ui-frontend/projects/starter-kit/src/index.html
+++ b/ui/ui-frontend/projects/starter-kit/src/index.html
@@ -4,20 +4,15 @@
   <meta charset="utf-8">
   <title>Starter-kit</title>
   <base href="/">
-  
+
   <meta name="Description" content="Portail des applications de l'archivage.">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
-  <link rel="preconnect" href="https://fonts.googleapis.com">
-  <link rel="dns-prefetch" href="https://fonts.googleapis.com">
-  <link rel="preconnect" href="https://fonts.gstatic.com">
-  <link rel="dns-prefetch" href="https://fonts.gstatic.com">
-  <link href="https://fonts.googleapis.com/css?family=Mulish:200,300,400,500,600,700,800,900&amp;display=swap" rel="stylesheet">
   <meta name="theme-color" content="#1976d2">
 </head>
 <body>
   <app-root> <!-- selector from app.component.ts -->
-    
+
     <!-- loading layout replaced by app after startupp -->
     <div class="app-loading">
       <div class="logo"></div>
@@ -26,7 +21,7 @@
         </circle>
       </svg>
     </div>
-    
+
   </app-root>
   <noscript>Please enable JavaScript to continue using this application.</noscript>
 </body>
-- 
GitLab