From 0bbbaa0dbd5f4efc0b8b3ff37ea579734edb45f0 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Tue, 10 Jan 2012 18:24:12 +0000 Subject: [PATCH] Removed hard-coded styles. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8631 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/versions/show.html.erb | 10 +++++----- public/stylesheets/application.css | 7 ++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/views/versions/show.html.erb b/app/views/versions/show.html.erb index f23d83f1c..07ae0b1cc 100644 --- a/app/views/versions/show.html.erb +++ b/app/views/versions/show.html.erb @@ -14,16 +14,16 @@
<% if @version.estimated_hours > 0 || User.current.allowed_to?(:view_time_entries, @project) %> -
<%= l(:label_time_tracking) %> +
<%= l(:label_time_tracking) %> - - + + <% if User.current.allowed_to?(:view_time_entries, @project) %> - - + + <% end %>
<%= l(:field_estimated_hours) %><%= html_hours(l_hours(@version.estimated_hours)) %><%= l(:field_estimated_hours) %><%= html_hours(l_hours(@version.estimated_hours)) %>
<%= l(:label_spent_time) %><%= html_hours(l_hours(@version.spent_hours)) %><%= l(:label_spent_time) %><%= html_hours(l_hours(@version.spent_hours)) %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 9c255f92e..0700dc55a 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -356,11 +356,12 @@ div#roadmap .related-issues td.checkbox { display: none; } div#roadmap .wiki h1:first-child { display: none; } div#roadmap .wiki h1 { font-size: 120%; } div#roadmap .wiki h2 { font-size: 110%; } -body.controller-versions.action-show div#roadmap .related-issues {width:auto;} +body.controller-versions.action-show div#roadmap .related-issues {width:70%;} -div#version-summary { float:right; width:380px; margin-left: 16px; margin-bottom: 16px; background-color: #fff; } +div#version-summary { float:right; width:28%; margin-left: 16px; margin-bottom: 16px; background-color: #fff; } div#version-summary fieldset { margin-bottom: 1em; } -div#version-summary .total-hours { text-align: right; } +div#version-summary fieldset.time-tracking table { width:100%; } +div#version-summary th, div#version-summary td.total-hours { text-align: right; } table#time-report td.hours, table#time-report th.period, table#time-report th.total { text-align: right; padding-right: 0.5em; } table#time-report tbody tr.subtotal { font-style: italic; color:#777;}