diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index b6904885a515f0bef6bc382d239fa98f1ce7c905..5db78f16cf7428d6027d70a845b0ed3b7b541cf7 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -658,4 +658,11 @@ input.chk { .navbar-inverse { background: #59595C; border-color: #59595C; -} \ No newline at end of file +} +.align-everything{ + line-height: 170%; +} + +.field_with_errors { + display: inline; +} diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index 94219191ce1d9e61fdecd7626bd3e8e0fc754051..67d2282fd99d3487e50937bcb20323710af8fe86 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -1,14 +1,10 @@ <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> <%= devise_error_messages! %> <div class="container"> - <div class="row"> - <div class="col-md-12"> + <div class="row"> <div class="grey-panel"> - <div class="center_data"> <div class="style-cadastro"> - <h2> - <font>Cadastre-se</font> - </h2><br/> + <h2><font>Cadastre-se</font></h2><br/> </div> <font> <%= image_tag image_path("user-anon.png")%><br/> @@ -16,51 +12,40 @@ <%=link_to 'adicionar foto', '#', { :class=>"add-picture"}%> <%= f.file_field :avatar%> </div> - </font><br/></br> - <div class="col-md-10"> - <p style="line-height: 170%"> - <div class="col-md-10"> - <span class="pull-right">Nome: - <%= f.text_field :name, autofocus: true, required: true , style:"width:335px;"%></span><br/> - </p> - <p style="line-height: 15%"><br/></p> - <p style="line-height: 170%"> - <span class="pull-right">Email: - <%= f.email_field :email, :value => params[:email], required: true, style:"width:335px;" %></span><br/> - </p> - <p style="line-height: 15%"><br/></p> - <p style="line-height: 170%"> - <span class="pull-right">Senha: - <%= f.password_field :password, autocomplete: "off", style:"width:335px;" %><br/> + </font><br/><br/> + <div class="col-md-11"> + <div class="field_with_errors"> + <div class="align-everything"> + Nome: + <%= f.text_field :name, autofocus: true, required: true , style:"width:335px;"%> + <p style="line-height: 15%"><br/></p> + Email: + <%= f.email_field :email, :value => params[:email], required: true, style:"width:335px;" %><br/> + <p style="line-height: 15%"><br/></p> + Senha: + <%= f.password_field :password, autocomplete: "off", style:"width:335px;" %> <% if @minimum_password_length %> - <em>(<%= @minimum_password_length %> caracteres mÃnimos)</em> - <% end %><br/> - </span> - <br/></p></div> - <p style="line-height: 15%"><br/></p> - <p style="line-height: 170%"> - <div class="col-md-10"> - <span class="pull-right">Confirmar senha: - <%= f.password_field :password_confirmation, autocomplete: "off", style:"width:335px;" %> - </span> - </div><br/><br/></p> + <em><p>(<%= @minimum_password_length %> caracteres mÃnimos)</p></em> + <% end %> + <div class="col-md-11"> + Confirmar senha: + <%= f.password_field :password_confirmation, autocomplete: "off", style:"width:335px;" %> + </div></div></div> + </div> + <div class="container-fluid"> + <div class="col-md-offset-3 col-md-5"> + <div class="center_data"> + <div class="col-md-6"> + <br/><span class="pull-right">Já possui conta?</span><br/> + <span class="pull-right"><%= render "devise/shared/links"%></span> </div> - <div class="container-fluid"> - <div class="col-md-offset-3 col-md-5"> - <div class="center_data"> - <div class="col-md-6"> - <br/><span class="pull-right">Já possui conta?</span><br/> - <span class="pull-right"><%= render "devise/shared/links"%></span> - </div> - <div class=" col-md-5"> - <br/><span class="pull-right"><%= f.submit "Cadastrar", :class=> "but but-shadow but-rc" %></span><br/> - </div> - </div> - </div> + <div class=" col-md-5"> + <br/><span class="pull-right"><%= f.submit "Cadastrar", :class=> "but but-shadow but-rc" %></span><br/> </div> </div> </div> </div> </div> + </div> </div> <% end %>