From 4efebb9b1dd2d03203b055cb2c7a788029e786a6 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 15 Jan 2015 01:26:19 +0100 Subject: [PATCH] simplyfy Read More --- .../javascripts/app/controllers/layout_ref.js.coffee | 5 +++-- .../app/views/layout_ref/communication_overview.jst.eco | 2 +- app/assets/stylesheets/zammad.css.scss | 7 ++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/app/controllers/layout_ref.js.coffee b/app/assets/javascripts/app/controllers/layout_ref.js.coffee index ef40756a4..789cfecda 100644 --- a/app/assets/javascripts/app/controllers/layout_ref.js.coffee +++ b/app/assets/javascripts/app/controllers/layout_ref.js.coffee @@ -120,8 +120,9 @@ class CommunicationOverview extends App.ControllerContent unfold: (e) -> container = $(e.currentTarget).parents('.textBubble-content') + overflowContainer = container.find('.textBubble-overflowContainer') - container.find('.textBubble-overflowContainer').velocity + overflowContainer.velocity properties: opacity: 0 options: @@ -132,7 +133,7 @@ class CommunicationOverview extends App.ControllerContent height: container.attr('data-height') options: duration: 300 - complete: -> container.parents('.textBubble').removeClass('is-overflowing') + complete: -> overflowContainer.addClass('hide'); render: -> @html App.view('layout_ref/communication_overview')() diff --git a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco index 63d52cbe5..0dab231b9 100644 --- a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco @@ -196,7 +196,7 @@ Grüße, Peter
-
+
Lieber HP,
anbei findest du die Midi Noten für Maria Maria "I Like it Loud".
Wünsche dir einen guten Auftritt in Hamburg.
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 2b17be820..9be8242a4 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -3152,7 +3152,7 @@ footer { position: relative; } - .is-overflowing .textBubble-overflowContainer { + .textBubble-overflowContainer { position: absolute; bottom: 0; left: 0; @@ -3174,7 +3174,7 @@ footer { } } - .customer .is-overflowing .textBubble-overflowContainer { + .customer .textBubble-overflowContainer { background: #e5f0f5; &:before { background: linear-gradient(transparent, #e5f0f5); @@ -3185,9 +3185,6 @@ footer { background: #e5f0f5; border-color: hsl(199,38%,92%); box-shadow: none; - &.is-overflowing:after { - background: linear-gradient(transparent, #e5f0f5 60px); - } } .customer.ticket-article-item.state--folde-out .textBubble {