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 6d4b4d18a4158045a1ff9250ba0fdb728f9a22a9..4c40d515d335170b75f43258856a35a7d195feeb 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 e8dccf0aa4f07dbb43e5124e54c6e15a2e7f7c32..06d614bdf70bc268780a2cab82c94ef1e76feddc 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 6d4b4d18a4158045a1ff9250ba0fdb728f9a22a9..4c40d515d335170b75f43258856a35a7d195feeb 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 1367d3ffb8cbc6a50aafbd09f631129e7642b712..24907ed96df79f1f5e6725017bbdcb09fadbc229 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 29ebd56802926ce8e1dd51b126c17174cb375ae6..167547525571551222c44b9700fa9aa7b97ba987 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&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 41bf5e5ccbb895863b15fd2fcb0fa273a0d750d0..35e17280da7fb1474ab6bee2f0d98cd2a9cbbd2c 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&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 70835c8d948a7f121d0772517212415acbe60b07..c7c95a12289942a910e3b59c389671633612365f 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&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 9c51fd52975046e0220e2424add857aa719a6119..5da5d32037c0691879ffbe9e3c88af6e0f0dec40 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&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>