From d383f142ee9e0f8a6b050a3575b3fba70ffff234 Mon Sep 17 00:00:00 2001 From: Joshua Arts Date: Wed, 4 Jul 2018 09:43:08 -0400 Subject: [PATCH] tidy or line styling --- app/assets/stylesheets/main.scss | 18 ++++++++---------- app/views/shared/modals/_login_modal.html.erb | 11 ++++------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index fbc145bb..27a3d0c4 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -22,18 +22,16 @@ margin-top: 50%; } -.or-line{ - margin-top:32px; - margin-bottom:32px; - div{ - width: 100%; - height: 20px; - border-bottom: 1px solid #d3d3d3; +.or-line { + div { + width: 100%; + height: 16px; + border-bottom: 1px solid #d3d3d3; text-align: center; - span{ - font-size: 150%; + span { + font-size: 120%; background-color: #ffffff; - padding: 0 10px; + 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 8e6635c9..5896d4fb 100644 --- a/app/views/shared/modals/_login_modal.html.erb +++ b/app/views/shared/modals/_login_modal.html.erb @@ -6,7 +6,7 @@

Login

- + <% 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 %> @@ -14,14 +14,11 @@ <% end %> <% end %> -
-
- - or - -
+
+
or
<% end %> + <%= form_for(:session, url: create_session_path) do |f| %>