Merge pull request #25803 from code-dot-org/signup-devise-links

Add new OAuth links to signup page
code-dot-org · Nov 5, 2018 · 0071e12 · 0071e12
2 parents 4dbe030 + 1caf55a
commit 0071e12
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/dashboard/app/assets/stylesheets/application.scss b/dashboard/app/assets/stylesheets/application.scss
@@ -1611,6 +1611,7 @@ a.download-video {
   min-width: 450px;
   display: flex;
   flex-direction: column;
+  flex-grow: 2;
 
   form {
     display: flex;
@@ -1907,10 +1908,6 @@ a.download-video {
   #user_type-block {
     margin-bottom: 20px;
   }
-  .devise_links {
-    padding-left: 20px;
-    margin-top: 20px;
-  }
 }
 
 .vertical-or {
@@ -1951,6 +1948,8 @@ a.download-video {
 
 // NEW STYLES FOR devise/shared/_new_links
 .devise-links {
+  flex-grow: 2;
+
   form {
     margin: 0;
   }

diff --git a/dashboard/app/views/devise/registrations/_old_sign_up_form.html.haml b/dashboard/app/views/devise/registrations/_old_sign_up_form.html.haml
@@ -15,7 +15,7 @@
 - user_return_to_url = get_and_clear_session_user_return_to
 
 .row
-  .span8.signupblock
+  .span7.signupblock
     = form_for(resource, as: resource_name, url: registration_path(resource_name), html: {class: 'signupform'}) do |f|
       #user_type-block.itemblock
         .labelblock= t('signup_form.user_type_label')
@@ -152,9 +152,13 @@
       -# Temporarily use student_terms so that existing translations get used.
       != t('signup_form.student_terms')
 
-  .span4
-    .devise_links
-      = render "devise/shared/old_links"
+  .span5{style: "display: flex;"}
+    %div.vertical-or
+      %hr
+      = t("or").upcase
+      %hr
+
+    = render "devise/shared/new_links"
 
 %script{src: minifiable_asset_path('js/signup.js')}
 %script{type: "text/javascript", src: "https://maps.googleapis.com/maps/api/js?client=#{CDO.google_maps_client_id}&sensor=true&libraries=places,geometry&v=3.7"}