diff --git a/frontend/resources/images/icons/brand-gitlab.svg b/frontend/resources/images/icons/brand-gitlab.svg
index 8dc42e815..04993577b 100644
--- a/frontend/resources/images/icons/brand-gitlab.svg
+++ b/frontend/resources/images/icons/brand-gitlab.svg
@@ -1,10 +1 @@
-
+
\ No newline at end of file
diff --git a/frontend/resources/images/icons/brand-openid.svg b/frontend/resources/images/icons/brand-openid.svg
new file mode 100644
index 000000000..a335b6664
--- /dev/null
+++ b/frontend/resources/images/icons/brand-openid.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/frontend/resources/styles/main/layouts/login.scss b/frontend/resources/styles/main/layouts/login.scss
index 574343485..ced678213 100644
--- a/frontend/resources/styles/main/layouts/login.scss
+++ b/frontend/resources/styles/main/layouts/login.scss
@@ -200,3 +200,4 @@
margin: 0 $size-2;
}
}
+
diff --git a/frontend/src/app/main/ui/auth/login.cljs b/frontend/src/app/main/ui/auth/login.cljs
index e5f5890f9..41e2c7e71 100644
--- a/frontend/src/app/main/ui/auth/login.cljs
+++ b/frontend/src/app/main/ui/auth/login.cljs
@@ -25,7 +25,8 @@
(def show-alt-login-buttons?
(or cf/google-client-id
cf/gitlab-client-id
- cf/github-client-id))
+ cf/github-client-id
+ cf/oidc-client-id))
(s/def ::email ::us/email)
(s/def ::password ::us/not-empty-string)
@@ -137,29 +138,25 @@
(when cf/google-client-id
[:a.btn-primary.btn-large.btn-google-auth
{:on-click #(login-with-oauth % :google params)}
- [:img.logo
- {:src "/images/icons/brand-google.svg"}]
+ [:span.logo i/brand-google]
(tr "auth.login-with-google-submit")])
- (when cf/gitlab-client-id
- [:a.btn-primary.btn-large.btn-gitlab-auth
- {:on-click #(login-with-oauth % :gitlab params)}
- [:img.logo
- {:src "/images/icons/brand-gitlab.svg"}]
- (tr "auth.login-with-gitlab-submit")])
-
(when cf/github-client-id
[:a.btn-primary.btn-large.btn-github-auth
{:on-click #(login-with-oauth % :github params)}
- [:img.logo
- {:src "/images/icons/brand-github.svg"}]
+ [:span.logo i/brand-github]
(tr "auth.login-with-github-submit")])
- (when cf/oidc-client-id
+ (when cf/gitlab-client-id
+ [:a.btn-primary.btn-large.btn-gitlab-auth
+ {:on-click #(login-with-oauth % :gitlab params)}
+ [:span.logo i/brand-gitlab]
+ (tr "auth.login-with-gitlab-submit")])
+
+ (when cf/oidc-client-id
[:a.btn-primary.btn-large.btn-github-auth
{:on-click #(login-with-oauth % :oidc params)}
- [:img.logo
- {:src "/images/icons/brand-github.svg"}]
+ [:span.logo i/brand-openid]
(tr "auth.login-with-oidc-submit")])])
(mf/defc login-button-oidc
@@ -174,7 +171,6 @@
[:div.generic-form.login-form
[:div.form-container
[:h1 {:data-test "login-title"} (tr "auth.login-title")]
- [:div.subtitle (tr "auth.login-subtitle")]
(when show-alt-login-buttons?
[:*
diff --git a/frontend/src/app/main/ui/icons.cljs b/frontend/src/app/main/ui/icons.cljs
index db8a4ead5..d6ff5f0da 100644
--- a/frontend/src/app/main/ui/icons.cljs
+++ b/frontend/src/app/main/ui/icons.cljs
@@ -170,6 +170,10 @@
(def uppercase (icon-xref :uppercase))
(def user (icon-xref :user))
+(def brand-openid (icon-xref :brand-openid))
+(def brand-github (icon-xref :brand-github))
+(def brand-gitlab (icon-xref :brand-gitlab))
+(def brand-google (icon-xref :brand-google))
(def loader-pencil
(mf/html
diff --git a/frontend/translations/ar.po b/frontend/translations/ar.po
index e042e8d6d..c1af242ae 100644
--- a/frontend/translations/ar.po
+++ b/frontend/translations/ar.po
@@ -56,10 +56,6 @@ msgstr "تسجيل الدخول هنا"
msgid "auth.login-submit"
msgstr "تسجيل الدخول"
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "أدخل التفاصيل أدناه"
-
#: src/app/main/ui/auth/login.cljs
msgid "auth.login-title"
msgstr "سعيد برؤيتك مجددا!"
diff --git a/frontend/translations/ca.po b/frontend/translations/ca.po
index af65d41fe..c960744f7 100644
--- a/frontend/translations/ca.po
+++ b/frontend/translations/ca.po
@@ -59,10 +59,6 @@ msgstr "Inicieu la sessió aquí"
msgid "auth.login-submit"
msgstr "Entra"
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "Introduïu les vostres dades a continuació"
-
#: src/app/main/ui/auth/login.cljs
msgid "auth.login-title"
msgstr "Ens agrada tornar a veure-vos!"
diff --git a/frontend/translations/da.po b/frontend/translations/da.po
index 16ebcb64d..9f09c8dbd 100644
--- a/frontend/translations/da.po
+++ b/frontend/translations/da.po
@@ -59,10 +59,6 @@ msgstr "Log på her"
msgid "auth.login-submit"
msgstr "Log på"
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "Indtast dine oplysninger nedenunder"
-
#: src/app/main/ui/auth/login.cljs
msgid "auth.login-title"
msgstr "Fedt at se dig igen!"
diff --git a/frontend/translations/de.po b/frontend/translations/de.po
index beafaf131..d2dd6c2b9 100644
--- a/frontend/translations/de.po
+++ b/frontend/translations/de.po
@@ -59,10 +59,6 @@ msgstr "Hier einloggen"
msgid "auth.login-submit"
msgstr "Anmelden"
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "Geben Sie unten Ihre Daten ein"
-
#: src/app/main/ui/auth/login.cljs
msgid "auth.login-title"
msgstr "Schön, Sie wiederzusehen!"
diff --git a/frontend/translations/el.po b/frontend/translations/el.po
index f3100b1c4..582c5da77 100644
--- a/frontend/translations/el.po
+++ b/frontend/translations/el.po
@@ -54,10 +54,6 @@ msgstr "Συνδεθείτε εδώ"
msgid "auth.login-submit"
msgstr "Συνδεθείτε"
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "Εισαγάγετε τα στοιχεία σας παρακάτω"
-
#: src/app/main/ui/auth/login.cljs
msgid "auth.login-title"
msgstr "Χαίρομαι που σας ξαναδώ"
diff --git a/frontend/translations/en.po b/frontend/translations/en.po
index 362b922d6..6eacdf3a1 100644
--- a/frontend/translations/en.po
+++ b/frontend/translations/en.po
@@ -57,10 +57,6 @@ msgstr "Login here"
msgid "auth.login-submit"
msgstr "Login"
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "Enter your details below"
-
#: src/app/main/ui/auth/login.cljs
msgid "auth.login-title"
msgstr "Great to see you again!"
diff --git a/frontend/translations/es.po b/frontend/translations/es.po
index 2768f54dd..963881642 100644
--- a/frontend/translations/es.po
+++ b/frontend/translations/es.po
@@ -59,10 +59,6 @@ msgstr "Entra aquí"
msgid "auth.login-submit"
msgstr "Entrar"
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "Introduce tus datos aquí"
-
#: src/app/main/ui/auth/login.cljs
msgid "auth.login-title"
msgstr "¡Un placer verte de nuevo!"
diff --git a/frontend/translations/fr.po b/frontend/translations/fr.po
index 69fc42465..88c306d11 100644
--- a/frontend/translations/fr.po
+++ b/frontend/translations/fr.po
@@ -59,10 +59,6 @@ msgstr "Se connecter ici"
msgid "auth.login-submit"
msgstr "Se connecter"
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "Entrez vos informations ci‑dessous"
-
#: src/app/main/ui/auth/login.cljs
msgid "auth.login-title"
msgstr "Ravi de vous revoir !"
diff --git a/frontend/translations/he.po b/frontend/translations/he.po
index 5d3be3b37..2aa0f8b37 100644
--- a/frontend/translations/he.po
+++ b/frontend/translations/he.po
@@ -56,10 +56,6 @@ msgstr "כניסה מכאן"
msgid "auth.login-submit"
msgstr "כניסה"
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "נא למלא את הפרטים שלך להלן"
-
#: src/app/main/ui/auth/login.cljs
msgid "auth.login-title"
msgstr "שמחים לראות אותך שוב!"
diff --git a/frontend/translations/id.po b/frontend/translations/id.po
index f9380e177..adc798da5 100644
--- a/frontend/translations/id.po
+++ b/frontend/translations/id.po
@@ -63,10 +63,6 @@ msgstr "Masuk disini"
msgid "auth.login-submit"
msgstr "Masuk"
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "Masukkan detail anda di bawah ini"
-
#: src/app/main/ui/auth/login.cljs
msgid "auth.login-title"
msgstr "Senang bertemu denganmu lagi!"
diff --git a/frontend/translations/pt_BR.po b/frontend/translations/pt_BR.po
index cd0442519..54a936db9 100644
--- a/frontend/translations/pt_BR.po
+++ b/frontend/translations/pt_BR.po
@@ -59,10 +59,6 @@ msgstr "Entrar aqui"
msgid "auth.login-submit"
msgstr "Entrar"
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "Insira seus dados abaixo"
-
#: src/app/main/ui/auth/login.cljs
msgid "auth.login-title"
msgstr "Bom te ver de novo!"
diff --git a/frontend/translations/ro.po b/frontend/translations/ro.po
index 26c1f7e93..14f72441b 100644
--- a/frontend/translations/ro.po
+++ b/frontend/translations/ro.po
@@ -60,10 +60,6 @@ msgstr "Conectează-te"
msgid "auth.login-submit"
msgstr "Intră în cont"
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "Introduceți detaliile dvs. mai jos"
-
#: src/app/main/ui/auth/login.cljs
msgid "auth.login-title"
msgstr "Mă bucur să te văd din nou!"
diff --git a/frontend/translations/ru.po b/frontend/translations/ru.po
index c8c118ca5..dac4374a0 100644
--- a/frontend/translations/ru.po
+++ b/frontend/translations/ru.po
@@ -48,10 +48,6 @@ msgstr "Войти здесь"
msgid "auth.login-submit"
msgstr "Вход"
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "Введите информацию о себе ниже"
-
#: src/app/main/ui/auth/login.cljs
msgid "auth.login-title"
msgstr "Рады видеть Вас снова!"
diff --git a/frontend/translations/tr.po b/frontend/translations/tr.po
index bb1120a81..33a992d25 100644
--- a/frontend/translations/tr.po
+++ b/frontend/translations/tr.po
@@ -59,10 +59,6 @@ msgstr "Buradan oturum açın"
msgid "auth.login-submit"
msgstr "Oturum aç"
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "Bilgilerini aşağıdaki alana gir"
-
#: src/app/main/ui/auth/login.cljs
msgid "auth.login-title"
msgstr "Seni tekrar görmek süper!"
diff --git a/frontend/translations/zh_CN.po b/frontend/translations/zh_CN.po
index 43cfecabd..b29c3026b 100644
--- a/frontend/translations/zh_CN.po
+++ b/frontend/translations/zh_CN.po
@@ -55,10 +55,6 @@ msgstr "在这里登录"
msgid "auth.login-submit"
msgstr "登录"
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "请在下面输入你的详细信息"
-
#: src/app/main/ui/auth/login.cljs
msgid "auth.login-title"
msgstr "很高兴又见到你！"
diff --git a/frontend/translations/zh_Hant.po b/frontend/translations/zh_Hant.po
index dcfd8e9bc..9627b07e1 100644
--- a/frontend/translations/zh_Hant.po
+++ b/frontend/translations/zh_Hant.po
@@ -55,10 +55,6 @@ msgstr "在此登入"
msgid "auth.login-submit"
msgstr "登入"
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "在下方輸入您的詳細資訊"
-
#: src/app/main/ui/auth/login.cljs
msgid "auth.login-title"
msgstr "很高興再次見到你！"