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

fixed wrong indenting and broken messages tab for polls

Browse source
This commit is contained in:
Jannik Streek 2014-03-21 19:09:24 +01:00
parent 8a4f833d1d
commit c02414c36d
5 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/publisher.css.scss
View file

@ -59,7 +59,6 @@
resize: none; resize: none;
height: 50px; height: 50px;
} }
}
&.active textarea { &.active textarea {
min-height: 70px; min-height: 70px;
@ -79,7 +78,6 @@
line-height: 20px !important; line-height: 20px !important;
width: 100% !important; width: 100% !important;
} }
}
&.with_attachments .row-fluid#photodropzone_container { &.with_attachments .row-fluid#photodropzone_container {
border-top: 1px dashed $border-grey; border-top: 1px dashed $border-grey;

2
app/models/poll_participation.rb
View file

@ -52,7 +52,7 @@ class PollParticipation < ActiveRecord::Base
existing = PollParticipation.where(author_id: self.author.id, poll_id: self.poll.id) existing = PollParticipation.where(author_id: self.author.id, poll_id: self.poll.id)
if existing.first != self and existing.count != 0 if existing.first != self and existing.count != 0
self.errors.add(:poll, I18n.t("errors.models.poll_participations.attributes.poll.already_participated")) self.errors.add(:poll, I18n.t("activerecord.errors.models.poll_participations.attributes.poll.already_participated"))
end end
end end