From 76ab961d0fcec80c8f4540eef16d392140024087 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Tue, 8 Jul 2014 14:55:08 +0200 Subject: [PATCH] fix #315 --- app/coffee/modules/issues/detail.coffee | 1 - app/styles/modules/activity.scss | 42 ------------------------- app/styles/modules/comments.scss | 3 ++ 3 files changed, 3 insertions(+), 43 deletions(-) diff --git a/app/coffee/modules/issues/detail.coffee b/app/coffee/modules/issues/detail.coffee index d8d0b37f..7777134d 100644 --- a/app/coffee/modules/issues/detail.coffee +++ b/app/coffee/modules/issues/detail.coffee @@ -520,7 +520,6 @@ CommentDirective = () -> link = ($scope, $el, $attrs, $model) -> $el.on "click", ".activity-title", (event) -> event.preventDefault() - $el.find(".activity-inner").toggle() $el.find(".activity-inner").toggleClass("active") $scope.$on "$destroy", -> diff --git a/app/styles/modules/activity.scss b/app/styles/modules/activity.scss index d1266be7..711f9b6b 100644 --- a/app/styles/modules/activity.scss +++ b/app/styles/modules/activity.scss @@ -1,45 +1,3 @@ -.us-activity { - margin-bottom: 1rem; - padding: 0 1rem; -} - -.activity-title { - display: block; - padding: .5rem; - &:hover { - .icon { - @include transform(rotate(180deg)); - @include transition(all.2s linear); - color: $green-taiga; - } - } - .icon { - @include transform(rotate(0)); - @include transition(all.2s linear); - color: $grayer; - float: right; - } -} - -.activity-inner { - @include table-flex; - border-bottom: 1px solid $gray-light; - padding: 1rem 0; - &:last-child { - border-bottom: 0; - } - .activity-changed, - .activity-fromto { - @include table-flex-child(1, 50px, 0); - } - .activity-changed { - @extend %bold; - } - .activity-fromto { - @extend %small; - } -} - .activity-single { @include table-flex; border-bottom: 2px solid $gray-light; diff --git a/app/styles/modules/comments.scss b/app/styles/modules/comments.scss index 9e105757..99cd1688 100644 --- a/app/styles/modules/comments.scss +++ b/app/styles/modules/comments.scss @@ -51,6 +51,9 @@ background: $whitish; .activity-inner { display: none; + &.active { + display: flex; + } } } .date {