From 379c31330f7d14941d6f619ccd7ad05627712abb Mon Sep 17 00:00:00 2001 From: Martin Wortschack Date: Thu, 6 Sep 2018 09:43:14 +0000 Subject: [PATCH] Resolve "Update presentation for SSO providers on log in page" --- app/assets/images/auth_buttons/auth0_64.png | Bin 0 -> 1815 bytes app/assets/images/auth_buttons/azure_64.png | Bin 695 -> 199 bytes .../images/auth_buttons/bitbucket_64.png | Bin 2161 -> 1299 bytes app/assets/images/auth_buttons/google_64.png | Bin 4366 -> 1625 bytes app/assets/images/auth_buttons/jwt_64.png | Bin 0 -> 2457 bytes .../images/auth_buttons/shibboleth_64.png | Bin 0 -> 2993 bytes app/assets/stylesheets/framework/awards.scss | 4 +-- app/assets/stylesheets/framework/buttons.scss | 8 ++--- app/assets/stylesheets/framework/filters.scss | 4 +-- app/assets/stylesheets/framework/toggle.scss | 4 +-- .../stylesheets/framework/variables.scss | 2 +- app/assets/stylesheets/pages/login.scss | 29 ++++++++++-------- app/assets/stylesheets/pages/settings.scss | 2 +- app/views/devise/sessions/_new_base.html.haml | 4 +-- .../devise/shared/_omniauth_box.html.haml | 27 ++++++++-------- app/views/devise/shared/_signup_box.html.haml | 17 ++++------ app/views/profiles/show.html.haml | 2 +- ...ation-for-sso-providers-on-log-in-page.yml | 5 +++ 18 files changed, 57 insertions(+), 51 deletions(-) create mode 100644 app/assets/images/auth_buttons/auth0_64.png create mode 100644 app/assets/images/auth_buttons/jwt_64.png create mode 100644 app/assets/images/auth_buttons/shibboleth_64.png create mode 100644 changelogs/unreleased/44943-update-presentation-for-sso-providers-on-log-in-page.yml diff --git a/app/assets/images/auth_buttons/auth0_64.png b/app/assets/images/auth_buttons/auth0_64.png new file mode 100644 index 0000000000000000000000000000000000000000..5ad596593801bffdc9f11c70f4021ffb17ac8341 GIT binary patch literal 1815 zcmV+y2k7{TP)E!6<9h~BKa zLIywnxe})9(f?-)rmfk}lo@uj3IH@TRyK}+4#2XTltKQ9wigC~RMny3$z~^TpStNib25-`**x>A@00=OK9rU6^^{cBx0vz+rJQ#PRIsX2f z7)K0_l)(BB)~~~t$cS_R45n`kMUx*Ah=)2n%s*0`@2+4zmhfqNqc4mv{$ePe20&LU zmKTHWlqBYRceQo+g$WgltOH%6^sTFc75W3<&i)$Na4GYIQO$7%I%059vg)bv2z_j} z1$J*1fXIJrc*}}6syN@}p&~r!XqzJ-qmRuPaGpe&WBYa`L?mpS+=m)DFMEb zXi&}5t5X4}Rj`*ssf!I4GLtOJ@!!}+^KpLqs=F79KBfXdWE}vw4@iSI>Q{}TBv7_>8LEGfEcmjceyH~N?k zfW21YfA7-*r7s^(3NX4h0Msc4Pe@pR{?<48=*k8!m8j4jJFv9V-(dejwpri$>Qw6m zCiL&{mF25T*F-|`(bXAXQP;|e!G01j&`L3s-x=)hVv>Ydgj-Is zEzF~`1jb6!<*KqQDF%N_n1NzVjAn_w=bfQTSF$B;Z(k9!H(MNTIj1h#UcoYjp2$=^ z94V1Az&Mg)Q`>AlK9?wWiv78j^^4e5H8{5T8zEcqi4E?Ps0sZeEZ*;TZJ1aLPL}|& z+xb)wx~ap;B>jS-m9RMHmh_is4`nImXMQNn_EI0p)obm2_gI&uorHKkbL#4@LB7zJ z$}ieEYsq0cz*+JETk)!Ig?Y$HfUhO&w@SzKNm%xl0KZG9+ufy3EBi1SZ0H{zEm6O5 z-_#kY2|)b{3-MLr9O+->LCNp_W=A)`Ei|Z*^X>!kmYz;?M~EfFpxWU4*N&^S7y$LX z7ven@CrH7DhU%wkJ$?7t@Trw`l0xo_w1qYi5PnuF0QJ>2c!VWpF*s2I)SS-igAiLe zDY4-Z+C5{1MY2QU%)JfeX0-!If!Z0i?kPCbu9#$#SMhrm>Z+a`&WIZ5z#_>1&Ep-eJ z0Qx}eV&!LPYu>%(7>;%58+iaw+I=i0A)ZX=-T$ET@g&D^?Eew~$~OTf5Q9@CK$T8Y z_-}s3?>J`U1CXsGzIu|>d{VXlR?s=J0HE;A9%VRf_y-7Nelzyn**E|I002ovPDHLk FV1fXAZPx$* literal 0 HcmV?d00001 diff --git a/app/assets/images/auth_buttons/azure_64.png b/app/assets/images/auth_buttons/azure_64.png index 85de7793440c2226bf5af311488d5f7c755ae2e0..168a9c81395d5ab507ff3ec1ecfbceccfd8b89dc 100644 GIT binary patch delta 183 zcmdnadYo~BL_G^L0|P^Zd(K-Rr5@lD;_6=D!?5H-!!CyZI~hI&C^0O3Uk_(5c@Go> za)IKnnJe{xS~yFB{DK+Y1Hl6z5MX9L4it3rba4#v@J_a9X6iFA$awF@$g`NsO|(Z# zVh&eKKm$9o^CTgz1PLAo0ak+!BLflX#SCpTH4>DVo3Cn#7_3SNIk=+f;7SGtAFq{~ UMfp{IKqDDEUHx3vIVCg!0JpF|h5!Hn delta 683 zcmX@kxSe%^L_G%^0|UdV%))yN3`}*NE{-7;jBjr4)@wlI?XGMf zS#3Y})w83Y6O{%mtQE8)3ckTY<_C7TvVb#+JaS6+qwH^cr=up z==-D5tY!2jpyzPWn`4$XZQ*B(J~uo}IkBRn@rFmkkwrH3vlgpAOSblVV7jNybXD5&@-xxeMQC!^Zm#Knu5dag4_IWT81@GfAK5r;BN8rUv?M1A-hn}bh8 zHuLZq{PkzN^;n6Iy*c?tKTA;<^NC2scS^UUzfTW3XHFR|31V`In?rBPyUDM_o^Tz^;HWLtrB(WpLxzG z?a=-``=O}a!`Vxje<%l;v`k#Sc>({l1YN&JYVRH>#yv2#d(2)JY1UxR&=P48QpK#Oy PQze6^tDnm{r-UW|C4eOG diff --git a/app/assets/images/auth_buttons/bitbucket_64.png b/app/assets/images/auth_buttons/bitbucket_64.png index b3d022a5a7019f199eaab18992c4bb5926824abe..0edf7f52a117173c41cfcbb212ba37141aae30ee 100644 GIT binary patch delta 1280 zcmV+b1^@c-5R(d!BYy!vGxB|Jyl&@gLMwvFxNH$U<3f)od42TI3r#Jr^n0S z^xE*YLbNPIyfAKPjzQmnv$`jQjP69(@iTnWgs*=a)hrD^BHP&;1o3*g!%?SJwMLVSNdG(^&PvvG(M#I z2w_Kl0MJ+ZObwtCLYfCr>dp@U`YNM`k}~M&vrzdsKLF^f&}SzAe6>&R02Iu=34pM= zX09}#*z4=*AAhW!060a@0ja;uMI~SlAoX|f;<*w4^0f&dqFOGZAZ!poguUOI@E-s) z2=j0*DnY4>J-}mqPJyeYtRh-`#-x@%vIy3tdsyNd#wVlbRG_MT}z}FYK5kmC? zQ_31ZP+R5Ch_p;gj{c>-X2`2CNOK4QxH)y{O{@Wkcn`iFH)jBK{Llaj@dgem0fmt7 zkFy3Kb;St)rcj`_Y5_nrAB6f5frF6q%uQARTz^fh|McY-`1QqF08pI-LdVvXfKep$ z+t})@vC})xNtLczPpZN?^S=k>52hL#0Ggvgnx~k<4sKt*hOEt!UI5LUPEM%BP6Bu( zsQ`%$Kwe#HnRiJ!EL7J@1;FKug6Sxt8(UtGfKZ3KQeIY-)BwEr0B5g5M5nY4z}Fk2 z*nj1SyuKnm0DVCMz*dme4y^+?SuX&oe{zs}eE$+|xM7TRJ%EF*^v?$BHw0$s)&ZOl zO$wVHtlkq$|9d)sSr5c)`K0ZKx!-fK_8)6cYI z{8=_YLEY6ofY&|%&ur>yK*~Jk-)hT}?$15~3eip}BA~i3XM35yCkX0^2DJqscx!Ta zsuN)&eRfwjjmq0^ka8ZIAQ-PK_3YG(Tsx5>UW73QrH<%=#1%x{H4(v+J;D z=-JZ)Ky!3R^CJ7{EU&|+1CSg^uVp33@;a;)0M62>rWvgO=hy=X>RXX!76EYa%NhV@ z>71z}h_lxP7HaF*132x2sW?+-C3(o$GSv6*>vP)!zzt(S>Q_?QldsQqZ2>9zPbgdGj$zas$2pp=VGD30O} qSIUm1aMT;qj66Eql8pcu0q{F}?Mg~Jf$QG@0000Z delta 2149 zcmV-r2%7hk3h@w-BYy}uNklhr3xp!((jX#X5=Mhs^zX=z4w#4IcmesHJjZd&MSln6$8S)>&^|i=Jx?>W z@ZV4wlW+mjhXuoj>0v2M55tEA>Ek@cp*(&K2_htb>>2NyW2TtsU`^xB=uwVxi{1WG}9g8s*gV6;o(FCP0<=XFnDt8Lri7Tg{(uJYQTzgh>(CheBm{7l z0Nlcri^H>R21a28wu0bC#e84`fRb96`Y2(2IU&;zNj zg)-ub1b^s&N3a6|u-y*0OY#4O1#mPZ0M#QbMq3m{0_B0froWIIO)wj`AtSKd01k(J z1f2kuxdE6F|FTNOLmb2s3`1wsM|G4$KIA|KWc0|2JSc`LAG$TCpox(v3QsUt+qP}n zwr$(CZQHhO+qUfuYR|)YxOJ+wr#k8R_3$m`pMP}j{ibu%0_$^FeH=%dPfEhXJ@z0u z1zhi{0SN`1L;;!C*qt&w$c4h^TF*gOMghkH<|+a}N&#D`03T#flF6{Q^thgF=!nnJ zM)w}D2?eCC9Jufl`^&Y*y72nfh1;A9F&T>?@H z*j9VMAS{B~1GaDp&>pa44~t+<+@FUpf{Ri>;t~*3z@!lHmu( zNAeSNtpTP8b|Bzw3A{3r;60p5&juzSvw!ik`$bqN>8~UCmRkV9YcS%H*gX<_-5}lp z%YsH1Rs`?Yl%V48=)NRIkbFu3rNt`*9SI`Uu#n zP7g3+{|`;_CP~4_F%mwhS`#GpO??E!6tGC0B4~nM(Ig-7zdK+9a0YjL)?qKujenTc ztM&qkeLf0^eFRLv3SC7)Zn}PKXmAVddA)|;oxt>jgghs0`X>J)7?%Q~ZUSr(?BJp| zSI}gL zy~mPr&0;ls;f>rGO1ke15hR~dz<<#d1eE3%o>7uH7?chH1=wA#naO;=tRUd9DgqJ; z*rbMl49qOa?9IRDj(~TRYi0#`4FT)>3b2pB+`K9Ae*TsL5ua2H$mWN_uXl z3N_lz1VrX|%01vJS>SB*J9?IQI#&6;z**onE{43p zWIh95lh63s8{lbv_kRpty9(PHPU8Y?^NWwiQR|&xM2S7fTVQ(gi+m2YW&jP+BHfBl zhXIZT#w4ThvrgAy%=<`t+sW~nsU-ILJ%GQ!`|?aa4>siAq)QTWcF?odBp{Wxw3lrR zUXYseHl+mV0V?5MQ-lgRseLGzMH3}@?9C0o|36}81&7-)iGREu?v$A83ow=cBpD4B zBBJ0kd?d&7;{-SyIWAa=Z9b#-BQ~aEB<7$4p^bHDOA38mk?$DvrJR{bIfUVRRs-bKvWX5v`T-peY@ok>Z~-D=e|e|( zr3hUO+E-%hses7bXie~;zQ=>gaJT(FSWS}exd1JSqh539`k^~$?}bj6%n$ghk1DbB zsQ|t4NMH?ch1o|429v&&zxaq6L%#^nLrsQJz#?4HxfZ+xzV}!b|DN;wYuLuZ6s+>2 by7B)9_XxB^N(C3^00000NkvXXu0mjfyQb=K diff --git a/app/assets/images/auth_buttons/google_64.png b/app/assets/images/auth_buttons/google_64.png index 720824230a50490f008d5e0c1c1d167e6923d900..389c1cd54ca90f24fe3643ca864f8ff005fd5cd1 100644 GIT binary patch delta 1609 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 literal 0 HcmV?d00001 diff --git a/app/assets/images/auth_buttons/shibboleth_64.png b/app/assets/images/auth_buttons/shibboleth_64.png new file mode 100644 index 0000000000000000000000000000000000000000..d4c752f9400a48d6ce7f534149556c1543d24598 GIT binary patch literal 2993 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 literal 0 HcmV?d00001 diff --git a/app/assets/stylesheets/framework/awards.scss b/app/assets/stylesheets/framework/awards.scss index a265e4206f1..702276780e9 100644 --- a/app/assets/stylesheets/framework/awards.scss +++ b/app/assets/stylesheets/framework/awards.scss @@ -229,8 +229,8 @@ svg { margin-bottom: 1px; - height: 18px; - width: 18px; + height: $default-icon-size; + width: $default-icon-size; border-radius: 50%; path { diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index 72b4ed0ac33..e91e830fcac 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -149,7 +149,8 @@ &.btn-success, &.btn-new, &.btn-create, - &.btn-save { + &.btn-save, + &.btn-register { @include btn-green; } @@ -172,8 +173,7 @@ } &.btn-info, - &.btn-primary, - &.btn-register { + &.btn-primary { @include btn-blue; } @@ -248,7 +248,7 @@ .btn-terminal { svg { height: 14px; - width: 18px; + width: $default-icon-size; } } diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss index abfe350677e..a52e6c4f6a7 100644 --- a/app/assets/stylesheets/framework/filters.scss +++ b/app/assets/stylesheets/framework/filters.scss @@ -216,8 +216,8 @@ vertical-align: inherit; img { - height: 18px; - width: 18px; + height: $default-icon-size; + width: $default-icon-size; } } diff --git a/app/assets/stylesheets/framework/toggle.scss b/app/assets/stylesheets/framework/toggle.scss index 20394cc1e52..43aaf198609 100644 --- a/app/assets/stylesheets/framework/toggle.scss +++ b/app/assets/stylesheets/framework/toggle.scss @@ -56,8 +56,8 @@ &, .toggle-icon-svg { - width: 18px; - height: 18px; + width: $default-icon-size; + height: $default-icon-size; } .toggle-icon-svg { diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 13ad52b62b6..f5e7a84d082 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -250,7 +250,7 @@ $container-text-max-width: 540px; $gl-avatar-size: 40px; $border-radius-default: 4px; $border-radius-small: 2px; -$settings-icon-size: 18px; +$default-icon-size: 18px; $layout-link-gray: #7e7c7c; $btn-side-margin: 10px; $btn-sm-side-margin: 7px; diff --git a/app/assets/stylesheets/pages/login.scss b/app/assets/stylesheets/pages/login.scss index c9e5fb9c579..fa0ab1a3bae 100644 --- a/app/assets/stylesheets/pages/login.scss +++ b/app/assets/stylesheets/pages/login.scss @@ -100,6 +100,22 @@ p { margin: 0; } + + .omniauth-btn { + margin-bottom: $gl-padding; + width: 48%; + padding: $gl-padding-8; + + @include media-breakpoint-down(md) { + width: 100%; + } + + img { + width: $default-icon-size; + height: $default-icon-size; + margin-right: $gl-padding; + } + } } .new-session-tabs { @@ -169,10 +185,6 @@ } } - label { - font-weight: $gl-font-weight-normal; - } - .submit-container { margin-top: 16px; } @@ -200,15 +212,6 @@ } } -.oauth-image-link { - margin-right: 10px; - - img { - width: 32px; - height: 32px; - } -} - .devise-layout-html { margin: 0; padding: 0; diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss index e351dd7c0bb..5a594920e44 100644 --- a/app/assets/stylesheets/pages/settings.scss +++ b/app/assets/stylesheets/pages/settings.scss @@ -106,7 +106,7 @@ .settings-list-icon { color: $gl-text-color-secondary; - font-size: $settings-icon-size; + font-size: $default-icon-size; line-height: 42px; } diff --git a/app/views/devise/sessions/_new_base.html.haml b/app/views/devise/sessions/_new_base.html.haml index 0ee563ac066..17a9c8df872 100644 --- a/app/views/devise/sessions/_new_base.html.haml +++ b/app/views/devise/sessions/_new_base.html.haml @@ -1,9 +1,9 @@ = form_for(resource, as: resource_name, url: session_path(resource_name), html: { class: 'new_user gl-show-field-errors', 'aria-live' => 'assertive'}) do |f| .form-group - = f.label "Username or email", for: "user_login" + = f.label "Username or email", for: "user_login", class: 'label-bold' = f.text_field :login, class: "form-control top", autofocus: "autofocus", autocapitalize: "off", autocorrect: "off", required: true, title: "This field is required." .form-group - = f.label :password + = f.label :password, class: 'label-bold' = f.password_field :password, class: "form-control bottom", required: true, title: "This field is required." - if devise_mapping.rememberable? .remember-me diff --git a/app/views/devise/shared/_omniauth_box.html.haml b/app/views/devise/shared/_omniauth_box.html.haml index 3723814debe..269a3721e06 100644 --- a/app/views/devise/shared/_omniauth_box.html.haml +++ b/app/views/devise/shared/_omniauth_box.html.haml @@ -1,14 +1,17 @@ -.omniauth-container - %p - %span.light - Sign in with   - - providers = enabled_button_based_providers +.omniauth-container.prepend-top-15 + %label.label-bold.d-block + Sign in with + - providers = enabled_button_based_providers + .d-flex.justify-content-between.flex-wrap - providers.each do |provider| - %span.light - - has_icon = provider_has_icon?(provider) - = link_to provider_image_tag(provider), omniauth_authorize_path(:user, provider), method: :post, class: 'oauth-login' + (has_icon ? ' oauth-image-link' : ' btn'), id: "oauth-login-#{provider}" - %fieldset.prepend-top-10.remember-me - %label - = check_box_tag :remember_me, nil, false, class: 'remember-me-checkbox' + - has_icon = provider_has_icon?(provider) + = link_to omniauth_authorize_path(:user, provider), method: :post, class: 'btn d-flex align-items-center omniauth-btn text-left oauth-login', id: "oauth-login-#{provider}" do + - if has_icon + = provider_image_tag(provider) %span - Remember me + = label_for_provider(provider) + %fieldset.remember-me + %label + = check_box_tag :remember_me, nil, false, class: 'remember-me-checkbox' + %span + Remember me diff --git a/app/views/devise/shared/_signup_box.html.haml b/app/views/devise/shared/_signup_box.html.haml index ee7369f54a9..90ed20404c5 100644 --- a/app/views/devise/shared/_signup_box.html.haml +++ b/app/views/devise/shared/_signup_box.html.haml @@ -4,24 +4,24 @@ .devise-errors = devise_error_messages! .form-group - = f.label :name, 'Full name' + = f.label :name, 'Full name', class: 'label-bold' = f.text_field :name, class: "form-control top", required: true, title: "This field is required." .username.form-group - = f.label :username + = f.label :username, class: 'label-bold' = f.text_field :username, class: "form-control middle", pattern: Gitlab::PathRegex::NAMESPACE_FORMAT_REGEX_JS, required: true, title: 'Please create a username with only alphanumeric characters.' %p.validation-error.hide Username is already taken. %p.validation-success.hide Username is available. %p.validation-pending.hide Checking username availability... .form-group - = f.label :email + = f.label :email, class: 'label-bold' = f.email_field :email, class: "form-control middle", required: true, title: "Please provide a valid email address." .form-group - = f.label :email_confirmation + = f.label :email_confirmation, class: 'label-bold' = f.email_field :email_confirmation, class: "form-control middle", required: true, title: "Please retype the email address." .form-group.append-bottom-20#password-strength - = f.label :password + = f.label :password, class: 'label-bold' = f.password_field :password, class: "form-control bottom", required: true, pattern: ".{#{@minimum_password_length},}", title: "Minimum length is #{@minimum_password_length} characters." - %p.gl-field-hint Minimum length is #{@minimum_password_length} characters + %p.gl-field-hint.text-secondary Minimum length is #{@minimum_password_length} characters - if Gitlab::CurrentSettings.current_application_settings.enforce_terms? .form-group = check_box_tag :terms_opt_in, '1', false, required: true @@ -34,8 +34,3 @@ = recaptcha_tags .submit-container = f.submit "Register", class: "btn-register btn" -.clearfix.submit-container - %p - %span.light Didn't receive a confirmation email? - = succeed '.' do - = link_to "Request a new one", new_confirmation_path(:user) diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 6f08a294c5d..9f79feb4ddd 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -77,7 +77,7 @@ = f.text_field :name, required: true, readonly: true, wrapper: { class: 'col-md-9' }, help: "Your name was automatically set based on your #{ attribute_provider_label(:name) } account, so people you know can recognize you." - else - = f.text_field :name, required: true, wrapper: { class: 'col-md-9' }, help: "Enter your name, so people you know can recognize you." + = f.text_field :name, label: 'Full name', required: true, wrapper: { class: 'col-md-9' }, help: "Enter your name, so people you know can recognize you." = f.text_field :id, readonly: true, label: 'User ID', wrapper: { class: 'col-md-3' } - if @user.read_only_attribute?(:email) diff --git a/changelogs/unreleased/44943-update-presentation-for-sso-providers-on-log-in-page.yml b/changelogs/unreleased/44943-update-presentation-for-sso-providers-on-log-in-page.yml new file mode 100644 index 00000000000..a378aaec750 --- /dev/null +++ b/changelogs/unreleased/44943-update-presentation-for-sso-providers-on-log-in-page.yml @@ -0,0 +1,5 @@ +--- +title: Update presentation for SSO providers on log in page +merge_request: 21233 +author: +type: other