From bdbc4e152e1523049d92a39a3aee4c1ab6e98ae8 Mon Sep 17 00:00:00 2001
From: Sam Foster <sfoster@mozilla.com>
Date: Mon, 2 Oct 2017 11:01:21 -0700
Subject: [PATCH] Bug 1400831 - Use a shorter tab-drop-indicator image to fit
 both default and compact themes, and move its box-align to CSS. r=dao

* Fix shadow overlap and re-optimize w. pngcrush and optipng w. -strip all to remove metadata

MozReview-Commit-ID: GJJfYMUz34q

--HG--
extra : rebase_source : 9b3869b24f163c98885cfe664002d1d23381b293
---
 browser/base/content/tabbrowser.css           |   4 ++++
 browser/base/content/tabbrowser.xml           |   2 +-
 browser/themes/osx/browser.css                |   4 ++++
 .../osx/tabbrowser/tabDragIndicator.png       | Bin 599 -> 416 bytes
 .../osx/tabbrowser/tabDragIndicator@2x.png    | Bin 1124 -> 1183 bytes
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/tabbrowser.css b/browser/base/content/tabbrowser.css
index 3086c1a41bac..3dccaed21181 100644
--- a/browser/base/content/tabbrowser.css
+++ b/browser/base/content/tabbrowser.css
@@ -63,6 +63,10 @@ tabpanels {
   background-color: transparent;
 }
 
+.tab-drop-indicator-box {
+  -moz-box-align: end;
+}
+
 .tab-drop-indicator {
   position: relative;
   z-index: 2;
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 578bb62a4ac7..5f5af3c2fe01 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -6334,7 +6334,7 @@
     </resources>
 
     <content>
-      <xul:hbox align="end">
+      <xul:hbox class="tab-drop-indicator-box">
         <xul:image class="tab-drop-indicator" anonid="tab-drop-indicator" collapsed="true"/>
       </xul:hbox>
       <xul:arrowscrollbox anonid="arrowscrollbox" orient="horizontal" flex="1"
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 6a634b2a04bc..aae17dff537a 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -827,6 +827,10 @@ html|span.ac-emphasize-text-url {
  * Tab Drag and Drop
  */
 
+.tab-drop-indicator-box {
+  -moz-box-align: center;
+}
+
 .tab-drop-indicator {
   list-style-image: url(chrome://browser/skin/tabbrowser/tabDragIndicator.png);
   margin-top: -2px;
diff --git a/browser/themes/osx/tabbrowser/tabDragIndicator.png b/browser/themes/osx/tabbrowser/tabDragIndicator.png
index a373cae538b323666b9a0a363077c00f73c1a0f6..e53d6bcf0af6d843f5aeb9049d238319e9cc8f01 100644
GIT binary patch
delta 403
zcmV;E0c`%)1fT<u7k?cH1^@s6p8t*60004JNkl<ZILqynJxjw-6o!Ko2UklsONZ{d
zIaut^a1ccb)wxg*6hVu05l08Xq7cx{SzSU0MF%ILLo{@VgI}RTV@Q)|%p>>KQets%
z?12{!?>W!SIr&nQpBT|~ecHC|9pCp)5jh?;r7seuX%?TX;D4%m<UALvwu{K|sL|6s
zxn8f&8jr#CQpNV>*4tsP@b1mvM$@#MywaFuS+(s$=Y@vVz4zAL!^bTm$E(zw*C-C?
z1xR%|owLO)+o$-}`n(LoP($Q+3!CkL9(n;LT-QC905eN~TmqiwUC{dtG@H#6E=zG^
z-?2Cuk;{<`!+$uIK&o6WudvvlrAwvKvK)y;rc_nkWdylABFCc^^-Rj8xmC$XGlfE7
zjoBqYjz=xhc<%#D2q@PN;E7tI|7k;KV}NYjt05y317wr|F$9LdzXE)k=r2IJ(P*gh
xCqRxj2;f7>N17MP3-8w$6%A>jr0}}&1(6{0qGMyJPYeJ6002ovPDHLkV1gy-z0?2z

delta 587
zcmV-R0<`_01J?wQ7k?oL1^@s6?MF%v0000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+
zQe|Oed2z{QJOBUz`AI}URCwBAWIzC>TeohRN=ZqDu(Pu(g9Lv5{CW4;vuA76)YMJ`
zx&J_7j8Mfaj~_oyWaW}doVWR>^8IK3_(6h-QcNF{eA(~*{(tstzO1b5e4x-DkOroM
z2M^lFC|h?m&--EY{pWvHBwHCc*%^OVCvu#Ba_4Zdqod<77N8i1j*d?J^i98%K#GB;
zeu#EwzXwvhbmvbcplt%ncl}bz^wUWI3Y}vD5<Ea4ee2ObL6D;2D9&p-%FLfY7{msN
z-G2O6kdKc~27ja$q=Eha|Nk(*F#P?8oz2L|2v!Rs7@j|W{!T@P=>v#8b<I!pHy{49
zfiQ>-5>u6Beh&<kHy}1M$PcWntegqa?h3~*{}p@r?jO&#W4~oV`0dC4oFGqUg|J_r
zI<a;Ai4!NTf;9X;cI?;>Gb2^O^k^gIr?3BUyn6Sa8-HY)t_t((vRIBQhjuSNR#sNF
z4Jh;i9AQ8#0>suyNl8^e|LhO1{`?<=L2Qs1NDhdFp=u!!2i0VQt^p(lm1BV^1c5(5
z{0?R%8h8Pf`^SK61<<sAP>tx|4^)l;MFX*5RKuu-VXT1#o1mH;^E-kXfCUwZ`gi^M
z^(RefnnYkR5E~>0m196Iy<q^9*|mXK2FeF%xC+E?aA{xzVm=_|g7Uus@h2eu1ycYJ
ZU;vVP)d%Bn|FQr8002ovPDHLkV1lDM4Y~jT

diff --git a/browser/themes/osx/tabbrowser/tabDragIndicator@2x.png b/browser/themes/osx/tabbrowser/tabDragIndicator@2x.png
index b51b873cbd928ba222d9244eaf5c06562d699427..4d17c445483c5be9f2cd4f0f3ddf415895a47041 100644
GIT binary patch
delta 1176
zcmV;J1ZVr?2%ia%7k@ek1^@s6suP*T000DLNkl<ZSi{v=-%nF#7;a^Q_MFqx3N2V+
zPB9@%wk#$iS=J){1xwi2cCmY7mTZZMWXs%)sAb}yRCJ5CKp`5YW=_44Eb~W9FezRt
zh21V$_+^WQ0+xJxpL5RFp0BpZap$IQ@+7C<`@YZf{XXZd!+%lUoP;VuO&}0Zd}OMs
z)_T3(on&6L!Dqxc9Tv<W-Yt1N9>2@y+p8$byOQMnz^$qu0(eH7%jJ6;F^Ju+5CW>v
zOPAN%+}zUAHa2#-H<?U6%w#fio12?2$g=5l`X98#<MCd^AQm~u-AV+G8tPd<mgV<{
zhK3@`%gg_=SAQ5{hKGlHkb_)f+MFeOP6747;9ISelan_%L2{9?lMfhcA7gCqB^`&x
z^fvgoAqTnOC^eEQ3=zHH<QqB0j^AUf@mI!zzmx`i-~Po|_C-Mi9L982nR>rlqQ?Cr
zqoZdz`4>0J6Bpz2-}M|AIKX8ryf%s|?1X(SEeA6zD}UOczrRa~7p>v=U0q;hWpxo;
z`tH(4QG=~`<;r*z0n;SWNWI#1v4BvVvD<&sg0AbpGuq5C$eA|QWPJQ;6r9?E<G^4~
z&(6+1g7d_EF)=*KSbFW{-Gesx%(2LYfr~ib(+(p}C=L#7H%-5-C<(nSXYiS0k!x(-
zMdEA)w|@i2AEz^y%V~R|iFQWAg#s`o<t(!y#v&I+Tsd%p+kq{GA8TuC>;G4v`BDi1
zK1FkLb4zfB<6_dSEv5)Qb8NdYMN3Od>HHM&MNTB9rs4dN4p;qP0pStGQY97{ZSa|6
zf4Han5{X1IzsP)>#$vH?IG--izP=zPhDP+>K7U`=f#*;WIdYH-8;Hez%WqSD(1O9H
z!>Lqi838!{fkA6PjyAGX>UmSsp2OyY<}~j9P$bfG6+!EC>^rYh;`#02(`$MT3>?H2
zHeVHd6m^oK9Qots%|~41JL*-#V0mKry8bL&cE|+>xXhPb{<_9ZSnKy6o0yoG;){uS
z#eY5HKQ97pPZkP`e&^1_W8{LP+>1wh;kZ4XHn*aF)7^dg+Wh?dGfv=-iQtBqQ>RW}
zM-Fn!y>N;}LX_}zef_R}PE;2Y!3{Bpb!+p!HM#K8r=cE@WzVs^z<>yD6w`%R%U>7R
zW`u*BsCGaEH^dlQ(wZ3p;cW<nZ4uZR6@O8A0=|9`whMUsMc6OUC&G3CwNFIl33z@M
zQF#K&IT4j7Aoq%>JOQa!gzW<Evmz=_!1a@e$`h#R5m9*p)jcBY7l??kUEs}#2>S)j
zh_GGYjWZ%_7jSlqutT7ZzL-CHl>lOlg2S2_<!x&=o7F1iAbkrtx^?i6daA8A@_*&3
zRYM6%J$r}B+ZpX|gBhK;F{(f7<?7T7VtBb~)v6^)3Vzbr*|)m7`ckEgHuw-@luVXw
z2YN>3=f@o#9nnPMaT0$w0C+|ld`9ngI9}6G=`_f)`XyD5U%6%VD1c|Q!B<>OzSc<a
qr-n;W+TDus8GvW)kB)8h{6GJd^%3(9Rl;Kc0000<MNUMnLSTa92}x-H

delta 1116
zcmV-i1f%<(3FHWn7k@$s1^@s6O=1>l000ClNkl<Zc-rll+fQ6o7{yygLFr%_m_m`N
zq!(jSLrhB2l%e<+7%N^Ld~b}2CMIn(R*gUhi*hSf(^t8fl-kBx`%+`P#RQVlN9_o&
zCI$p41%`nk+w}|G!#)h7!`SmMiC^*~oBgeCt;0EI&V;jVM}M#+6Wc{V6p5fH6=fnM
zcCtqg4cbgT|72V&!lFhT6o<rNV10M*F*Im11#M<tC_-ZI{sWIU3=MtW9*f0(o}Zte
zTwPsVQN?FxXMbmJU~sS<4O(WH-59dbyh!X4wV(C%Md#+`{xJViX!`p5+n8Y%4>x4v
zkylhbTwOOZGJkT#8pNiJdH*M48i$OjIlso!TC+#b7BkG^VgC|0ARt1b)|xLTjXCv$
zG1Z?MQ}xN_(0lVcW8y38A$Z`0rwt&fSnSg|J!8#Zx`Ih|y!hqX421_?c;ao3KD=-L
zfur*a3)6_+{$7J0Z;ex$p%xYvr}4rQZvu)$&4mlYU4IB}DWY0OwOd1$`T=9EP3VFq
zfHiww4KvJA!^0Q5@Wh*dpg1@_K0ZqGy&t`UkwIf_FPXGrkDjY#mYSHD7?tOfcoR@6
z4(WCy-!yoKINFRw&($(Z;U&*Hya^~1hm*<V3e7#bGb+!e;FM&n`DL$`St_Z*6K?`S
z{IayPlz;fI0ejD<2c%BX<mBWG&B%av=<AH9h@My5c=r^|%*@=jrzmxiZ`>HWMe|*K
zxGH+riS!#Yn|6`eqvzGWqghH`F?*3yw`q4z&oIqj|I~eb&O2ByBaZe?0$8)>)iA>>
zC9jL_Z5j|^Jx7k~DLIFLkN>XTt-%Z>k2`xFd4Ke{{h+yziu!1@?F&SSq%qH5*5KLf
zXu7mEL*XH>i2JC3fG95xmb~)S)vKd6<SiXlWp8F<dMCeKf7mgL2VQulJ+9TP4V8ya
zT)+O!7z6g2@SF*s^}^mS>e<rFO=j^(dt5sqMG`cK*PEMLE=^5M{bdcpJzi{~X=!P_
z%zq5C8NP7RLh8k96&018)~LM4i!C&0MZ}tC`=$SsIFSnI_F_w#lW4R3(sv1qqt>Xb
z+lwtUXzkoq10q=jMD9sIsLLfE14=txd<fXt>EKI1hl>vZ4|O=?WkAVCF8LS`{Lm#I
z19r5#<YPc_yMrGA51w(!$AAYuaLLDjqJK7*d<-aTbMPe~>f%Gd{ZR*B0#3X55OCjV
zhx`m^b@3q}(CUzv0R=5C{|9Umu)W2>mw;xMdlOJDj${#V1Z^$>rJ^n#k0&sy>NIAX
zjA6Idl-@Bdqd}WXKu|oPS2Mq1c1=GquI^e}Q}ocF%_X2vR6W<!)Umj@nD)kqJym*W
z(B=|QAcFc2{+VZw9qSq!yBXuP8?a`N9vZZ{1VBJk%IIbBs(1rfvqujN+FS#mKxSp4
iQM>@G*>jFOBYy*S4<=5a#&uf&0000<MNUMnLSTa5w-o>Y