diff --git a/services/idp/Makefile b/services/idp/Makefile index 05ef0b00a4..c20ccecc43 100644 --- a/services/idp/Makefile +++ b/services/idp/Makefile @@ -32,29 +32,14 @@ ci-node-generate: assets .PHONY: assets assets: pnpm-build \ assets/identifier/static \ - assets/identifier/static/favicon.ico \ - assets/identifier/static/opencloud-500.woff2 \ - assets/identifier/static/opencloud-750.woff2 + assets/identifier/static/favicon.ico assets/identifier/static: mkdir -p assets/identifier/static -# check if urls are stable, if not replace with stable location -FAVICON_URL = https://opencloud.eu/themes/cloudy/src/assets/favicon/favicon.ico -FONT_VARIATION_500_URL = https://gitlab.opencode.de/opentalk/web-frontend/-/raw/main/app/public/assets/fonts/opentalk/regular/opentalk-regular.woff2 -FONT_VARIATION_750_URL = https://gitlab.opencode.de/opentalk/web-frontend/-/raw/main/app/public/assets/fonts/opentalk/bold/opentalk-bold.woff2 - .PHONY: assets/identifier/static/favicon.ico # force overwrite assets/identifier/static/favicon.ico: - curl --fail -o assets/identifier/static/favicon.ico ${FAVICON_URL} - -.PHONY: assets/identifier/static/opencloud-500.woff2 -assets/identifier/static/opencloud-500.woff2: - curl --fail -o assets/identifier/static/opencloud-500.woff2 ${FONT_VARIATION_500_URL} - -.PHONY: assets/identifier/static/opencloud-750.woff2 -assets/identifier/static/opencloud-750.woff2: - curl --fail -o assets/identifier/static/opencloud-750.woff2 ${FONT_VARIATION_750_URL} + cp src/images/favicon.ico assets/identifier/static/favicon.ico .PHONY: pnpm-build pnpm-build: node_modules diff --git a/services/idp/public/index.html b/services/idp/public/index.html index ea22435988..a53c63bde4 100644 --- a/services/idp/public/index.html +++ b/services/idp/public/index.html @@ -1,21 +1,6 @@ - diff --git a/services/idp/src/app.css b/services/idp/src/app.css index 5e36c81ba9..77cced37e1 100644 --- a/services/idp/src/app.css +++ b/services/idp/src/app.css @@ -1,4 +1,18 @@ /* additional css on top of kpop */ +@font-face { + font-family: OpenCloud; + src: url('./fonts/OpenCloud500-Regular.woff2') format('woff2'); + font-weight: normal; + font-style: normal; + +} +@font-face { + font-family: OpenCloud; + src: url('./fonts/OpenCloud750-Bold.woff2') format('woff2'); + font-weight: bold; + font-style: normal; +} + html { font-feature-settings: "cv11"; } diff --git a/services/idp/src/fonts/OpenCloud500-Regular.woff2 b/services/idp/src/fonts/OpenCloud500-Regular.woff2 new file mode 100644 index 0000000000..219abd872f Binary files /dev/null and b/services/idp/src/fonts/OpenCloud500-Regular.woff2 differ diff --git a/services/idp/src/fonts/OpenCloud750-Bold.woff2 b/services/idp/src/fonts/OpenCloud750-Bold.woff2 new file mode 100644 index 0000000000..1bc7076851 Binary files /dev/null and b/services/idp/src/fonts/OpenCloud750-Bold.woff2 differ diff --git a/services/idp/src/images/favicon.ico b/services/idp/src/images/favicon.ico new file mode 100644 index 0000000000..bc0c9b7e11 Binary files /dev/null and b/services/idp/src/images/favicon.ico differ