From 8ac5abb7bc678dcaf4f6ae112e880becefaf825f Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 26 Aug 2015 19:06:12 +0200 Subject: [PATCH 1/3] Updates custom icons font --- app/assets/fonts/icons.eot | Bin 5824 -> 7048 bytes app/assets/fonts/icons.svg | 5 +++++ app/assets/fonts/icons.ttf | Bin 5668 -> 6892 bytes app/assets/fonts/icons.woff | Bin 4464 -> 5472 bytes app/assets/stylesheets/icons.scss | 16 +++++++++++++++- 5 files changed, 20 insertions(+), 1 deletion(-) diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot index a1cc83d43d12151ca8a386601a45b4974e3b0142..81c974cd3258f7d6f9c571b76923521fc7617880 100644 GIT binary patch delta 1655 zcmZ8hO^g&p6s}j*)m1&+Jv~3&J-zeG&g}HSlAUE|=LfSZ%kJv(yONE@p9s+juxP>p zS-=2+%zDsZI_!jK7Zi^2pJ%%cH0M>Jh?j5#j}J z9qu0D)%QM%5>V)UMSsS3)VT{sk00#r$nIUnxHYu5uXN9xAa9dvxW5(c4ad4Ghn=Yp z?h+FGguY`Zj-NcGy`U}PJv(v#O#(P#zkl!agEyS%--t=kLC9@(6=VLLDH-^snxfBP zjFrgM=q|j*X34o|D_vSjsc6zC>oej|SV(?wJ|SypshjddBZqL7*w!zaBj*se`puHA zT0O>GRc!PfZSgG0k$m(A-9Zb*XqXkFF3YfNE+4(iE=F6Jj0|loCOX*TR+xX?NPKW~bf3 z;7+@d@jX}gYRve+c{1Qy-0}D~uv!m-FM|Ni`p%l?Py61Q<9BlTTw$C_>G!0h;{`Nx zJVA6CEac*8QF<^!gxJe4+ zCA7;z7rM%#1h{I?fI@+3wwtxE=41Xsuas*z3Y@}TE$pO`SQsvrPDW~@=ZyF7T=!DA{qdG8k6gJ>A29gP( z*_y+$)o^rD#SI0cPZ+2o1CNMDwh_|7LLkI(2%9s|&iDo7!Oidia-lnbRm9>U8DY(H zd;bf?3f?rCW@r)Tk+jTJ&f#m$q!vRkAgHiL6T`*2MY-gC&ik>L^-gQc53a?5_k|_; zF`ZlKRa~8SGAZ8-hQQLmSRGH>F}~B*oRN)x>NwO%!Nm21Ctx9WB zkv|1qWl&Dx>K=^jHfFmM6T#5d*^O~cFvWCt>EXkriDoXlgcNBy#2Ef(27-n=q(OF* zE96rp=~`344acEQYvnqqRah&Bl``UAZzvem)}_*EGo_X~sOy!MuoXe=)i6P{6vfEo zKbs{Oyu42QfZ3<=8R#i|7TT&9&5qLE6Jc==q4ow?Cq1y0ZWsp%i~)A4Geb}WWV*gg znzoQJGm&=OWZJeJ+mIDa2&0(JI*!H!H;t@QFs^PvyBc2)5?ph=3l<$_A3JWPj!&`^k+aVhP1 zIhl~A(zO)vILLG|6Hf(hI`7y?+j6XUGI7m!yrGPjOv$uvN=ujA&|;3T%(&x>jZ_)a zr4e%y>7<{m#BKZnP#UBJXs9p^XudGIv9!V9yGC}Y2S08%++U#`UH3NOc-uP(rD(x# a8LyN5oj2Kujm?Q=aeD}rRCg+^@JLlZ*-1CaPm5{6A1v58B`w8vUh5X^G=z4vE|j2)iWKgurE!HX01&dX&kZMM-Hx7 z*@e3PgL|O9iMbVfHMcIWrOi1-))Nr)v_kTwG+!6{K()aHa4Vi$|3?E(-mQZ=7a{4# zp?VNA(n4PK853NbZ+9%NG>Va4~D{denyRT}0H9zl;9FpA&xNYL1L(9YGz#nN>^To;;c*eDtP6I;UTQ Mo4Knm9sh6m3lD%^+5i9m diff --git a/app/assets/fonts/icons.svg b/app/assets/fonts/icons.svg index 049938913..da328ba6e 100644 --- a/app/assets/fonts/icons.svg +++ b/app/assets/fonts/icons.svg @@ -30,4 +30,9 @@ + + + + + diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf index aa9c63faae88382db31d66dded442022c23bbae3..207ad475e797e86deb07d18b464f9ed6ea8a6519 100644 GIT binary patch delta 1663 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 delta 4362 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 Date: Wed, 26 Aug 2015 20:32:48 +0200 Subject: [PATCH 2/3] Adds styles for social share and auth --- app/assets/stylesheets/participacion.scss | 119 ++++++++++++++++++++++ app/views/devise/_omniauth_form.html.erb | 18 ++-- config/locales/devise_views.en.yml | 2 +- config/locales/devise_views.es.yml | 2 +- config/locales/en.yml | 3 + config/locales/es.yml | 3 + 6 files changed, 138 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss index e20a2cb36..116b57ff8 100644 --- a/app/assets/stylesheets/participacion.scss +++ b/app/assets/stylesheets/participacion.scss @@ -14,6 +14,7 @@ // 12. Official levels // 13. Pagination // 14. Tables +// 15. Social // // 01. Variables @@ -856,4 +857,122 @@ table { } } +// 15. Social +// - - - - - - - - - - - - - - - - - - - - - - - - - +.button.button-twitter { + background: #45B0E3; + + &:before { + background: #40A2D1; + content: "f"; + font-family: "icons" !important; + font-size: rem-calc(24); + left: 0; + line-height: $line-height*2; + padding: 0 rem-calc(20); + position: absolute; + top: 0; + } +} + +.social-share-button-twitter { + background: #45B0E3; + color: white; + height: rem-calc(48); + position: relative; + width: rem-calc(48); + + &:before { + content: "f"; + font-family: "icons" !important; + font-size: rem-calc(24); + left: 50%; + line-height: $line-height*2; + margin-left: rem-calc(-11); + position: absolute; + top: 0; + } + + &:hover { + color: #40A2D1; + } +} + +.button.button-facebook { + background: #3B5998; + + &:before { + background: #354F88; + content: "A"; + font-family: "icons" !important; + font-size: rem-calc(24); + left: 0; + line-height: $line-height*2; + padding: 0 rem-calc(20); + position: absolute; + top: 0; + } +} + +.social-share-button-facebook { + background: #3B5998; + color: white; + height: rem-calc(48); + position: relative; + width: rem-calc(48); + + &:before { + content: "A"; + font-family: "icons" !important; + font-size: rem-calc(24); + left: 50%; + line-height: $line-height*2; + margin-left: rem-calc(-11); + position: absolute; + top: 0; + } + + &:hover { + color: #354F88; + } +} + +.button.button-google { + background: #DE4C34; + + &:before { + background: #CE3E26; + content: "B"; + font-family: "icons" !important; + font-size: rem-calc(24); + left: 0; + line-height: $line-height*2; + padding: 0 rem-calc(20); + position: absolute; + top: 0; + } +} + +.social-share-button-google_plus { + background: #DE4C34; + color: white; + height: rem-calc(48); + position: relative; + width: rem-calc(48); + + &:before { + content: "B"; + font-family: "icons" !important; + font-size: rem-calc(24); + left: 50%; + line-height: $line-height*2; + margin-left: rem-calc(-11); + position: absolute; + top: 0; + } + + &:hover { + color: #CE3E26; + } +} diff --git a/app/views/devise/_omniauth_form.html.erb b/app/views/devise/_omniauth_form.html.erb index fdd812b4f..63e73d160 100644 --- a/app/views/devise/_omniauth_form.html.erb +++ b/app/views/devise/_omniauth_form.html.erb @@ -1,7 +1,11 @@ -
- -<%= link_to t("omniauth.twitter.sign_in"), user_omniauth_authorize_path(:twitter), class: 'button radius expand' %> -<%= link_to t("omniauth.facebook.sign_in"), user_omniauth_authorize_path(:facebook), class: 'button radius expand' %> -<%= link_to t("omniauth.google_oauth2.sign_in"), user_omniauth_authorize_path(:google_oauth2), class: 'button radius expand' %> - -
+<% if current_page?(new_user_session_path) %> + <%= link_to t("omniauth.twitter.sign_in"), user_omniauth_authorize_path(:twitter), class: "button-twitter button radius expand" %> + <%= link_to t("omniauth.facebook.sign_in"), user_omniauth_authorize_path(:facebook), class: "button-facebook button radius expand" %> + <%= link_to t("omniauth.google_oauth2.sign_in"), user_omniauth_authorize_path(:google_oauth2), class: "button-google button radius expand" %> +
+<% elsif current_page?(new_user_registration_path) %> + <%= link_to t("omniauth.twitter.sign_up"), user_omniauth_authorize_path(:twitter), class: "button-twitter button radius expand" %> + <%= link_to t("omniauth.facebook.sign_up"), user_omniauth_authorize_path(:facebook), class: "button-facebook button radius expand" %> + <%= link_to t("omniauth.google_oauth2.sign_up"), user_omniauth_authorize_path(:google_oauth2), class: "button-google button radius expand" %> +
+<% end %> \ No newline at end of file diff --git a/config/locales/devise_views.en.yml b/config/locales/devise_views.en.yml index f0e1eb33a..e6f573cf3 100644 --- a/config/locales/devise_views.en.yml +++ b/config/locales/devise_views.en.yml @@ -55,7 +55,7 @@ en: password_label: "Password" password_confirmation_label: "Confirm password" submit: "Sign up" - organization_signup: "Do you represent an organization / group?" + organization_signup: "Do you represent an organization / group? Enter here" organizations: registrations: new: diff --git a/config/locales/devise_views.es.yml b/config/locales/devise_views.es.yml index 49d304748..f955938d4 100644 --- a/config/locales/devise_views.es.yml +++ b/config/locales/devise_views.es.yml @@ -55,7 +55,7 @@ es: password_label: "Contraseña" password_confirmation_label: "Confirmar contraseña" submit: "Registrarse" - organization_signup: "¿Representas a una organización / colectivo?" + organization_signup: "¿Representas a una organización / colectivo? Entra aquí" organizations: registrations: new: diff --git a/config/locales/en.yml b/config/locales/en.yml index 322cf585f..049f15435 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -152,7 +152,10 @@ en: title: Add Email twitter: sign_in: Sign in with Twitter + sign_up: Sign up with Twitter facebook: sign_in: Sign in with Facebook + sign_up: Sign up with Facebook google_oauth2: sign_in: Sign in with Google + sign_up: Sign up with Google diff --git a/config/locales/es.yml b/config/locales/es.yml index 5c21c039e..58ae07441 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -152,7 +152,10 @@ es: title: Añade tu email twitter: sign_in: Entra con Twitter + sign_up: Regístrate con Twitter facebook: sign_in: Entra con Facebook + sign_up: Regístrate con Facebook google_oauth2: sign_in: Entra con Google + sign_up: Regístrate con Google From 9cd2297b67ce1b339692c9ffad7fe057764861bf Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 26 Aug 2015 20:36:52 +0200 Subject: [PATCH 3/3] Updates tests for social sign up --- spec/features/users_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb index 1fa30bcbe..829dcba03 100644 --- a/spec/features/users_spec.rb +++ b/spec/features/users_spec.rb @@ -74,7 +74,7 @@ feature 'Users' do expect do expect do expect do - click_link 'Sign in with Twitter' + click_link 'Sign up with Twitter' end.not_to change { ActionMailer::Base.deliveries.size } end.to change { Identity.count }.by(1) end.to change { User.count }.by(1) @@ -109,7 +109,7 @@ feature 'Users' do expect do expect do expect do - click_link 'Sign in with Twitter' + click_link 'Sign up with Twitter' end.not_to change { ActionMailer::Base.deliveries.size } end.to change { Identity.count }.by(1) end.to change { User.count }.by(1)