diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -9,8 +9,8 @@ 'names' => array( 'conpherence.pkg.css' => '0b64e988', 'conpherence.pkg.js' => '6249a1cf', - 'core.pkg.css' => 'a729d20e', - 'core.pkg.js' => '1a77dddf', + 'core.pkg.css' => 'c30f462d', + 'core.pkg.js' => '9dc857ed', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => 'a4ba74b5', 'differential.pkg.js' => '634399e9', @@ -22,7 +22,7 @@ 'rsrc/css/aphront/aphront-bars.css' => '231ac33c', 'rsrc/css/aphront/dark-console.css' => 'f54bf286', 'rsrc/css/aphront/dialog-view.css' => 'ea3745f5', - 'rsrc/css/aphront/lightbox-attachment.css' => '7acac05d', + 'rsrc/css/aphront/lightbox-attachment.css' => '90a84e83', 'rsrc/css/aphront/list-filter-view.css' => '5d6f0526', 'rsrc/css/aphront/multi-column.css' => '84cc6640', 'rsrc/css/aphront/notification.css' => '3f6c89c9', @@ -323,12 +323,6 @@ 'rsrc/image/icon/fatcow/source/mobile.png' => 'f1321264', 'rsrc/image/icon/fatcow/source/tablet.png' => '49396799', 'rsrc/image/icon/fatcow/source/web.png' => '136ccb5d', - 'rsrc/image/icon/lightbox/close-2.png' => 'cc40e7c8', - 'rsrc/image/icon/lightbox/close-hover-2.png' => 'fb5d6d9e', - 'rsrc/image/icon/lightbox/left-arrow-2.png' => '8426133b', - 'rsrc/image/icon/lightbox/left-arrow-hover-2.png' => '701e5ee3', - 'rsrc/image/icon/lightbox/right-arrow-2.png' => '6d5519a0', - 'rsrc/image/icon/lightbox/right-arrow-hover-2.png' => '3a04aa21', 'rsrc/image/icon/subscribe.png' => 'd03ed5a5', 'rsrc/image/icon/tango/attachment.png' => 'ecc8022e', 'rsrc/image/icon/tango/edit.png' => '929a1363', @@ -510,7 +504,7 @@ 'rsrc/js/core/behavior-hovercard.js' => 'bcaccd64', 'rsrc/js/core/behavior-keyboard-pager.js' => 'a8da01f0', 'rsrc/js/core/behavior-keyboard-shortcuts.js' => '01fca1f0', - 'rsrc/js/core/behavior-lightbox-attachments.js' => 'f8ba29d7', + 'rsrc/js/core/behavior-lightbox-attachments.js' => '49349f64', 'rsrc/js/core/behavior-line-linker.js' => '1499a8cb', 'rsrc/js/core/behavior-more.js' => 'a80d0378', 'rsrc/js/core/behavior-object-selector.js' => 'e0ec7f2f', @@ -656,7 +650,7 @@ 'javelin-behavior-history-install' => '7ee2b591', 'javelin-behavior-icon-composer' => '8499b6ab', 'javelin-behavior-launch-icon-composer' => '48086888', - 'javelin-behavior-lightbox-attachments' => 'f8ba29d7', + 'javelin-behavior-lightbox-attachments' => '49349f64', 'javelin-behavior-line-chart' => 'e4232876', 'javelin-behavior-load-blame' => '42126667', 'javelin-behavior-maniphest-batch-editor' => '782ab6e7', @@ -772,7 +766,7 @@ 'javelin-workboard-column' => '21df4ff5', 'javelin-workboard-controller' => '55baf5ed', 'javelin-workflow' => '1e911d0f', - 'lightbox-attachment-css' => '7acac05d', + 'lightbox-attachment-css' => '90a84e83', 'maniphest-batch-editor' => 'b0f0b6d5', 'maniphest-report-css' => '9b9580b7', 'maniphest-task-edit-css' => 'fda62a9b', @@ -1257,6 +1251,15 @@ 'javelin-uri', 'phabricator-notification', ), + '49349f64' => array( + 'javelin-behavior', + 'javelin-stratcom', + 'javelin-dom', + 'javelin-mask', + 'javelin-util', + 'phuix-icon-view', + 'phabricator-busy', + ), '49ae8328' => array( 'javelin-behavior', 'javelin-dom', @@ -2188,14 +2191,6 @@ 'javelin-install', 'javelin-dom', ), - 'f8ba29d7' => array( - 'javelin-behavior', - 'javelin-stratcom', - 'javelin-dom', - 'javelin-mask', - 'javelin-util', - 'phabricator-busy', - ), 'fb20ac8d' => array( 'javelin-behavior', 'javelin-aphlict', diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php --- a/src/view/page/PhabricatorStandardPageView.php +++ b/src/view/page/PhabricatorStandardPageView.php @@ -281,7 +281,7 @@ ), phutil_tag( 'button', - array(), + array('class' => 'button grey'), pht('Download'))); Javelin::initBehavior( diff --git a/webroot/rsrc/css/aphront/lightbox-attachment.css b/webroot/rsrc/css/aphront/lightbox-attachment.css --- a/webroot/rsrc/css/aphront/lightbox-attachment.css +++ b/webroot/rsrc/css/aphront/lightbox-attachment.css @@ -17,9 +17,18 @@ } .lightbox-attachment img { - margin: 3% auto 0; - max-height: 90%; - max-width: 90%; + max-width: calc(100% - 44px); + max-height: calc(100% - 44px); + position: absolute; + top: 44px; + right: 0; + bottom: 0; + left: 0; + margin: auto; +} + +.jx-mask + .lightbox-attachment { + background: {$lightgreybackground}; } .lightbox-attachment .loading { @@ -29,78 +38,66 @@ .lightbox-attachment .attachment-name { width: 100%; - color: #F2F2F2; line-height: 30px; text-align: center; } .lightbox-attachment .lightbox-status { - background: #010101; - color: #F2F2F2; - line-height: 30px; + background: #fff; position: fixed; - bottom: 0px; - width: 100%; -} - -.lightbox-attachment .lightbox-status .lightbox-status-txt { - padding: 0px 0px 0px 20px; + top: 0; + left: 0; + right: 0; + height: 44px; + padding: 0 20px; + line-height: 44px; + border-bottom: 1px solid {$thinblueborder}; } .lightbox-attachment .lightbox-status .lightbox-download { - padding: 0px 20px 0px 0px; float: right; } .lightbox-attachment .lightbox-status .lightbox-download -.lightbox-download-form { - display: inline; -} -.lightbox-attachment .lightbox-status .lightbox-download -.lightbox-download-form button { - border: 0; - background: #010101; -} -.lightbox-attachment .lightbox-status .lightbox-download -.lightbox-download-form button:hover { - background: #333; + .lightbox-download-form { + display: inline; } .lightbox-attachment .lightbox-close { - top: 22px; - right: 20px; - position: fixed; - display: block; - height: 26px; - width: 26px; - background: url('/rsrc/image/icon/lightbox/close-2.png'); -} -.lightbox-attachment .lightbox-close:hover { - background: url('/rsrc/image/icon/lightbox/close-hover-2.png'); + float: right; + margin: 9px 0 0px 8px; } .lightbox-attachment .lightbox-left { top: 46%; - left: 20px; + left: 12px; position: fixed; display: block; - height: 38px; - width: 21px; - background: url('/rsrc/image/icon/lightbox/left-arrow-2.png'); + height: 40px; + width: 40px; +} + +.lightbox-attachment .lightbox-left .phui-icon-view { + font-size: 40px; } -.lightbox-attachment .lightbox-left:hover { - background: url('/rsrc/image/icon/lightbox/left-arrow-hover-2.png'); + +.lightbox-attachment .lightbox-left:hover .phui-icon-view { + color: {$sky}; } -.lightbox-attachment .lightbox-right { +.lightbox-attachment .lightbox-right .phui-icon-view { top: 46%; - right: 20px; + right: 12px; position: fixed; display: block; height: 38px; width: 21px; - background: url('/rsrc/image/icon/lightbox/right-arrow-2.png'); } -.lightbox-attachment .lightbox-right:hover { - background: url('/rsrc/image/icon/lightbox/right-arrow-hover-2.png'); + +.lightbox-attachment .lightbox-right .phui-icon-view { + font-size: 40px; +} + +.lightbox-attachment .lightbox-right:hover .phui-icon-view { + color: {$sky}; } diff --git a/webroot/rsrc/image/icon/lightbox/close-2.png b/webroot/rsrc/image/icon/lightbox/close-2.png deleted file mode 100644 index de2a3b8608af518f4a0d0843aaa2a9566aae568a..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@HY5gN(z}Nwo2iqz6QPp&Z!xh9#uuD!Bu`C$yM3OmMKd1b_zBXRzL%CQ%e#R zDspr3imfVamB8j&0ofp7eI*63l9Fs&C5WRUd;=7m^NUgyO!bU)lMM_F70k@^3{6bU z%nWrDj0_Bo^bLT>OxMuF%GAut$Xo#mlz_GsrKDK}xwt{?0`hE?GD=Dctn~HE%ggo3 zjrH=2()A53EiFN27#ZmTRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<;L6O-~wOKg>t zU|z^A@b!fooL3ADC}5E3S0onb8|oS8=jQ6eR2P>7rKaImT^v$bkg6Y)TAW{6lnjiI zG-V{K@M{Gr1iHq`zbF$JDTz5Q`N^fZsd*)yF1AWQ8NHOu6e|Nm3t%Xkn;4iI8JJlZ z0(ln3u0}?N1{SU+&PJ}LFf*{}b+vFaa5i;yG&FE=HZ*iKa&)pZvox?Yba66wF*Y`b z>-EelE=kNwPKD{sMCi4|tJli8C^fMpzbGU>KL?fq0y6ST@{2R_3lyA#%@j0z6O%LZ zKmwYe2!gsbwJ5VJHN~wcKUV=9!d97BTmbYg0iQ$krjQeA`as9%qa_!Z5HJmbnDE38 zRmS30q>p~11 z53%J47%^@M(%u^1<6z#vo4~xuv34SVr2jsd%%xGAgk*KU7KUqBv zR7-Ugy=LB|V10&lei?t%2XjqpULBTQT9>9qNdKH7eW~Y*w2AU8vmE2D+GFmn3EsRK z?H+D+UvC~4Z=8FxtmQOsopbKHDk(~BVru+HM|QnI2$syU2=E1 zxX$_MG4I7^=3P-1b)95c6Lav8q+byK3`Wmdze5k|Q^H)9Dys*d(_mkE++ALav;W~d z6=S~S1Act+!WR}yUCbMKx>GrQ;$e4v{TyCtzC}}_89b*lW#&E+x#_rDZ{ZB(8aZp(t0nSqyEWGfzO?8;aEb$79{`LgQUo~ys^%zTyfJ#XPv^Cq|D z2C*EMvhGT=-}lPY-&*uI`FM3wiq-Du{I<21eBMu-cHHgxYo56hm%n>8PW&-1T0Cz> u>-(Lm8GC=;`Ly>n8{3(GzZ(7sCNP};zCC#D;?=64g4NU2&t;ucLK6U1bqVSK diff --git a/webroot/rsrc/image/icon/lightbox/close-hover-2.png b/webroot/rsrc/image/icon/lightbox/close-hover-2.png deleted file mode 100644 index f4ce42479c9709fefa4d3163cbb88c726f6c71b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@HY5gN(z}Nwo2iqz6QPp&Z!xh9#uuD!Bu`C$yM3OmMKd1b_zBXRzL%CQ%e#R zDspr3imfVamB8j&0ofp7eI*63l9Fs&C5WRUd;=7m^NUgyO!bU)lMM_F70k@^3{6bU z%nWrDj0_Bo^bLT>OxMuF%GAut$Xo#mlz_GsrKDK}xwt{?0`hE?GD=Dctn~HE%ggo3 zjrH=2()A53EiFN27#ZmTRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<;L6O-~wOKg>t zU|z^A@b!fooL3ADC}5E3S0onb8|oS8=jQ6eR2P>7rKaImT^v$bkg6Y)TAW{6lnjiI zG-V{K@M{Gr1iHq`zbF$JDTz5Q`N^fZsd*)yF1AWQ8NHOu6e|Nm3t%Xkn;4iI8JJlZ z0(ln3u0}?N1{SU+&PJ}LFf*{}b+vFaa5i;yH8gN>HZ*iKa&)pZvox?Yba66wF*Y`b z>-EelE=kNwPKD{sMCf(FtJli8C^fMpzbGU>KL?fq0y6ST@{2R_3lyA#%@j0z6O%LZ zKmwYe2!gsbwJ5VJHN~wcKUV=9!d97BTmbYg0iQ$krjQeA`as9%qa_!Z5HJmbnDE38 z_-`eX0&)Fa7}1xd9+}% z0s9@110n|Ou{*fSRhKNhE&KHDUi;ih*H!*{t=;OWAhJOrS^0zP6I*W1kON{C5%z3b z0)uq!yY!vgzsU8z!a|`NxBp*E?g_m!<;w~dyGHS4;`~dxr6+xR$GnFrKBm7&Z8GPL zH(v}LXLp{|dG2-HNGY|UBl=V4%bQ*voJyZp^}KcwOP@2fIO&w=qMIi3in82Ys!v@h zh}89CwiG|TBe86%ni6-<+(KwXM9ZrY=iv&4~opUkjLBOg`Q`a)v2yrS%5k zXVzN;C#n_(v~Xl5=$^Trp`6&WOL9@}`xWeFw?swW2HF0ZY4P--^%qV1uf;_t%C&pH dHvZu{y)-6){T@F+NdAjWb+B~ge*&lW$>vB6t0$I&&!CtYk((hqk}l z0xjK%l+vA1f-2QePu4jC4xj@hla7AcumvYXEyNY@-gPq+xd1_#5Ve?8T52Yv&;n$D z_InkU<4B&Txtajab9+c1%lQ}Ge8(7*Ipf*}iCl@X)XoYi$7S3gn zs}{~hEXZYWGR!|uop)jVxZ7pnVq;nQz`%O9u&{rfnCirz;ze8xr<|DwFP~RTkX1#^ z`*vNbyn1L;O=Bq# z&tZi5aSCkNakIoJqNwYWHKOc`J K#CwrbJ--3m5_F#c diff --git a/webroot/rsrc/image/icon/lightbox/left-arrow-hover-2.png b/webroot/rsrc/image/icon/lightbox/left-arrow-hover-2.png deleted file mode 100644 index 73bb7927a6941862fd7e0b244db59bd0344b6d2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@pSEcmR_E5Vu4w1%3Y$L2vgCHnw&cd-&Sn+e z+&~fW#h(|^hrv`-)FJ+$6Lb#_d{e|JA~+uvWcnb~Kk#O*Q$!|sNpkNw_xsK{_uO-G zq_JU3N%5*;m&;WWuNRYeUXI_21#bM^`1$cEJgr307SsgOC@Y!3Rja@@K*Tkv9VCII z^z3;As$H(R88y{{S`ym?8EPKM!FX)Va5m=oBatU zVMIVit^V28;my8>Q2YMLabAgD7;{tT)m z(MUv~2?)Q(OUVq&5wkdW-4hRDaNLKVJS>z z5HbXs&StZotk(n0cA5=^LXHiNqcDQ9dUPb&ly0pnSP+3Fo2r3Ss1uGXwZU!_CdtAP zG$WCiF|1qDiNYzPZONcn4?}AjT|iqX3DUEptyGTz=p?XUw<+WMNU!_N)$CLUh@%m< zn<~B(sY`@%w+3_+7sDjp@hGYyFl-QKG2mkY9K#1$ECszGzmE@iy<9XBt1H;}8#fw^ zF%f^1XBjcVvQe(KF2skJ5G&RNM6WmCFL2|!g(O`D1+Myw>z|b?L`)zdXr>_SDpWvY z1|n!>pg}~Mcw$3Bl2zSNR5}+l9V;-^y+DbXP$Q-?EU15p;NK_z$yNR*Ycvjq{-az9 zDqMrka;EsPFw;Ij$30`>=6LA)QiB`oXjzafrKhvv+B!k-t9t@pdp>akOKEx;DN#_X>*r9oNpk&o_;HA1yn1e4q8< zyKrT+&F3x~+}g^YE=mtxY~@bRtr)yBLGCJwJxLm6&-!|IQ2BvfeRDeIA9zw}SD)Q^ zV)yPPUvqB*Zl#=t57GbwBd0{@%P5uGe3`Oq@wm=bRr$JlY^$t!wT70f<11 ASO5S3 diff --git a/webroot/rsrc/image/icon/lightbox/right-arrow-2.png b/webroot/rsrc/image/icon/lightbox/right-arrow-2.png deleted file mode 100644 index bfe7d2102704ec3c5a925e1123af877fcccb0544..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@|6H_V+Po~;1FfglRhD4M^`1)8S=jZArg4F0$n0l*8Y-BX=^2`s znwc5uC>R+S8tEGVk(sWciIu6Dm65pu6et00D@sYT3UYCS+6Cmyn>bnwy$e0@Is<(CdU#FDNlUbf*?&mZhe+73JqDfIV%MiN!4@&Q1nK&TekF-2%~@ zg2gRhy)Fg@IQ8lS9ixvH)i5Do`T;TF2^YwLC;iksV0teCChU6luNA;d@x;@`F{I+w znduKX4=V_?_LeA^3zTqgFXS>W;I7}%n7pHPt)`et=AwJrUmQ+k{wVT1SN?q26s;gH zvE&rRmR`j(QPD-`ey`xKkX+0cr=0U_Z+g^gr@k$dvRibcT#n4=R@qS;@Zc~DQ;n4; zYklm327U4HgWJv5G_=R1i`o47n0_F5r4iRWzc+#(E}89N*6%(hI%CP~b320#mY+!T zTKRdlT=6$%Wye;5x%oYn*LUv!8TesJle&G)>_e=qdbI@;+olUwJZzqxQDMxOU;Thr vYR^;`=JKcO|Ne92@BEhW*7B3WN09^uvuRtVw>2FN1(gDxu6{1-oD!MceHG*T8i2SG1UWmbu&W0xqgGDbS*-61v6~M zio=qg8nj`4utQb{`_!;TZ`?q&R7GOIfLNibM%i@4YJ{G$E0VRVW@u^(g8L%$&!D<9 zSt^cfNCo}8Ph|n11i=piK|uiPDUJmk!;(kvfq)nkL@q>451M$hwW64llGDD36roEP zTOz|$Diwc)_anQP0pW1iwZU;dg77&5CRVCG(^*loAVEj9bqnjrq+D6)LH#&F)3qZQ zRwgrJ*mR~7MN-C86^j9WmN5*bhIVic7H3C0@_+@I9CT2>t&;mFuK3N>>{J&>q7gf7 zom`4imXO+SKoh5>2u*hUny!f~XeL<<1=tYB3eA8>&3rf*5JEi9CF03g&BoujQ4mY; z65s(V#Q{ig(O6grvtb~`LK4r1f;Dd1bg*Kou*TJYak*K!V%&xbMz)MlxmE$$62izS zA&ZLV1!_%3QFYT*taUGFI#y`wJD`@dkwHymSk(U#!M{)bldJtt))*2D^GCVVRHO#o zAo}2TpHtyrk=xoFOtzNZ0d#iAM=xEcy{LsQZZ#RwfvC+C0OWKcC zQo+$zldJC(Mn)PgdygEyGz>=1ms58OR~9tx^ycN;r%%B`aCCTN?)SH2ZEJQG?%ynE z<##8BcYAlyarp8@_ET$D?De(iqRnz=PVW3FKOC2t?3r!vH%}ZMAMB5PIB@9omcWx` zi)8dMJFz?YVSJ^pX`=n)#|_DW)bhfqMB7|y(sTCl=SyQ>#%TBdkxq0-7h;8>9}ygk A8vp