From 22555d8f554fa101c327ba8cf16b69658851b9f4 Mon Sep 17 00:00:00 2001 From: Florian Kraft Date: Tue, 19 May 2015 19:01:40 +0200 Subject: [PATCH] repair broken subtitles [ci skip] Signed-off-by: Florian Kraft --- app/assets/stylesheets/layout/_toolbar.sass | 12 ++++++------ app/views/work_packages/edit.html.erb | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/layout/_toolbar.sass b/app/assets/stylesheets/layout/_toolbar.sass index e9041b9579..90bc7e5d8a 100644 --- a/app/assets/stylesheets/layout/_toolbar.sass +++ b/app/assets/stylesheets/layout/_toolbar.sass @@ -41,6 +41,12 @@ padding: 0 margin-bottom: 24px + > .subtitle + font-size: rem-calc(14px) + font-style: italic + margin-top: rem-calc(5px) + clear: both + #toolbar ul margin: 0 @@ -79,12 +85,6 @@ border: 0 padding: 12px 0 0 0 - .subtitle - font-size: rem-calc(14px) - font-style: italic - margin-top: rem-calc(5px) - clear: both - span color: $content-link-color diff --git a/app/views/work_packages/edit.html.erb b/app/views/work_packages/edit.html.erb index 1c566d66ba..dacfeebd65 100644 --- a/app/views/work_packages/edit.html.erb +++ b/app/views/work_packages/edit.html.erb @@ -28,8 +28,7 @@ See doc/COPYRIGHT.rdoc for more details. ++#%> <% html_title l(:label_work_package_edit, name: work_package.to_s) %> - -

<%=h work_package.to_s %>

+<%= toolbar title: h(work_package.to_s) %> <%= render :partial => 'edit', :locals => { :work_package => work_package, :allowed_statuses => allowed_statuses,