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

Merge branch 'interface' of github.com:martini/zammad into interface

Browse source
This commit is contained in:
Martin Edenhofer 2014-09-15 13:20:02 +02:00
commit aa71dcbf86
4 changed files with 43 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/assets/images/sprite.svg
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="306px" height="371px" viewBox="0 0 306 371" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"> <svg width="306px" height="351px" viewBox="0 0 306 351" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
<title> 1</title> <title> 1</title>
<description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description> <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
<defs></defs> <defs></defs>
@ -187,11 +187,10 @@
<path d="M6.3789375,-0.039 C2.8114125,-0.039 -0.08125,2.8517125 -0.08125,6.4194 C-0.08125,9.9870875 2.8114125,12.87975 6.3789375,12.87975 C9.9448375,12.87975 12.8375,9.9870875 12.8375,6.4194 C12.8375,2.8517125 9.9448375,-0.039 6.3789375,-0.039 L6.3789375,-0.039 L6.3789375,-0.039 Z M6.3847875,11.579425 C3.4978125,11.579425 1.1505,9.251125 1.1505,6.3890125 C1.1505,3.5269 3.4978125,1.20055 6.3847875,1.20055 C9.269975,1.20055 11.619075,3.5269 11.619075,6.3890125 C11.619075,9.251125 9.269975,11.579425 6.3847875,11.579425 L6.3847875,11.579425 L6.3847875,11.579425 Z" id="Shape" sketch:type="MSShapeGroup"></path> <path d="M6.3789375,-0.039 C2.8114125,-0.039 -0.08125,2.8517125 -0.08125,6.4194 C-0.08125,9.9870875 2.8114125,12.87975 6.3789375,12.87975 C9.9448375,12.87975 12.8375,9.9870875 12.8375,6.4194 C12.8375,2.8517125 9.9448375,-0.039 6.3789375,-0.039 L6.3789375,-0.039 L6.3789375,-0.039 Z M6.3847875,11.579425 C3.4978125,11.579425 1.1505,9.251125 1.1505,6.3890125 C1.1505,3.5269 3.4978125,1.20055 6.3847875,1.20055 C9.269975,1.20055 11.619075,3.5269 11.619075,6.3890125 C11.619075,9.251125 9.269975,11.579425 6.3847875,11.579425 L6.3847875,11.579425 L6.3847875,11.579425 Z" id="Shape" sketch:type="MSShapeGroup"></path>
<path d="M9.9220875,6.1923875 L11.1957625,6.1923875 C11.1726875,5.6701125 11.0680375,5.170425 10.8905875,4.7051875 L10.303475,4.95495 L10.1716875,4.6499375 L10.761075,4.400175 C10.5457625,3.936725 10.2574875,3.511625 9.9107125,3.1416125 L9.42435,3.624075 L9.190025,3.3895875 L9.674275,2.907125 C9.3481375,2.6039 8.978125,2.34455 8.5739875,2.1386625 L8.3032625,2.7392625 L7.9980875,2.6039 L8.27255,1.9976125 C7.750275,1.77645 7.18185,1.644825 6.5849875,1.6199625 L6.5849875,3.01015 L6.251375,3.01015 L6.251375,1.618175 C5.7291,1.6315 5.2274625,1.728675 4.760275,1.8965375 L5.0864125,2.6364 L4.77945,2.7678625 L4.4494125,2.018575 C3.97475,2.224625 3.54185,2.504775 3.1643625,2.8461875 L3.71345,3.3895875 L3.47685,3.624075 L2.922075,3.074825 C2.5959375,3.4086 2.319525,3.789825 2.1038875,4.20745 L2.8819375,4.541225 L2.744625,4.8425 L1.9608875,4.5069375 C1.7320875,5.0275875 1.5965625,5.5976375 1.5718625,6.1945 L3.0459,6.19255 L3.0459,6.522425 L1.5718625,6.526325 C1.5871375,7.1098625 1.709175,7.664475 1.9209125,8.177325 L2.689375,7.8456625 L2.821,8.150675 L2.0583875,8.4787625 C2.266225,8.905975 2.5389,9.2967875 2.8650375,9.6399875 L3.4294,9.1099125 L3.6658375,9.3444 L3.099525,9.8762625 C3.4656375,10.215725 3.88505,10.497825 4.3447625,10.7095625 L4.667,9.984975 L4.970225,10.1222875 L4.649775,10.8411875 C5.1494625,11.0339125 5.6889625,11.1444125 6.251375,11.1596875 L6.251375,9.7734 L6.5849875,9.7734 L6.5849875,11.1579 C7.1722625,11.1349875 7.7348375,11.0072625 8.25175,10.7898375 L7.9963,10.1986625 L8.3013125,10.0689875 L8.553025,10.6484625 C8.983975,10.4329875 9.376575,10.154625 9.7218875,9.8267 L9.302475,9.411025 L9.5389125,9.1765375 L9.9545875,9.5883125 C10.274875,9.237475 10.5418625,8.84065 10.7479125,8.406125 L10.17575,8.1523 L10.3129,7.8492375 L10.879375,8.1011125 C11.0699875,7.6090625 11.18065,7.076875 11.1957625,6.5221 L9.9220875,6.5221 L9.9220875,6.1923875 L9.9220875,6.1923875 Z M8.879,8.8105875 C8.7225125,8.965125 8.469175,8.965125 8.312525,8.8086375 L6.365775,7.096375 C6.1884875,6.9171375 5.9843875,6.8007875 5.9843875,6.4481625 L5.9843875,4.1578875 C5.9843875,3.9196625 6.1789,3.7269375 6.4172875,3.7269375 C6.657625,3.7269375 6.8523,3.9196625 6.8523,4.1578875 L6.8523,6.432725 L8.88095,8.2480125 C9.0371125,8.40255 9.0351625,8.6542625 8.879,8.8105875 L8.879,8.8105875 L8.879,8.8105875 Z" id="Shape" sketch:type="MSShapeGroup"></path> <path d="M9.9220875,6.1923875 L11.1957625,6.1923875 C11.1726875,5.6701125 11.0680375,5.170425 10.8905875,4.7051875 L10.303475,4.95495 L10.1716875,4.6499375 L10.761075,4.400175 C10.5457625,3.936725 10.2574875,3.511625 9.9107125,3.1416125 L9.42435,3.624075 L9.190025,3.3895875 L9.674275,2.907125 C9.3481375,2.6039 8.978125,2.34455 8.5739875,2.1386625 L8.3032625,2.7392625 L7.9980875,2.6039 L8.27255,1.9976125 C7.750275,1.77645 7.18185,1.644825 6.5849875,1.6199625 L6.5849875,3.01015 L6.251375,3.01015 L6.251375,1.618175 C5.7291,1.6315 5.2274625,1.728675 4.760275,1.8965375 L5.0864125,2.6364 L4.77945,2.7678625 L4.4494125,2.018575 C3.97475,2.224625 3.54185,2.504775 3.1643625,2.8461875 L3.71345,3.3895875 L3.47685,3.624075 L2.922075,3.074825 C2.5959375,3.4086 2.319525,3.789825 2.1038875,4.20745 L2.8819375,4.541225 L2.744625,4.8425 L1.9608875,4.5069375 C1.7320875,5.0275875 1.5965625,5.5976375 1.5718625,6.1945 L3.0459,6.19255 L3.0459,6.522425 L1.5718625,6.526325 C1.5871375,7.1098625 1.709175,7.664475 1.9209125,8.177325 L2.689375,7.8456625 L2.821,8.150675 L2.0583875,8.4787625 C2.266225,8.905975 2.5389,9.2967875 2.8650375,9.6399875 L3.4294,9.1099125 L3.6658375,9.3444 L3.099525,9.8762625 C3.4656375,10.215725 3.88505,10.497825 4.3447625,10.7095625 L4.667,9.984975 L4.970225,10.1222875 L4.649775,10.8411875 C5.1494625,11.0339125 5.6889625,11.1444125 6.251375,11.1596875 L6.251375,9.7734 L6.5849875,9.7734 L6.5849875,11.1579 C7.1722625,11.1349875 7.7348375,11.0072625 8.25175,10.7898375 L7.9963,10.1986625 L8.3013125,10.0689875 L8.553025,10.6484625 C8.983975,10.4329875 9.376575,10.154625 9.7218875,9.8267 L9.302475,9.411025 L9.5389125,9.1765375 L9.9545875,9.5883125 C10.274875,9.237475 10.5418625,8.84065 10.7479125,8.406125 L10.17575,8.1523 L10.3129,7.8492375 L10.879375,8.1011125 C11.0699875,7.6090625 11.18065,7.076875 11.1957625,6.5221 L9.9220875,6.5221 L9.9220875,6.1923875 L9.9220875,6.1923875 Z M8.879,8.8105875 C8.7225125,8.965125 8.469175,8.965125 8.312525,8.8086375 L6.365775,7.096375 C6.1884875,6.9171375 5.9843875,6.8007875 5.9843875,6.4481625 L5.9843875,4.1578875 C5.9843875,3.9196625 6.1789,3.7269375 6.4172875,3.7269375 C6.657625,3.7269375 6.8523,3.9196625 6.8523,4.1578875 L6.8523,6.432725 L8.88095,8.2480125 C9.0371125,8.40255 9.0351625,8.6542625 8.879,8.8105875 L8.879,8.8105875 L8.879,8.8105875 Z" id="Shape" sketch:type="MSShapeGroup"></path>
</g> </g>
<path d="M34.0951807,347.311111 L34.0951807,344.466667 C37.3686747,344.466667 40.0240964,347.044444 40.0240964,350.222222 C40.0240964,353.422222 37.3686747,356 34.0951807,356 C38.9939759,356 42.9542169,352.155556 42.9542169,347.377778 C42.9542169,342.622222 38.9939759,338.777778 34.0951807,338.777778 L34.0951807,336 L29.0361446,338.822222 L24,341.666667 L29.0361446,344.488889 L34.0951807,347.311111 Z" id="reply" fill="#000000" sketch:type="MSShapeGroup"></path> <path d="M25.4565217,344.483333 L25.4565217,342.35 C27.8743961,342.35 29.8357488,344.283333 29.8357488,346.666667 C29.8357488,349.066667 27.8743961,351 25.4565217,351 C29.0748792,351 32,348.116667 32,344.533333 C32,340.966667 29.0748792,338.083333 25.4565217,338.083333 L25.4565217,336 L21.7198068,338.116667 L18,340.25 L21.7198068,342.366667 L25.4565217,344.483333 Z" id="reply" fill="#000000" sketch:type="MSShapeGroup"></path>
<path d="M58.6084051,344.2388 L58.5990886,344.2 L57.164557,344.2 L57.164557,340.08 C57.164557,339.922 57.3810633,336 53.0956962,336 L51.0033418,336 C46.7127089,336 46.8629873,340 46.8702785,340.2 L46.835443,340.2 L46.835443,344.2 L45.4926582,344.2 C44.7333671,344.2 44,344.8696 44,345.6196 L44,354.5798 L44,354.6154 C44,355.365 44.7331646,356.0002 45.4926582,356.0002 L58.5990886,356.0002 L58.6306835,356.0002 C59.3899747,356 60,355.3652 60,354.6152 L60,354.5796 L60,345.6196 C60,344.8694 59.3678987,344.2388 58.6084051,344.2388 L58.6084051,344.2388 Z M54.3291139,344.2 L49.6708861,344.2 L49.6708861,340.086 C49.6708861,339.4706 50.1689114,338.8 51.0033418,338.8 L53.1088608,338.8 C53.9430886,338.8 54.3291139,339.4524 54.3291139,340.08 L54.3291139,344.2 L54.3291139,344.2 Z" id="lock" fill="#000000" sketch:type="MSShapeGroup"></path> <path d="M2.25,347.25 C2.25000019,344.744123 3.04437463,343.470495 4.99808924,341.870323 C4.96152918,341.900268 5.363979,341.571868 5.4700179,341.484066 C7.21756192,340.037081 7.87500006,338.828278 7.875,336 L7.875,336 L10.125,336 L10.125,336 C10.1250001,338.828278 10.7824382,340.03708 12.5299821,341.484066 C12.6360211,341.571867 13.0384709,341.900268 13.0019109,341.870323 C14.9556254,343.470495 15.7499999,344.744123 15.75,347.25 L15.7500001,347.25 L11.25,347.25 L14.625,351 L18,347.25 L15.75,347.25 L13.5,347.25 C13.4999999,345.533167 13.0581529,344.824749 11.5762306,343.610994 C11.6187304,343.645803 11.2083684,343.310947 11.0950179,343.217092 C10.0633764,342.362881 9.29747109,341.515339 8.77205511,340.5 L9.22794511,340.5 L9.22794511,340.5 C8.70252912,341.51534 7.93662368,342.362881 6.9049821,343.217092 C6.79163163,343.310947 6.38126967,343.645804 6.42376953,343.610995 C4.9418471,344.824749 4.50000011,345.533167 4.5,347.25 L2.25,347.25 L6.75,347.25 L3.375,351 L8.8817842e-16,347.25 L2.24999993,347.25 Z" id="split" fill="#000000" sketch:type="MSShapeGroup"></path>
<path d="M3,351 C3.00000025,347.658831 4.05916618,345.96066 6.66411898,343.827098 C6.61537225,343.867024 7.151972,343.429157 7.29335721,343.312088 C9.6234159,341.382774 10.5000001,339.771038 10.5,336 L10.5,336 L13.5,336 L13.5,336 C13.5000001,339.771037 14.3765843,341.382774 16.7066428,343.312088 C16.8480281,343.429157 17.3846279,343.867023 17.3358812,343.827098 C19.9408339,345.96066 20.9999998,347.658831 21,351 L21.0000001,351 L15,351 L19.5,356 L24,351 L21,351 L18,351 C17.9999999,348.710889 17.4108706,347.766332 15.4349741,346.147992 C15.4916405,346.194405 14.9444912,345.747929 14.7933572,345.622789 C13.4178353,344.483842 12.3966281,343.353786 11.6960735,342 L12.3039268,342 L12.3039268,342 C11.6033722,343.353786 10.5821649,344.483842 9.20664279,345.622789 C9.05550884,345.74793 8.50835957,346.194405 8.56502604,346.147993 C6.58912946,347.766332 6.00000015,348.710889 6,351 L3,351 L9,351 L4.5,356 L0,351 L2.99999991,351 Z" id="split" fill="#000000" sketch:type="MSShapeGroup"></path> <path d="M43.9955775,343 C43.4457352,343 43,343.453036 43,343.99703 L43,350.00297 C43,350.553614 43.444837,351 43.9955775,351 L53.0044225,351 C53.5542648,351 54,350.546964 54,350.00297 L54,343.99703 C54,343.446386 53.555163,343 53.0044225,343 L43.9955775,343 Z M46.4077632,341.571429 L46.4023505,341.482613 C46.4030141,341.489235 46.4015696,341.474212 46.4003105,341.455507 C46.379729,341.149748 46.4205913,340.771722 46.5669088,340.429021 C46.8359739,339.798824 47.4008258,339.428571 48.4996473,339.428571 C49.5985181,339.428572 50.1635634,339.798885 50.4328388,340.429174 C50.5793057,340.772007 50.6202475,341.150138 50.599718,341.455859 C50.5984676,341.474479 50.5970325,341.489439 50.5976961,341.482806 L50.592307,341.571429 L50.592307,343 L51.987225,343 L51.987225,341.571429 L51.981836,341.660051 C51.9853834,341.629798 51.9882738,341.599667 51.991349,341.553872 C52.0259563,341.038509 51.9615254,340.443438 51.7107881,339.85654 C51.2171616,338.701116 50.147359,338 48.4996474,338 C46.8518862,338 45.782181,338.701176 45.288829,339.856693 C45.0383141,340.443443 44.9740043,341.038385 45.0086952,341.553755 C45.0117872,341.599689 45.0146936,341.629916 45.0182579,341.660245 L45.0128452,341.571429 L45.0128452,343 L46.4077632,343 L46.4077632,341.571429 Z" id="internal" fill="#F58957" sketch:type="MSShapeGroup"></path>
<path d="M11.9955775,363 C11.4457352,363 11,363.453036 11,363.99703 L11,370.00297 C11,370.553614 11.444837,371 11.9955775,371 L21.0044225,371 C21.5542648,371 22,370.546964 22,370.00297 L22,363.99703 C22,363.446386 21.555163,363 21.0044225,363 L11.9955775,363 Z M14.4077632,361.571429 L14.4023505,361.482613 C14.4030141,361.489235 14.4015696,361.474212 14.4003105,361.455507 C14.379729,361.149748 14.4205913,360.771722 14.5669088,360.429021 C14.8359739,359.798824 15.4008258,359.428571 16.4996473,359.428571 C17.5985181,359.428572 18.1635634,359.798885 18.4328388,360.429174 C18.5793057,360.772007 18.6202475,361.150138 18.599718,361.455859 C18.5984676,361.474479 18.5970325,361.489439 18.5976961,361.482806 L18.592307,361.571429 L18.592307,363 L19.987225,363 L19.987225,361.571429 L19.981836,361.660051 C19.9853834,361.629798 19.9882738,361.599667 19.991349,361.553872 C20.0259563,361.038509 19.9615254,360.443438 19.7107881,359.85654 C19.2171616,358.701116 18.147359,358 16.4996474,358 C14.8518862,358 13.782181,358.701176 13.288829,359.856693 C13.0383141,360.443443 12.9740043,361.038385 13.0086952,361.553755 C13.0117872,361.599689 13.0146936,361.629916 13.0182579,361.660245 L13.0128452,361.571429 L13.0128452,363 L14.4077632,363 L14.4077632,361.571429 Z" id="internal" fill="#F58957" sketch:type="MSShapeGroup"></path> <path d="M35.4077632,343 L42.0044225,343 C42.555163,343 43,343.446386 43,343.99703 L43,350.00297 C43,350.546964 42.5542648,351 42.0044225,351 L32.9955775,351 C32.444837,351 32,350.553614 32,350.00297 L32,343.99703 C32,343.453036 32.4457352,343 32.9955775,343 L34.0128452,343 L34.0128452,340.210526 L34.0182579,340.315236 C34.0146936,340.27948 34.0117872,340.243843 34.0086952,340.18969 C33.9740043,339.582096 34.0383141,338.880691 34.288829,338.188943 C34.782181,336.82665 35.8518862,336 37.4996474,336 C39.147359,336 40.2171616,336.826578 40.7107881,338.188763 C40.9615254,338.880684 41.0259563,339.582243 40.991349,340.189828 C40.9882738,340.243818 40.9853834,340.279341 40.981836,340.315007 L40.987225,340.210526 L40.987225,341.894737 L39.592307,341.894737 L39.592307,340.210526 L39.5976961,340.106046 C39.5970325,340.113866 39.5984676,340.096228 39.599718,340.074275 C39.6202475,339.713847 39.5793057,339.26805 39.4328388,338.863868 C39.1635634,338.12079 38.5985181,337.684211 37.4996473,337.684211 C36.4008258,337.68421 35.8359739,338.120718 35.5669088,338.863688 C35.4205913,339.267715 35.379729,339.713387 35.4003105,340.073861 C35.4015696,340.095913 35.4030141,340.113625 35.4023505,340.105817 L35.4077632,340.210526 L35.4077632,343 Z" id="public" fill="#000000" sketch:type="MSShapeGroup"></path>
<path d="M3.4077632,363 L10.0044225,363 C10.555163,363 11,363.446386 11,363.99703 L11,370.00297 C11,370.546964 10.5542648,371 10.0044225,371 L0.995577499,371 C0.444836974,371 0,370.553614 0,370.00297 L0,363.99703 C0,363.453036 0.445735229,363 0.995577499,363 L2.01284519,363 L2.01284519,360.210526 L2.01825791,360.315236 C2.0146936,360.27948 2.01178717,360.243843 2.00869523,360.18969 C1.97400427,359.582096 2.03831406,358.880691 2.28882902,358.188943 C2.78218102,356.82665 3.85188624,356 5.49964745,356 C7.14735902,356 8.21716163,356.826578 8.71078808,358.188763 C8.96152537,358.880684 9.02595628,359.582243 8.99134902,360.189828 C8.98827381,360.243818 8.98538336,360.279341 8.98183602,360.315007 L8.98722504,360.210526 L8.98722504,361.894737 L7.59230703,361.894737 L7.59230703,360.210526 L7.59769605,360.106046 C7.59703245,360.113866 7.5984676,360.096228 7.59971799,360.074275 C7.62024752,359.713847 7.57930569,359.26805 7.43283884,358.863868 C7.1635634,358.12079 6.59851813,357.684211 5.49964729,357.684211 C4.40082578,357.68421 3.83597387,358.120718 3.56690879,358.863688 C3.42059132,359.267715 3.37972899,359.713387 3.4003105,360.073861 C3.40156956,360.095913 3.40301412,360.113625 3.40235047,360.105817 L3.4077632,360.210526 L3.4077632,363 Z" id="public" fill="#000000" sketch:type="MSShapeGroup"></path> <path d="M61.9409639,349 L61.9409639,346.9 C61.9409639,346.9 61.9409637,347 65.5,347 C69.0590363,347 70,351 70,351 C70,351 71.0012466,346.376064 69.5,343.5 C68.4923852,341.569628 66.7285772,341 65.5,341 C61.9409637,341 62.0409639,341 62.0409639,341 L61.9409639,339 L59.0409639,341 L55,344 L59.0409639,347 L61.9409639,349 Z" id="recipients" fill="#000000" sketch:type="MSShapeGroup" transform="translate(62.500000, 345.000000) rotate(-180.000000) translate(-62.500000, -345.000000) "></path>
<path d="M29.9409639,369 L29.9409639,366.9 C29.9409639,366.9 29.9409637,367 33.5,367 C37.0590363,367 38,371 38,371 C38,371 39.0012466,366.376064 37.5,363.5 C36.4923852,361.569628 34.7285772,361 33.5,361 C29.9409637,361 30.0409639,361 30.0409639,361 L29.9409639,359 L27.0409639,361 L23,364 L27.0409639,367 L29.9409639,369 Z" id="recipients" fill="#000000" sketch:type="MSShapeGroup" transform="translate(30.500000, 365.000000) rotate(-180.000000) translate(-30.500000, -365.000000) "></path>
</g> </g>
</svg> </svg>
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 89 KiB

After

Width:  |  Height:  |  Size: 88 KiB

4
app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
View file

@ -934,9 +934,9 @@ class ArticleView extends App.Controller
# runntime update # runntime update
if internal if internal
$(e.target).closest('.ticket-article-item').find('.text-bubble').addClass('internal') $(e.target).closest('.ticket-article-item').addClass('is-internal')
else else
$(e.target).closest('.ticket-article-item').find('.text-bubble').removeClass('internal') $(e.target).closest('.ticket-article-item').removeClass('is-internal')
show_toogle: (e) -> show_toogle: (e) ->
e.stopPropagation() e.stopPropagation()

8
app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco
View file

@ -1,5 +1,5 @@
<% for article in @articles: %> <% for article in @articles: %>
<div class="ticket-article-item bubble-grid <%= article.sender.name.toLowerCase() %> <%= article.type.name %>" data-id="<%= article.id %>" id="article-<%= article.id %>"> <div class="ticket-article-item bubble-grid <%= article.sender.name.toLowerCase() %> <%= article.type.name %><%= ' is-internal' if article.internal is true %>" data-id="<%= article.id %>" id="article-<%= article.id %>">
<div class="article-meta-clip top"> <div class="article-meta-clip top">
@ -35,7 +35,9 @@
<div class="article-content zIndex-1 horizontal<%= ' reverse' if article.sender.name isnt 'Agent' %>"> <div class="article-content zIndex-1 horizontal<%= ' reverse' if article.sender.name isnt 'Agent' %>">
<div class="avatar user-popover" data-placement="<% if article.sender.name isnt 'Agent': %>left<% else: %>right<% end %>" data-id="<%= article.created_by_id %>" style="background-image: url(<%= article.created_by.imageUrl %>)"></div> <div class="avatar user-popover" data-placement="<% if article.sender.name isnt 'Agent': %>left<% else: %>right<% end %>" data-id="<%= article.created_by_id %>" style="background-image: url(<%= article.created_by.imageUrl %>)"></div>
<div class="flex bubble-gap text-bubble <%= ' internal' if article.internal is true %>"><div class="bubble-arrow"></div><%- article.html %></div> <div class="flex bubble-gap internal-border">
<div class="text-bubble"><div class="bubble-arrow"></div><%- article.html %></div>
</div>
</div> </div>
<div class="article-meta-clip bottom"> <div class="article-meta-clip bottom">
@ -72,6 +74,6 @@
</div> </div>
</div> </div>
<small class="task-subline"><time class="humanTimeFromNow" data-time="<%- article.created_at %>">?</time></small> <small class="task-subline zIndex-1"><time class="humanTimeFromNow" data-time="<%- article.created_at %>">?</time></small>
</div> </div>
<% end %> <% end %>

70
app/assets/stylesheets/zzz.css.erb
View file

@ -1446,39 +1446,35 @@ ol.tabs li {
} }
.split.action.icon { .split.action.icon {
width: 24px; width: 18px;
height: 20px; height: 15px;
background-position: 0 -336px; background-position: 0 -336px;
} }
.reply.action.icon { .reply.action.icon {
width: 19px; width: 14px;
height: 20px; height: 15px;
background-position: -24px -336px; background-position: -18px -336px;
}
.internal.action.icon {
width: 16px;
height: 20px;
background-position: -44px -336px;
} }
.internal.action.icon,
.public.visibility.icon { .public.visibility.icon {
width: 11px; width: 11px;
height: 15px; height: 15px;
background-position: 0 -356px; background-position: -32px -336px;
} }
.public.action.icon,
.internal.visibility.icon { .internal.visibility.icon {
width: 11px; width: 11px;
height: 15px; height: 15px;
background-position: -11px -356px; background-position: -43px -336px;
} }
.recipients.icon { .recipients.icon {
width: 15px; width: 15px;
height: 12px; height: 12px;
background-position: -22px -359px; background-position: -54px -336px;
} }
@ -2609,12 +2605,12 @@ footer {
} }
.bubble-gap { .bubble-gap {
margin-left: 15px; margin-left: 15px !important;
} }
.customer.ticket-article-item .bubble-gap { .customer.ticket-article-item .bubble-gap {
margin-left: 0; margin-left: 0 !important;
margin-right: 15px; margin-right: 15px !important;
} }
.ticket-article-item { .ticket-article-item {
@ -2683,6 +2679,21 @@ footer {
color: #96969b; color: #96969b;
} }
.internal-border {
padding: 5px;
border-radius: 8px;
margin: -5px;
}
.is-internal .internal-border {
background: repeating-linear-gradient(45deg, hsl(18,79%,89%), hsl(18,79%,89%) 5px, hsl(210,17%,98%) 5px, hsl(210,17%,98%) 6px);
background-size: 8px 8px;
}
.is-internal .bubble-arrow {
display: none;
}
.text-bubble { .text-bubble {
padding: 10px 20px; padding: 10px 20px;
white-space: pre-wrap; white-space: pre-wrap;
@ -2707,16 +2718,6 @@ footer {
border-color: hsl(199,44%,85%); border-color: hsl(199,44%,85%);
} }
.ticket-article-item .text-bubble.internal {
background: #f2def2;
border-color: hsl(300,43%,90%);
box-shadow: none;
}
.customer.ticket-article-item.state--folde-out .text-bubble.internal {
border-color: hsl(300,43%,84%);
}
.bubble-arrow { .bubble-arrow {
position: absolute; position: absolute;
width: 7px; width: 7px;
@ -2740,7 +2741,7 @@ footer {
transform: rotate(-45deg); transform: rotate(-45deg);
} }
.ticket-article-item .text-bubble.internal .bubble-arrow:after { .ticket-article-item.is-internal .bubble-arrow:after {
background: #f2def2; background: #f2def2;
border: #eed3d7; border: #eed3d7;
} }
@ -2782,7 +2783,7 @@ footer {
.article-action .icon { .article-action .icon {
margin-right: 10px; margin-right: 10px;
vertical-align: bottom; vertical-align: top;
} }
.ticket-edit { .ticket-edit {
@ -2794,17 +2795,6 @@ footer {
background: white; background: white;
} }
.ticket-edit .internal-border {
padding: 5px;
border-radius: 8px;
margin: -5px;
}
.ticket-edit.is-internal .internal-border {
background: repeating-linear-gradient(45deg, hsl(18,79%,89%), hsl(18,79%,89%) 5px, transparent 5px, transparent 6px);
background-size: 8px 8px;
}
.ticket-edit .avatar { .ticket-edit .avatar {
margin-bottom: 3px; margin-bottom: 3px;
} }