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

corrected failing cuke and social buttons

Browse source
This commit is contained in:
Augier 2015-06-03 20:57:02 +02:00 committed by Jonne Haß
parent e3bff1f20b
commit d7522d9498
4 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/mobile/header.scss
View file

@ -75,8 +75,10 @@ header {
form { form {
position: absolute; position: absolute;
left: 15px; left: 0;
right: 22%; right: 22%;
padding: 0 15px;
width: 450px;
input { input {
box-shadow: 0 1px 1px #444; box-shadow: 0 1px 1px #444;

4
app/assets/stylesheets/publisher.scss
View file

@ -216,8 +216,8 @@
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
position: absolute; position: absolute;
right: 100px; right: 10px;
bottom: -31px; bottom: -25px;
} }
&.with_location .counter { &.with_location .counter {
bottom: -62px; bottom: -62px;

8
app/views/profiles/_edit_public.haml
View file

@ -30,6 +30,14 @@
}); });
}); });
- if mobile
.stream
- flash.each do |name, msg|
%div{:id => "flash_#{name}", :class => "expose"}
.message= msg
.stream
%p{:class => "conversation_#{name}"}= msg
%h3= t('profiles.edit.your_public_profile') %h3= t('profiles.edit.your_public_profile')
= error_messages_for profile = error_messages_for profile

4
app/views/publisher/_publisher.html.haml
View file

@ -56,11 +56,11 @@
=t('cancel') =t('cancel')
.btn-toolbar.pull-right .btn-toolbar.pull-right
%span#publisher_service_icons %span#publisher_service_icons.btn-group
- if current_user.services - if current_user.services
- for service in current_user.services - for service in current_user.services
= service_button(service) = service_button(service)
%a.btn.btn-group.btn-link{ href: "#question_mark_pane", class: 'question_mark', rel: 'facebox', title: t('shared.public_explain.manage') } %a.btn.btn-link{ href: "#question_mark_pane", class: 'question_mark', rel: 'facebox', title: t('shared.public_explain.manage') }
%i.entypo.cog %i.entypo.cog
= render partial: "publisher/aspect_dropdown", locals: { :selected_aspects => selected_aspects } = render partial: "publisher/aspect_dropdown", locals: { :selected_aspects => selected_aspects }