Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

simplyfy Read More

Browse source
This commit is contained in:
Felix Niklas 2015-01-15 01:26:19 +01:00
parent df1fd1f646
commit 4efebb9b1d
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/app/controllers/layout_ref.js.coffee
View file

@ -120,8 +120,9 @@ class CommunicationOverview extends App.ControllerContent
unfold: (e) -> unfold: (e) ->
container = $(e.currentTarget).parents('.textBubble-content') container = $(e.currentTarget).parents('.textBubble-content')
overflowContainer = container.find('.textBubble-overflowContainer')
container.find('.textBubble-overflowContainer').velocity overflowContainer.velocity
properties: properties:
opacity: 0 opacity: 0
options: options:
@ -132,7 +133,7 @@ class CommunicationOverview extends App.ControllerContent
height: container.attr('data-height') height: container.attr('data-height')
options: options:
duration: 300 duration: 300
complete: -> container.parents('.textBubble').removeClass('is-overflowing') complete: -> overflowContainer.addClass('hide');
render: -> render: ->
@html App.view('layout_ref/communication_overview')() @html App.view('layout_ref/communication_overview')()

2
app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco
View file

@ -196,7 +196,7 @@ Grüße, Peter</div>
<div class="article-content zIndex-1"> <div class="article-content zIndex-1">
<span class="avatar user-popover " data-id="3" style="background-image: url(api/v1/users/image/bb100af55234cf61fb6f207636f095f8)" data-placement="right" data-original-title="" title=""></span> <span class="avatar user-popover " data-id="3" style="background-image: url(api/v1/users/image/bb100af55234cf61fb6f207636f095f8)" data-placement="right" data-original-title="" title=""></span>
<div class="flex bubble-gap internal-border"> <div class="flex bubble-gap internal-border">
<div class="textBubble is-overflowing"><div class="bubble-arrow"></div> <div class="textBubble"><div class="bubble-arrow"></div>
<div class="textBubble-content" style="height: 300px" data-height="539">Lieber HP,<br> <div class="textBubble-content" style="height: 300px" data-height="539">Lieber HP,<br>
anbei findest du die Midi Noten für Maria Maria "I Like it Loud".<br> anbei findest du die Midi Noten für Maria Maria "I Like it Loud".<br>
Wünsche dir einen guten Auftritt in Hamburg.<br> Wünsche dir einen guten Auftritt in Hamburg.<br>

7
app/assets/stylesheets/zammad.css.scss
View file

@ -3152,7 +3152,7 @@ footer {
position: relative; position: relative;
} }
.is-overflowing .textBubble-overflowContainer { .textBubble-overflowContainer {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
left: 0; left: 0;
@ -3174,7 +3174,7 @@ footer {
} }
} }
.customer .is-overflowing .textBubble-overflowContainer { .customer .textBubble-overflowContainer {
background: #e5f0f5; background: #e5f0f5;
&:before { &:before {
background: linear-gradient(transparent, #e5f0f5); background: linear-gradient(transparent, #e5f0f5);
@ -3185,9 +3185,6 @@ footer {
background: #e5f0f5; background: #e5f0f5;
border-color: hsl(199,38%,92%); border-color: hsl(199,38%,92%);
box-shadow: none; box-shadow: none;
&.is-overflowing:after {
background: linear-gradient(transparent, #e5f0f5 60px);
}
} }
.customer.ticket-article-item.state--folde-out .textBubble { .customer.ticket-article-item.state--folde-out .textBubble {