From 50e10c55f5bc209840b223269ac18f03b10ad600 Mon Sep 17 00:00:00 2001 From: Alex Coles Date: Fri, 10 Oct 2014 15:12:12 +0200 Subject: [PATCH] Fix for regression in activity list avatar styling Tighten up scoping of various classes. Signed-off-by: Alex Coles --- .../stylesheets/content/_work_packages.sass | 20 -------------- .../work_package_details/_activities_tab.sass | 26 +++++++++++++++++++ 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/app/assets/stylesheets/content/_work_packages.sass b/app/assets/stylesheets/content/_work_packages.sass index c4d90dab05..d790e88746 100644 --- a/app/assets/stylesheets/content/_work_packages.sass +++ b/app/assets/stylesheets/content/_work_packages.sass @@ -146,17 +146,6 @@ line-height: 18px -// TODO: remove or rename with more specific name -span.user - display: block - line-height: 16px - -// TODO: remove or rename with more specific name -span.date - display: block - font-size: 12px - - .comments-form float: left width: 100% @@ -237,12 +226,3 @@ $work-package-details--tab-height: 40px border-bottom: 2px solid $content_link_color a color: $content_link_color - -.work-package-details-activities-activity:not(:last-child) - margin-bottom: 10px - -.work-package-details-activities-activity-contents - padding: 10px 0 - textarea - width: 100% - resize: none diff --git a/app/assets/stylesheets/content/work_package_details/_activities_tab.sass b/app/assets/stylesheets/content/work_package_details/_activities_tab.sass index 67e51c44ad..86cf6fd83e 100644 --- a/app/assets/stylesheets/content/work_package_details/_activities_tab.sass +++ b/app/assets/stylesheets/content/work_package_details/_activities_tab.sass @@ -68,3 +68,29 @@ span.comment li padding: 0 !important margin: 0 !important + +.work-package-details-activities-activity:not(:last-child) + margin-bottom: 10px + +.work-package-details-activities-activity-contents + padding: 10px 0 + + textarea + width: 100% + resize: none + + .avatar + float: left + margin: -2px 10px 0 0 + + .avatar-mini + float: left + margin: -3px 7px 0 0 + + .user + display: block + line-height: 16px + + .date + display: block + font-size: 12px