diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb index cba54d3e..346b891f 100644 --- a/app/helpers/journals_helper.rb +++ b/app/helpers/journals_helper.rb @@ -58,7 +58,7 @@ module JournalsHelper end end - content_tag("div", "#{header}#{details}", :id => "change-#{journal.id}", :class => "journal") + return "#{header}#{details}" end def render_notes(model, journal, options={}) diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml index 48c2282f..c7206d2c 100644 --- a/app/views/issues/show.rhtml +++ b/app/views/issues/show.rhtml @@ -108,7 +108,7 @@ <% if @journals.present? %>
-

<%=l(:label_history)%>

+

<%=l(:label_history)%>

<%= render :partial => 'history', :locals => { :issue => @issue, :journals => @journals } %>
<% end %> diff --git a/public/images/speech-blue.png b/public/images/speech-blue.png deleted file mode 100644 index 4a5ec559..00000000 Binary files a/public/images/speech-blue.png and /dev/null differ diff --git a/public/images/speech-white.png b/public/images/speech-white.png deleted file mode 100644 index 87092969..00000000 Binary files a/public/images/speech-white.png and /dev/null differ diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index c05c29a1..ee63f5cb 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -1806,14 +1806,9 @@ table.files { font-size:12px; font-weight:normal; margin-bottom:-1px; - padding-bottom:12px; - background:url(../images/speech-white.png) no-repeat 30px bottom; position:relative; z-index:5; } -.journal.question h4 { - background-image:url(../images/speech-blue.png); -} .journal h4 .history-id { float:right; color:#999; @@ -2472,6 +2467,10 @@ a.has-thumb img { #more-menu.drop-down ul li a.projects { border-top:1px solid #555; } +/* Adds a simple rounded corner background */ +.rounded-background { background: #E6E5E5; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; } + + /************************************************************************* Additional wiki styles *************************************************************************/