From f9a2e30b9f0fd16553a9fcef42a09306d0820869 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Fri, 9 Dec 2011 17:55:47 -0800 Subject: [PATCH] [#692] Fix issue history styles --- app/helpers/journals_helper.rb | 2 +- app/views/issues/show.rhtml | 2 +- public/images/speech-blue.png | Bin 286 -> 0 bytes public/images/speech-white.png | Bin 228 -> 0 bytes public/stylesheets/application.css | 9 ++++----- 5 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 public/images/speech-blue.png delete mode 100644 public/images/speech-white.png 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 4a5ec5596191a6b27994cfd88b0aef6ff8ad313d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 286 zcmV+(0pb3MP)#rEHN$k4X)IEYyfl(zse7(spjayGvD{LL?J(Pjo9 zjp3(63q6Kh2jip%rzyI(*WBE=7 kpxYS;fo2~&27mwq07%MODZRXbsQ>@~07*qoM6N<$f}v!0S^xk5 diff --git a/public/images/speech-white.png b/public/images/speech-white.png deleted file mode 100644 index 870929695175862950d20e154d8fd60f146a0ad5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CO!3HF4Hmy+sQj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS>JirPF~978H@CH?vMn4Q_`$M5g!>z%qLnliFT ZFy!Yuw(dPtJ_G0?22WQ%mvv4FO#sZwQ3wD4 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 *************************************************************************/