summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/helpers/journals_helper.rb5
-rw-r--r--public/stylesheets/application.css4
2 files changed, 8 insertions, 1 deletions
diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb
index 45579f771..389d7fbf1 100644
--- a/app/helpers/journals_helper.rb
+++ b/app/helpers/journals_helper.rb
@@ -30,7 +30,10 @@ module JournalsHelper
end
content << content_tag('div', links.join(' '), :class => 'contextual') unless links.empty?
content << textilizable(journal, :notes)
- content_tag('div', content, :id => "journal-#{journal.id}-notes", :class => (editable ? 'wiki editable' : 'wiki'))
+ css_classes = "wiki"
+ css_classes << " editable" if editable
+ css_classes << " gravatar-margin" if Setting.gravatar_enabled?
+ content_tag('div', content, :id => "journal-#{journal.id}-notes", :class => css_classes)
end
def link_to_in_place_notes_editor(text, field_id, url, options={})
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 3527cce4b..21bebe56e 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -778,6 +778,10 @@ td.username img.gravatar {
clear: left;
}
+.gravatar-margin {
+ margin-left: 40px;
+}
+
h2 img { vertical-align:middle; }