Skip to content

Commit

Permalink
Fix front ui (#1011)
Browse files Browse the repository at this point in the history
* h

* h

* updates

* fix front-ui
  • Loading branch information
sashadev-sky authored and jywarren committed Sep 11, 2019
1 parent 88c6cb4 commit fc4a042
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 23 deletions.
3 changes: 3 additions & 0 deletions app/assets/stylesheets/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ It was originally created by Caroline Hadilaksono: http://www.hadilaksono.com
width: 45%;
font-size: 1em;
}
.btn.btn-default {
width: auto;
}
}

.jumbotron {
Expand Down
24 changes: 2 additions & 22 deletions app/views/front_ui/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -69,28 +69,8 @@
</div>

<div id = "anonymous-map" class="collapse text-block lead-text col-lg-4 offset-lg-4 col-md-6 offset-md-3 col-sm-8 offset-sm-2">
<p>We strongly prefer that you should Log in via
<br><br>
<form id="open_id_form" method="GET" action="/sessions/create" style="padding:10px;">
<%= hidden_field_tag :authenticity_token, form_authenticity_token -%>
<%= hidden_field_tag :back_to, params[:back_to] || request.path -%>
<%= button_tag 'Google', name: "subaction", value: "google_oauth2" do %>
<span class="btn btn-default" style="background-color: #d34836;width: 60px;">
<i class="fab fa-google fa-fw"></i>
</span>
<% end %>
<%= button_tag submit: 'Twitter', name: "subaction", value: "twitter" do %>
<span class="btn btn-default" style="background-color: #1da1f2;width: 60px;">
<i class="fab fa-twitter fa-fw"></i>
</span>
<% end %>
<%= button_tag 'Facebook', name: "subaction", value: "facebook" do%>
<span class="btn btn-default" style="background-color: #3b5998;width: 60px;">
<i class="fab fa-facebook fa-fw"></i>
</span>
<% end %>
</form>
<br><br>
<p>We strongly prefer that you should
<%= render partial: "layouts/login_form" %>
OR <a href="http://publiclab.org/signup">sign up for a Public Lab account</a>
<br>
before making a map. However, if you wish to remain anonymous for privacy reasons, <a href="<%= new_map_url %>">click here</a> to create a map. Also, note that, Anonymous maps have some limitations, <a href="/anonymous">click here</a> to learn more.
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/_login_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<p style="text-align: center;"><%= button_tag submit: 'Log in via PublicLab.org' do %>
<span class="btn btn-default" style="background-color: #ededee;">
<img src="https://i.publiclab.org/system/images/photos/000/000/354/medium/Boots-ground-02.png" style="width: 30px; height: 30px;">
<img src="https://i.publiclab.org/system/images/photos/000/000/354/medium/Boots-ground-02.png" style="width: 30px; height: 30px; padding-bottom: 0px">
</span>
<% end %>
</p>
Expand Down

0 comments on commit fc4a042

Please sign in to comment.