lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1 from Hajar1/master 

switched hr line to a inline or
This commit is contained in:
Joshua Arts 2018-07-03 15:53:00 -04:00 committed by GitHub
parent dcf199c0aa 9764ac6848
commit ecd101833a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/assets/stylesheets/main.scss
View File

@ -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
}
}
}

19
app/views/shared/modals/_login_modal.html.erb
View File

@ -7,14 +7,21 @@
<h3>Login</h3>
</div>
<% configured_providers.each do |provider| %>
<%= link_to omniauth_login_url(provider), class: "btn btn-pill btn-#{provider} btn-block" do %>
<i class="fab fa-<%= provider %>"></i>&ensp;<%= "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 %>
<i class="fab fa-<%= provider %>"></i>&ensp;<%= "Login with #{provider.capitalize}" %>
<% end %>
<% end %>
<% end %>
<hr>
<div class="or-line">
<div>
<span>
or
</span>
</div>
</div>
<% end %>
<%= form_for(:session, url: create_session_path) do |f| %>
<div class="form-group">
<div class="input-icon">