narrower settings pages
This commit is contained in:
parent
39ae80027a
commit
a6998c23b7
4 changed files with 9 additions and 9 deletions
|
|
@ -14,11 +14,11 @@
|
||||||
|
|
||||||
.container
|
.container
|
||||||
.row-fluid
|
.row-fluid
|
||||||
.span8
|
.span7
|
||||||
- content_for :submit_block do
|
- content_for :submit_block do
|
||||||
= link_to t('cancel'), local_or_remote_person_path(current_user.person), :class => "btn"
|
= link_to t('cancel'), local_or_remote_person_path(current_user.person), :class => "btn"
|
||||||
= submit_tag t('.update_profile'), :class => "creation", :id => "update_profile", :class => "btn"
|
= submit_tag t('.update_profile'), :class => "creation", :id => "update_profile", :class => "btn"
|
||||||
= render :partial => 'edit', :locals => {:person => @person,
|
= render :partial => 'edit', :locals => {:person => @person,
|
||||||
:profile => @profile, :aspect => @aspect, :step => @step}
|
:profile => @profile, :aspect => @aspect, :step => @step}
|
||||||
.span4
|
.span5
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,9 +16,9 @@
|
||||||
= render 'shared/settings_nav'
|
= render 'shared/settings_nav'
|
||||||
|
|
||||||
.row-fluid
|
.row-fluid
|
||||||
.span8
|
.span7
|
||||||
= render 'shared/add_remove_services'
|
= render 'shared/add_remove_services'
|
||||||
|
|
||||||
.span4
|
.span5
|
||||||
%p
|
%p
|
||||||
= t('.services_explanation')
|
= t('.services_explanation')
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
= render 'shared/settings_nav'
|
= render 'shared/settings_nav'
|
||||||
|
|
||||||
.row-fluid
|
.row-fluid
|
||||||
.span8
|
.span7
|
||||||
.row-fluid
|
.row-fluid
|
||||||
.span6
|
.span6
|
||||||
%h3
|
%h3
|
||||||
|
|
@ -29,7 +29,7 @@
|
||||||
= form_for 'user', :url => user_path, :html => { :method => :put } do |f|
|
= form_for 'user', :url => user_path, :html => { :method => :put } do |f|
|
||||||
= f.error_messages
|
= f.error_messages
|
||||||
.form-inline
|
.form-inline
|
||||||
= f.text_field :email, :value => @user.unconfirmed_email || @user.email
|
= f.text_field :email, :value => @user.unconfirmed_email || @user.email, :class => "span7"
|
||||||
= f.submit t('.change_email'), :class => "btn"
|
= f.submit t('.change_email'), :class => "btn"
|
||||||
.small-horizontal-spacer
|
.small-horizontal-spacer
|
||||||
- if @user.unconfirmed_email.present?
|
- if @user.unconfirmed_email.present?
|
||||||
|
|
@ -222,4 +222,4 @@
|
||||||
%p
|
%p
|
||||||
= f.submit t('.close_account_text'), :class => "btn btn-danger", :id => "close_account_confirm", :data => { :confirm => t('are_you_sure_delete_account') }
|
= f.submit t('.close_account_text'), :class => "btn btn-danger", :id => "close_account_confirm", :data => { :confirm => t('are_you_sure_delete_account') }
|
||||||
|
|
||||||
.span4
|
.span5
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
= render 'shared/settings_nav'
|
= render 'shared/settings_nav'
|
||||||
|
|
||||||
.row-fluid
|
.row-fluid
|
||||||
.span8
|
.span7
|
||||||
%h3
|
%h3
|
||||||
= t('.ignored_users')
|
= t('.ignored_users')
|
||||||
|
|
||||||
|
|
@ -26,4 +26,4 @@
|
||||||
= link_to t('.stop_ignoring'), block_path(block),
|
= link_to t('.stop_ignoring'), block_path(block),
|
||||||
:method => :delete
|
:method => :delete
|
||||||
%br
|
%br
|
||||||
.span4
|
.span5
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue