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

Make new aspect popup Bootstrap compatible

Browse source
This commit is contained in:
Błażej Pankowiak 2014-08-14 21:01:04 +02:00
parent f085436160
commit ede042f6cd
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/assets/stylesheets/aspects.css.scss
View file

@ -370,3 +370,14 @@ $bluebg: #e7f2f7;
display: block; display: block;
} }
} }
#new_aspect {
#aspect_contacts_visible.checkbox {
margin: 0px;
}
label[for="aspect_contacts_visible"] {
display: inline;
}
}

10
app/views/aspects/new.haml
View file

@ -2,7 +2,9 @@
-# licensed under the Affero General Public License version 3 or later. See -# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
.span-12.last -# TODO: remove Blueprint classes when everything is ported to Bootstrap
.span6.span-12.last
#facebox_header #facebox_header
%h3 %h3
= t('contacts.index.add_a_new_aspect') = t('contacts.index.add_a_new_aspect')
@ -16,11 +18,11 @@
= aspect.text_field :name, :maxlength => 20 = aspect.text_field :name, :maxlength => 20
%p.checkbox_select %p.checkbox_select
= aspect.check_box :contacts_visible, :checked => false, class: 'checkbox'
= aspect.label :contacts_visible, t('aspects.edit.make_aspect_list_visible') = aspect.label :contacts_visible, t('aspects.edit.make_aspect_list_visible')
= aspect.check_box :contacts_visible, :checked => false
%br %br
.bottom_submit_section .bottom_submit_section
= submit_tag t('cancel'), :class => 'button', :type => :reset, :rel => "close" = submit_tag t('cancel'), :class => 'button btn', :type => :reset, :rel => "close"
= aspect.submit t('.create'), :class => 'button creation' = aspect.submit t('.create'), :class => 'button btn creation'