Skip to content

Commit

Permalink
Remoção do .coffee, inclusão do mixin
Browse files Browse the repository at this point in the history
  • Loading branch information
RuanAyram committed Nov 26, 2018
1 parent c3d7ff5 commit b07aa30
Show file tree
Hide file tree
Showing 11 changed files with 44 additions and 43 deletions.
3 changes: 0 additions & 3 deletions app/assets/javascripts/albums.coffee

This file was deleted.

3 changes: 0 additions & 3 deletions app/assets/javascripts/artists.coffee

This file was deleted.

3 changes: 0 additions & 3 deletions app/assets/javascripts/categories.coffee

This file was deleted.

3 changes: 0 additions & 3 deletions app/assets/javascripts/dashboard.coffee

This file was deleted.

3 changes: 0 additions & 3 deletions app/assets/javascripts/favorites.coffee

This file was deleted.

3 changes: 0 additions & 3 deletions app/assets/javascripts/home.coffee

This file was deleted.

3 changes: 0 additions & 3 deletions app/assets/javascripts/recently_heards.coffee

This file was deleted.

3 changes: 0 additions & 3 deletions app/assets/javascripts/search.coffee

This file was deleted.

10 changes: 9 additions & 1 deletion app/assets/stylesheets/devise.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
@import "mixins/all-mixin";

.new_user {
margin-top: 85px;
.label, .checkbox {
color: white;
}

section {
@include border-opacity(#ffffff, 0.35);
}
}
3 changes: 3 additions & 0 deletions app/assets/stylesheets/mixins/all-mixin.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@mixin border-opacity($color, $opacity: 0.3) {
border: 1px solid rgba($color, $opacity);
}
50 changes: 32 additions & 18 deletions app/views/devise/sessions/new.html.erb
Original file line number Diff line number Diff line change
@@ -1,26 +1,40 @@
<h2>Log in</h2>
<section class="section has-text-white has-text-centered">
<h2 class="is-size-3 has-text-weight-bold">Log in</h2>
</section>

<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
<div class="field">
<%= f.label :email %><br />
<%= f.email_field :email, autofocus: true, autocomplete: "email" %>
</div>
<section class="section">
<div class="field">
<%= f.label :email, class: "label" %>
<p class="control has-icons-left">
<%= f.email_field :email, autofocus: true, placeholder: "Email", class: "input" %>
<span class="icon is-small is-left">
<i class="fas fa-envelope"></i>
</span>
</p>
</div>

<div class="field">
<%= f.label :password %><br />
<%= f.password_field :password, autocomplete: "current-password" %>
</div>
<div class="field">
<%= f.label :password, class: "label" %>
<p class="control has-icons-left">
<%= f.password_field :password, placeholder: "Email", autocomplete: "off", class: "input" %>
<span class="icon is-small is-left">
<i class="fas fa-lock"></i>
</span>
</p>
</div>

<% if devise_mapping.rememberable? -%>
<div class="field">
<%= f.check_box :remember_me %>
<%= f.label :remember_me %>
</div>
<% end -%>
<% if devise_mapping.rememberable? -%>
<div class="field">
<%= f.check_box :remember_me %>
<%= f.label :remember_me, class: "checkbox" %>
</div>
<% end -%>

<div class="actions">
<%= f.submit "Log in" %>
</div>
<div class="actions">
<%= f.submit "Log in", class: "button is-success" %>
</div>
</section>
<% end %>

<%= render "devise/shared/links" %>

0 comments on commit b07aa30

Please sign in to comment.