enkele layout fixes

This commit is contained in:
ohsab 2014-12-12 12:50:13 +01:00
parent cab0c1a688
commit b5eab1dce1
4 changed files with 28 additions and 15 deletions

View file

@ -102,3 +102,9 @@ footer ul li {
width: 100%;
margin-top: 30px;
}
.form-field{
margin-bottom: 15px;
text-align: bottom;
}

View file

@ -3,6 +3,16 @@
// You can use Sass (SCSS) here: http://sass-lang.com/
//signin
.sign-in{
.checkbox label{
padding-left: 0px;
}
#user_remember_me{
margin-left: 10px;
}
}
.users .thumbnail {
padding: 0px;
min-height: 280px;
@ -37,11 +47,6 @@
background-color: #f5f5dc;
}
/* sidebar */
aside {

View file

@ -1,16 +1,18 @@
<h2>Sign in</h2>
<div class="alert alert-info">Partners sign in using the link sent by email.</div>
<div class="sign-in">
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
<%= form_text_field f, :nickname %>
<%= form_password_field f, :password %>
<%= form_text_field f, :nickname %>
<%= form_password_field f, :password %>
<% if devise_mapping.rememberable? %>
<%= form_check_box f, :remember_me %>
<% end %>
<% if devise_mapping.rememberable? %>
<%= form_check_box f, :remember_me %>
<%= f.submit "Sign in", class: "btn btn-primary" %>
<% end %>
</div>
<%= f.submit "Sign in", class: "btn btn-primary" %>
<% end %>
<%= render "devise/shared/links" %>

View file

@ -1,15 +1,15 @@
<div class="row">
<div class="col-md-6 col-md-offset-3">
<div class="col-md-6 col-md-offset-3 sign-in">
<%= form_for @product, html: { multipart: true } do |f| %>
<%= render 'application/errors', model: @product %>
<%= form_text_field f, :name %>
<%= f.label :price %>
<%= f.number_field :price, value: number_with_precision(f.object.price, precision: 2), class: 'form-control', placeholder: "0.00", step: :any %>
<%= f.number_field :price, value: number_with_precision(f.object.price, precision: 2), class: 'form-control form-field', placeholder: "0.00", step: :any %>
<%= f.label :avatar %>
<%= f.file_field :avatar %>
<%= f.file_field :avatar , class: "form-field" %>
<%= f.submit class: "btn btn-primary" %>
<% end %>