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

tidy or line styling

This commit is contained in:
Joshua Arts 2018-07-04 09:43:08 -04:00
parent ecd101833a
commit d383f142ee
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,18 +22,16 @@
margin-top: 50%; margin-top: 50%;
} }
.or-line{ .or-line {
margin-top:32px; div {
margin-bottom:32px; width: 100%;
div{ height: 16px;
width: 100%; border-bottom: 1px solid #d3d3d3;
height: 20px;
border-bottom: 1px solid #d3d3d3;
text-align: center; text-align: center;
span{ span {
font-size: 150%; font-size: 120%;
background-color: #ffffff; background-color: #ffffff;
padding: 0 10px; padding: 0 10px;
color: #d3d3d3 color: #d3d3d3
} }
} }

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

@ -6,7 +6,7 @@
<div class="card-title"> <div class="card-title">
<h3>Login</h3> <h3>Login</h3>
</div> </div>
<% unless configured_providers.length.zero? %> <% unless configured_providers.length.zero? %>
<% configured_providers.each do |provider| %> <% configured_providers.each do |provider| %>
<%= link_to omniauth_login_url(provider), class: "btn btn-pill btn-#{provider} btn-block" do %> <%= link_to omniauth_login_url(provider), class: "btn btn-pill btn-#{provider} btn-block" do %>
@ -14,14 +14,11 @@
<% end %> <% end %>
<% end %> <% end %>
<div class="or-line"> <div class="or-line my-6">
<div> <div><span class="text-uppercase">or</span></div>
<span>
or
</span>
</div>
</div> </div>
<% end %> <% end %>
<%= form_for(:session, url: create_session_path) do |f| %> <%= form_for(:session, url: create_session_path) do |f| %>
<div class="form-group"> <div class="form-group">
<div class="input-icon"> <div class="input-icon">