Skip to content

Commit

Permalink
Edit icon swap #3014 (#3024)
Browse files Browse the repository at this point in the history
* swaped position of icons

* changed heading

* font changed

* env added back

* changes made as per intruction

* some fix

* fixed

* added space in end
  • Loading branch information
dewanhimanshu authored and jywarren committed Jul 10, 2018
1 parent 7531464 commit 4e6689e
Showing 1 changed file with 15 additions and 11 deletions.
26 changes: 15 additions & 11 deletions app/views/users/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,19 @@
<h2><%= t('users.edit.edit_profile') %></h2>

<hr />
<% if Rails.env == "production" %>
<div class='col-lg-8 col-md-10 col-sm-10' style="display:flex; justify-content: flex-start; padding: 0;">
<label> Link your Public Lab account to providers</label>
</div>
<div class='col-lg-8 col-md-10 col-sm-10' style="display:flex; justify-content: flex-start; padding: 0; margin-bottom: 10px;">
<div class="loginbutton" >
<a href="/auth/google_oauth2" id="connect-google"><span class="btn btn-default" style="margin-right:2px"><i class="fa fa-google" style="font-size:20px;color:red;"></i></span></a>
<a href="/auth/github" id="connect-github"><span class="btn btn-default" style="margin-left:2px"><i class="fa fa-github" style="font-size:20px;color:green;"></i></span></a>
<a href="https://publiclab.org/auth/twitter" id="connect-twitter"><span class="btn btn-default" style="margin-left:2px"><i class="fa fa-twitter" style="font-size:20px;color:blue;margin-left:2px;"></i></span></a>
<a href="/auth/facebook" id="connect-facebook"><span class="btn btn-default" style="margin-left:2px"><i class="fa fa-facebook" style="font-size:20px;color:blue;"></i></span></a>
</div>
</div>
<% end %>

<%= render 'form' %>
<% if Rails.env == "production"%>
<h5>Link to </h5>
<div class="loginbutton" style="float:left">
<a href="/auth/google_oauth2" id="connect-google"><span class="btn btn-default" style="margin-right:2px"><i class="fa fa-google" style="font-size:20px;color:red;"></i></span></a>
<a href="/auth/github" id="connect-github"><span class="btn btn-default" style="margin-left:2px"><i class="fa fa-github" style="font-size:20px;color:green;"></i></span></a>
<a href="https://publiclab.org/auth/twitter" id="connect-twitter"><span class="btn btn-default" style="margin-left:2px"><i class="fa fa-twitter" style="font-size:20px;color:blue;margin-left:2px;"></i></span></div></a>
<a href="/auth/facebook" id="connect-facebook"><span class="btn btn-default" style="margin-left:2px"><i class="fa fa-facebook" style="font-size:20px;color:blue;"></i></span></a>
</div>
<% end %>
</div>

<%= render 'form' %>

0 comments on commit 4e6689e

Please sign in to comment.