diff --git a/services/idp/Makefile b/services/idp/Makefile index d729ef7017..a33520f2ec 100644 --- a/services/idp/Makefile +++ b/services/idp/Makefile @@ -32,17 +32,30 @@ ci-node-generate: assets .PHONY: assets assets: pnpm-build \ assets/identifier/static \ - assets/identifier/static/favicon.ico + assets/identifier/static/favicon.ico \ + assets/identifier/static/opentalk-500.woff2 \ + assets/identifier/static/opentalk-750.woff2 assets/identifier/static: mkdir -p assets/identifier/static -FAVICON_URL = https://raw.githubusercontent.com/owncloud/assets/main/favicon.ico +# 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/opentalk-500.woff2 +assets/identifier/static/opentalk-500.woff2: + curl --fail -o assets/identifier/static/opentalk-500.woff2 ${FONT_VARIATION_500_URL} + +.PHONY: assets/identifier/static/opentalk-750.woff2 +assets/identifier/static/opentalk-750.woff2: + curl --fail -o assets/identifier/static/opentalk-750.woff2 ${FONT_VARIATION_750_URL} + .PHONY: pnpm-build pnpm-build: node_modules #pnpm lint #TODO: activate diff --git a/services/idp/public/index.html b/services/idp/public/index.html index a53c63bde4..420320691d 100644 --- a/services/idp/public/index.html +++ b/services/idp/public/index.html @@ -1,6 +1,21 @@ + diff --git a/services/idp/src/app.css b/services/idp/src/app.css index dee99c285d..1cb394da45 100644 --- a/services/idp/src/app.css +++ b/services/idp/src/app.css @@ -1,17 +1,10 @@ /* additional css on top of kpop */ -@font-face { - font-family: Inter; - src: url(./fonts/inter.woff2) format('woff2'), url(./fonts/inter.ttf) format('truetype'); - font-weight: 100 900; - font-style: oblique 0deg 12deg; -} - html { font-feature-settings: "cv11"; } body { - font-family: Inter, sans-serif; + font-family: OpenTalk, sans-serif; } strong { @@ -19,7 +12,7 @@ strong { } .oc-login-bg { - background-image: url(./images/background.jpg); + background-image: url(./images/background.png); background-size: cover; background-repeat: no-repeat; background-position: center; @@ -101,9 +94,9 @@ strong { .oc-button-primary { /* Needs to be important to overwrite material-ui */ width: 100%; - background: linear-gradient(to right, #2c588e, #4e85c8) -1px; - background-size: 103% !important; + background: #e2baff !important; border: 1px solid transparent !important; + color: #19353f !important; } .oc-checkbox-dark svg { diff --git a/services/idp/src/components/ResponsiveScreen.jsx b/services/idp/src/components/ResponsiveScreen.jsx index e94940991a..6be841775e 100644 --- a/services/idp/src/components/ResponsiveScreen.jsx +++ b/services/idp/src/components/ResponsiveScreen.jsx @@ -63,7 +63,7 @@ const ResponsiveScreen = (props) => { ); diff --git a/services/idp/src/fancy-background.css b/services/idp/src/fancy-background.css index 67691eaac4..89db37680b 100644 --- a/services/idp/src/fancy-background.css +++ b/services/idp/src/fancy-background.css @@ -12,6 +12,6 @@ background-size: cover; background-repeat: no-repeat; background-position: center; - background-image: url(./images/background.jpg); + background-image: url(./images/background.png); z-index: 0; } diff --git a/services/idp/src/fonts/inter.ttf b/services/idp/src/fonts/inter.ttf deleted file mode 100644 index ec3164efa8..0000000000 Binary files a/services/idp/src/fonts/inter.ttf and /dev/null differ diff --git a/services/idp/src/fonts/inter.woff2 b/services/idp/src/fonts/inter.woff2 deleted file mode 100644 index fd6553cec0..0000000000 Binary files a/services/idp/src/fonts/inter.woff2 and /dev/null differ diff --git a/services/idp/src/images/background.jpg b/services/idp/src/images/background.jpg deleted file mode 100644 index 11121f4279..0000000000 Binary files a/services/idp/src/images/background.jpg and /dev/null differ diff --git a/services/idp/src/images/background.png b/services/idp/src/images/background.png new file mode 100644 index 0000000000..1005fc5d69 Binary files /dev/null and b/services/idp/src/images/background.png differ diff --git a/services/idp/src/images/loginscreen-bg.svg b/services/idp/src/images/loginscreen-bg.svg deleted file mode 100644 index d52a08f5d7..0000000000 --- a/services/idp/src/images/loginscreen-bg.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -