From 9764ac6848a929e80779303c3c079c56dee90c1e Mon Sep 17 00:00:00 2001 From: Adnan Hajar Date: Tue, 3 Jul 2018 15:40:38 -0400 Subject: [PATCH] switched hr line to a inline or --- app/assets/stylesheets/main.scss | 17 +++++++++++++++++ app/views/shared/modals/_login_modal.html.erb | 19 +++++++++++++------ 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index 616e3290..fbc145bb 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -21,3 +21,20 @@ transform: translateY(-50%); margin-top: 50%; } + +.or-line{ + margin-top:32px; + margin-bottom:32px; + div{ + width: 100%; + height: 20px; + border-bottom: 1px solid #d3d3d3; + text-align: center; + span{ + font-size: 150%; + background-color: #ffffff; + padding: 0 10px; + color: #d3d3d3 + } + } +} diff --git a/app/views/shared/modals/_login_modal.html.erb b/app/views/shared/modals/_login_modal.html.erb index f6f2307c..8e6635c9 100644 --- a/app/views/shared/modals/_login_modal.html.erb +++ b/app/views/shared/modals/_login_modal.html.erb @@ -7,14 +7,21 @@

Login

- <% configured_providers.each do |provider| %> - <%= link_to omniauth_login_url(provider), class: "btn btn-pill btn-#{provider} btn-block" do %> -  <%= "Login with #{provider.capitalize}" %> + <% unless configured_providers.length.zero? %> + <% configured_providers.each do |provider| %> + <%= link_to omniauth_login_url(provider), class: "btn btn-pill btn-#{provider} btn-block" do %> +  <%= "Login with #{provider.capitalize}" %> + <% end %> <% end %> - <% end %> -
- +
+
+ + or + +
+
+ <% end %> <%= form_for(:session, url: create_session_path) do |f| %>