nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

elements are centered within the grid

Browse source
This commit is contained in:
Pablo Cuadrado 2014-07-11 11:01:42 -03:00
parent a6998c23b7
commit beb795e3b3
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/views/profiles/edit.haml
View file

@ -14,11 +14,12 @@
.container .container
.row-fluid .row-fluid
.span7 .span3
.span6
- 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}
.span5 .span3

5
app/views/users/edit.html.haml
View file

@ -16,7 +16,8 @@
= render 'shared/settings_nav' = render 'shared/settings_nav'
.row-fluid .row-fluid
.span7 .span3
.span6
.row-fluid .row-fluid
.span6 .span6
%h3 %h3
@ -222,4 +223,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') }
.span5 .span3

5
app/views/users/privacy_settings.html.haml
View file

@ -16,7 +16,8 @@
= render 'shared/settings_nav' = render 'shared/settings_nav'
.row-fluid .row-fluid
.span7 .span3
.span5
%h3 %h3
= t('.ignored_users') = t('.ignored_users')
@ -26,4 +27,4 @@
= link_to t('.stop_ignoring'), block_path(block), = link_to t('.stop_ignoring'), block_path(block),
:method => :delete :method => :delete
%br %br
.span5 .span3