From 40d87060493c4119737ddfe838beafde5d7c5cad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= Date: Sun, 10 Mar 2024 18:11:33 +0100 Subject: [PATCH] WIP: Integrate archlinux-common-style This depends on the following currently open merge requests: - https://gitlab.archlinux.org/archlinux/archlinux-common-style/-/merge_requests/9 - https://gitlab.archlinux.org/archlinux/archlinux-common-style/-/merge_requests/10 When they are merged, the URL of the `archlinux_common_style` git submodule must be updated to upstream. --- .gitmodules | 3 + archlinux_common_style | 1 + settings.py | 17 +- sitestatic/archnavbar/archlogo.png | Bin 5359 -> 0 bytes sitestatic/archnavbar/archlogo.svg | 194 ------------------ sitestatic/archnavbar/archnavbar.css | 25 --- sitestatic/archweb.css | 36 +--- sitestatic/favicon.png | Bin 7924 -> 0 bytes sitestatic/logos/apple-touch-icon-114x114.png | Bin 2088 -> 0 bytes sitestatic/logos/apple-touch-icon-144x144.png | Bin 3063 -> 0 bytes sitestatic/logos/apple-touch-icon-57x57.png | Bin 1173 -> 0 bytes sitestatic/logos/apple-touch-icon-72x72.png | Bin 1437 -> 0 bytes sitestatic/logos/icon-transparent-64x64.png | Bin 1430 -> 0 bytes templates/base.html | 31 +-- templates/packages/flaghelp.html | 4 +- templates/packages/opensearch.xml | 5 +- 16 files changed, 36 insertions(+), 280 deletions(-) create mode 100644 .gitmodules create mode 160000 archlinux_common_style delete mode 100644 sitestatic/archnavbar/archlogo.png delete mode 100644 sitestatic/archnavbar/archlogo.svg delete mode 100644 sitestatic/archnavbar/archnavbar.css delete mode 100644 sitestatic/favicon.png delete mode 100644 sitestatic/logos/apple-touch-icon-114x114.png delete mode 100644 sitestatic/logos/apple-touch-icon-144x144.png delete mode 100644 sitestatic/logos/apple-touch-icon-57x57.png delete mode 100644 sitestatic/logos/apple-touch-icon-72x72.png delete mode 100644 sitestatic/logos/icon-transparent-64x64.png diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..6f798938 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "archlinux_common_style"] + path = archlinux_common_style + url = https://gitlab.archlinux.org/lahwaacz/archlinux-common-style.git diff --git a/archlinux_common_style b/archlinux_common_style new file mode 160000 index 00000000..08cfecfd --- /dev/null +++ b/archlinux_common_style @@ -0,0 +1 @@ +Subproject commit 08cfecfd80add760dd3ec10dbba8b43562f19e4d diff --git a/settings.py b/settings.py index 9955758d..9cf9594a 100644 --- a/settings.py +++ b/settings.py @@ -70,9 +70,9 @@ STATIC_ROOT = path.join(DEPLOY_PATH, 'collected_static') # Look for more static files in these locations -STATICFILES_DIRS = ( +STATICFILES_DIRS = [ path.join(DEPLOY_PATH, 'sitestatic'), -) +] # Static files backend that allows us to use far future Expires headers STATICFILES_STORAGE = 'main.storage.MinifiedStaticFilesStorage' @@ -125,6 +125,8 @@ 'django_countries', 'django_extensions', + 'archlinux_common_style.django', + 'main', 'mirrors', 'news', @@ -244,7 +246,6 @@ 'DIRS': [ path.join(DEPLOY_PATH, 'templates') ], - 'APP_DIRS': True, 'OPTIONS': { 'debug': DEBUG, 'context_processors': [ @@ -255,6 +256,16 @@ 'csp.context_processors.nonce', 'main.context_processors.mastodon_link', ], + "loaders": [ + ( + "django.template.loaders.cached.Loader", + [ + "django.template.loaders.filesystem.Loader", + "django.template.loaders.app_directories.Loader", + "archlinux_common_style.django.template_loader.Loader", + ], + ), + ], } } ] diff --git a/sitestatic/archnavbar/archlogo.png b/sitestatic/archnavbar/archlogo.png deleted file mode 100644 index 3d2cd40fb499b2b37651ea67ec6f3b4400e3d157..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5359 zcmZ{IS2!Hp_w|^fM(@4%HcCVgz4tPMgkaQ&HhM3EFiH?fM506sq7yX?BLq=`i12C| zL~o;a{(hI=#rK@O&w9?>10<3$laUEN!Q#6008Pn zbXOpBG|m5lHpl75-vVhpC(a!4x$h*`V2lakNUt?{-fw^e?ODm zN2l+hb*}S!PafO;yvB^)?EDQ@iLzn>_b!b9fT^^f*w@{?%2`uO4TKQ2Smxg5ikKW2 zQ*A?S8C;#@KdJ0k753J9XG*F&MOl%LT4?kK&;(>rVhi9U1?;<+SJ-zbGm)>gYnJLH z%w}?U0WeGe;1*6<3W^4axh(3Rm06q~vz;20p9m)iop2}sG)ey@z5ZEzGBay7^^(hv zOFvOQpz-HtC(no`dwszCljyn5{FA6S0{1JalqoLl^-)5KLk=qdBTC!pRYl~Zu4~eY z`jm=y&G7{n7Ek2g)hM=KE?#h6uBwFA4#F~l!gQh1QhEZ zVRX6TH*Dt7a2hD-{!i`M-_>j)z6g%ca~xCE?`N$AK|HXr$u$Q&P^B$#;&T%7mJM zuo8+h+l1P5KqsF_FkI5xbvE#m)@W=uI^t;J3`eFie;MX?$(u}bW!*u-&#nH?kt^%d zx|YaA-ExCV9U&V&;SIrCEb(@465tV50>|q>SR zoU@zOxr=q~2E8QP8G}nzeV$%*DuQQq|Tc`gx!LmYDeG= zxKY+=D~=fjPC4|=pTYudRG(20hFb0uLqD#-tI}K=Ka;(+@i-pI>=l)p6i$ z&9-~lq-@(Seb}1YT!Fy^x8xB-=ujz?L)W!@=ax`=LLfUDA2ZdD#!`(EzFdkzMFYWBytXn;~HGS8jwD~p^JH9 z(yY!Xaf-vSL#cK0=xru5#$e>dlTyIaB33aiIEI-;90sCX`viJ zA0i;5`@2n-HiiSnJS{XdI4WF@Dm#>@7=~DhfH|<5T9m?3X2M$XEY_)Boxvz8R1=d+ zB`^*2^JpfC?3HnEWQFUvg3{}9;A~0gk4%RM(^LTtAnciRWj)K8EL1z=nCL`vFJ0_8 z!lUO+=S6*pjK~uS5pwKHtY(>*-;1v^W&;MohRce{DXIOkviW#BfZjD`@$7ik~xbg$=6paDPdGZM^={xaJ@@q2g3F_z3%7tZk`C zur_-ZmzZiRoB!k5KDqsu&zw`4dhk;}>?d+hUXaSqbmfQjyn1xNf=oQU%Ay=+y!NUKi@<_oc32aa9U%msvJaVpldpOC0k^?27Mr#?k`zim@2j!tQM8L z>5NktPROk;Vy)csIG|uk19*2kOGxmT0O-PQd40OA%-8}209F~HZf=Td#(;;6XTF|h zGG5=G!a^xRAc~u#SS3Xwrx^tTPhb|}T=HW#cvOeJbg_ZtCNaD3TxyjDGOH`2F&N~i zK7%H?&d0K(b}N}2LKXZU=#8)o@P$KnIRtT-efg^}&%OhchdWNi^uZJJ5~ zsROEr60OfOob6dz%ll^ zw`BJj(gPB=SuLcx+ZjhamX2)_&8oO;QyKpP14>$%p2EHQWqkkVu`xg(V}oVi}Ri1z*S+I zg&vwS4$uun2<^C{X&aMF^DN3nO)lxHR>1oQ{Z?T`8iK%gj1M1j_B(}M{>u?&qPqCf z@uD>bS$InQJq`cN+P@oOa_&vEnx|U=u1hPu{XyV*CC>MBy&6G%>l26W*t=CBlXDDG z6=*#pihOP#lTE22?q`sZa3sigQ^t;7EsE0h^Jrtf7+{UX`CfGHD~LprH&0G2mS><_ zyZVj0jd5Wx@9sBtbgeo`9e}YJXj8`SWrhXbgC%E!X(`q$mp5gTKS>%Vl39a^@Fnh> zrQ}ro+g6k_&$ppZg>ZU`g8U#2p%uT|JE^pGL@X@KOl6nXY1 zV10N_gQU6nR({-gHmuQc?o@7=>Vm(tjfji_s`T&NmFf5I7ZHuF&zOH)4_MS*J1a5m zj^ydAYi5p=oW5!qyL@3mnsD;>k10{nJhlr|3H{Ut`O+P9Pj*qF5;xUngQOxl>`5OT z&)Tz_Gd^M50N7Kn(8`Ba!k$|~2>J){l{t}mhqLb8Xs!=Mz(vm42#U*y-ogL-AGoQQ8XB4ez$vAk@nHI82! z8d9IJr16mXG{~R@PZ>x}nY`_B1tCNdc4powbO1}zff z9u12=;9MC{dh4p~e6-0|uF6$`Pj{xAt0Jr+{39w6dq}am5a(PV>Um-HRfEPPS(G*8 z$>LlpE%mSB?%8W)=@7LK^+u-e%_XBp-gtU|1On9feMMGxLNVz3l0l#Z3wFJUrNZNq z=)&0bq%9%iA`=U@3afIyi?UKitiEN7$7@|MhLB9j`y0^mougfz51B1v%7Z-$^ZfI} zwQvKT$?R|7l%b=L+n|c)ZRmSslV|r|ir*yXkw!=j;o4)`)&9i&vQr`V;o?N7*4H~GRuFf>EYM8 z75NO70;8S&Z%M)#lxvZ-#&%;@_oFzzNuu?^L#dErg-H6l?T#=CR>*qr2Eb5oAS$-@ zoE>VjIJo&!`uPMVZlxmZYekd=eC_k5UPV}Oh21VDP6mFwYue2SrxK|*7%OfVUP{Lv z7Bo(pkXOYoC0`Q$Sho|f75Vm$&E>1!MS3I*0bA3=k`Ptq=` zl*jVdmYB(g`_Havu^{x)3A!sO&}>gg5Ju%aw8 z(+7dG`wX8zE`;xWtj@Ubij)aeaF&b*7q5Q`Z~xCB_jWZqY}f9 zM}Pd%k?O0iHVeBp^{Oh54+%Wb2-_%_+x|9(b-|WRit}c1S4wB}MUelnUs-3h^6Frg zO7;Vl?oT<|9WI z)L({xmKW)r8PZaTJv->_F7ufCkdUk_BqyGHn~#)mOu!*2f>+oWe;qhvDVW%|*AkrR zayWjz;XR8b51uDI6FGJC4NKRFx5m9Y>Jzus5nG5Cf@hoBqcE(*=Ir#pclmAOe)M@2 zY!S#sdBv{GRi1=+VAzIO^2(O7+;kBPd+Z|GuYN*qfJY~^SL6Ev(d0jSf^2IT>)CNT zZOqG06m_S5M@gi7+;62DdcmB@|KU<9sJEIwx(XDPyb?&a1H>~(pjJx$s`>iHwm@^- zh!zD$RqscY>gW+nnFhN?DKq<;laZ)~N3zETIFxNm7^d7(t?+14rhU(;bbM*VOZ%#q zn(GTJgf2XNsNRAaXk)G===ivdH|CQ1DJhk#!=yN9+%k33o3K-4GdEp*XQ|{0J)n)t zTUfA*VW55-_bEY^pleU?%!MJBBgK8ZE+d*_Yk`vF+dT5^v^R!j_S}SPDTDiJ4?&(a zdc)daUl3HUDW{@wn4x6v>y}V|;WQ1pVny=fX%=Tx=-I7HeC4#0q!Cd0sM3e7iim?E zr7WdCd-HrNeH@ZKjYy)>XB@q|?n>!{etU;K*_GiBSDEmy0qk1e`FXOHeiKL%&%M+) z84ChG>x!ZQ%&yHHk!p)30$b1nh^Uz~G}Q0kz?9BQmgBy=9b#6FI6KVC%gc#Lgdfj8 zlf8g_RGi3+ql39R3HP<(a1aLVeycB!uGTgx@KHD+5XB+kEmcJeuV>BU-?lNBnVz=>k(&9qn^S z7K2hxxY;uFiO@8m`**ob>EWLwtBYq-B*Bhvd_c|b{kywN<`Ue${v}YPZI;N(=AMsp zzt1^8&0lz`)WB6GE>KH_W~`CJ@i=Fd0~3=aTlTL?Hczl?@$ z@BcaT9p-r6)8HIU)FCvs6%bfX!F*8Cl4U^mgjr53K-SB@l%^OGPh^%ysA(2-InjRn z$L4ZSPF6O)%j7mrM<%UT_P5z%%R(~R3>Bb?TCPj$qsIG3j1jdM5^PKT%K)ZkYU%22 z1FY>E0pB-&9$NH}opdQ%zkIw&ZP?oUs>HGwsnzl+n&H;4zXZ4K8iH(%P-W&KX`Mvp4;W6k)w(@UKYq)zF%33UvR9^Vdk;p ze$x>&*Dolow}vb2^iK)dv>3j$e1f8)W_(v<&u&_R%F8QT-6et_4ugjT&e^(?)N74! zr2@lX=dG9+Sa7}CgE(~DW}Y>ntw@+ubsO7+u?M(0S$DLMecn?v9e*-+#A%EEo@0ha zx1FYSOT>&~{e@o~9eQl@oW}S|=?ihQX2$xo?Hbho4LBM{?XUEs)~MWMDzsd_Ps+)0 zm$z=F_RZ-tIx4Az(0(TKH&Tul@?vg`BH_PBN0ag(jz+7MvRw$+cbVT)b^MMkF%N^0 zn5`K-mQgtGmis_K@Q}hlM3J)?0H`$WM2|iBb-}+ajxO6#NnsY(sC%|`T~uY-SX@1z zc^lz?q7d#;BCtY4ota^k=$|s_$$Mft&vLi!yeM$eeL2pU1KwfN)Z!}^#Df}xSuXc8 zTfCh8LxwYVEYH_>0H3#aLxqFxW-=j4V+dh50`aTcMAjU=$Hd*a56>BsM}a|~4`SbF z%r@~aN+OVEgjMv158JDSyJK%X8vjgDdw4FyHQamUm-I~e{67C1Q|Jw27am{KRPd4G z&e!7)(6SD2Mg+JhIQhBU0YDlm^*|gda~Civ83m}cf~>44^q~S2+5z&A{(l5sKF;p0 zq5pruh}}fmoq+j&9V~oY1A-BLE`Z?RU - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sitestatic/archnavbar/archnavbar.css b/sitestatic/archnavbar/archnavbar.css deleted file mode 100644 index 5a83dfd2..00000000 --- a/sitestatic/archnavbar/archnavbar.css +++ /dev/null @@ -1,25 +0,0 @@ -/* - * ARCH GLOBAL NAVBAR - * We're forcing all generic selectors with !important - * to help prevent other stylesheets from interfering. - */ - -/* container for the entire bar */ -#archnavbar { min-height: 40px !important; padding: 10px 15px !important; background: #333 !important; border-bottom: 5px #08c solid !important; } -#archnavbarlogo { background: url('archlogo.png') no-repeat !important; } - -/* move the heading/paragraph text offscreen */ -#archnavbarlogo p { margin: 0 !important; padding: 0 !important; text-indent: -9999px !important; } -#archnavbarlogo h1 { margin: 0 !important; padding: 0 !important; text-indent: -9999px !important; } - -/* make the link the same size as the logo */ -#archnavbarlogo a { display: block !important; height: 40px !important; width: 190px !important; } - -/* display the list inline, float it to the right and style it */ -#archnavbar ul { display: block !important; list-style: none !important; margin: 0 !important; padding: 0 !important; font-size: 0px !important; text-align: right !important; } -#archnavbar ul li { display: inline-block !important; font-size: 14px !important; font-family: sans-serif !important; line-height: 14px !important; padding: 14px 15px 0px !important; } - -/* style the links */ -#archnavbar ul#archnavbarlist li a { color: #999; font-weight: bold !important; text-decoration: none !important; } -#archnavbar ul li a:hover { color: white !important; text-decoration: underline !important; } - diff --git a/sitestatic/archweb.css b/sitestatic/archweb.css index f7c61f10..80e08fc5 100644 --- a/sitestatic/archweb.css +++ b/sitestatic/archweb.css @@ -6,36 +6,6 @@ * 11px = 0.6875em */ -/* - * ARCH GLOBAL NAVBAR - * We're forcing all generic selectors with !important - * to help prevent other stylesheets from interfering. - */ - -/* container for the entire bar */ -#archnavbar { min-height: 40px !important; padding: 10px 15px !important; background: #333 !important; border-bottom: 5px #08c solid !important; } -#archnavbarlogo { float: left !important; margin: 0 !important; padding: 0 !important; height: 40px !important; width: 190px !important; background: url('archnavbar/archlogo.png') no-repeat !important; } -@media (-webkit-min-device-pixel-ratio: 1.2), (min--moz-device-pixel-ratio: 1.2), (-o-min-device-pixel-ratio: 2/1) { - #archnavbarlogo { float: left !important; margin: 0 !important; padding: 0 !important; height: 40px !important; width: 190px !important; background: url(archnavbar/archlogo.svg) no-repeat !important;background-size:100% !important; - } -} - -/* move the heading text offscreen */ -#archnavbarlogo h1 { margin: 0 !important; padding: 0 !important; text-indent: -9999px !important; } - -/* make the link the same size as the logo */ -#archnavbarlogo a { display: block !important; height: 40px !important; width: 190px !important; } - -/* display the list inline, float it to the right and style it */ -#archnavbarlist { display: block !important; list-style: none !important; margin: 0 !important; padding: 0 !important; font-size: 0px !important; text-align: right !important; } -#archnavbarlist li { display: inline-block !important; font-size: 14px !important; font-family: sans-serif !important; line-height: 14px !important; padding: 14px 15px 0px !important; } - -/* style the links */ -#archnavbarlist li a { color: #999; font-weight: bold !important; text-decoration: none !important; } -#archnavbarlist li a:hover { color: white !important; text-decoration: underline !important; } - -/* END ARCH GLOBAL NAVBAR */ - /* simple reset */ * { margin: 0; @@ -1145,9 +1115,9 @@ ul.signoff-list { } /* highlight current website in the navbar */ -#archnavbar.anb-home ul li#anb-home a, -#archnavbar.anb-packages ul li#anb-packages a, -#archnavbar.anb-download ul li#anb-download a { +header.anb-home ul li#anb-home a, +header.anb-packages ul li#anb-packages a, +header.anb-download ul li#anb-download a { color: white !important; } diff --git a/sitestatic/favicon.png b/sitestatic/favicon.png deleted file mode 100644 index 8c7f341140122c4e743dd23d1320efe87a340fab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7924 zcmeHsbzBth+V{{YA&b(DAmvgDD(tAZY^9;0i0!2m%5UBHa=a zBBgXlEbr{E-gC}-&gY!-{_*_v%+59UwL9PIo~vi(-Z*_-^>dUglmGyn)6`H!fFmbJ zT;xRHaoWPb2LK2{P%0|=C_6g<5KInDme**#!Pb7qyr964?KKzAlN^{C9i!K<5F|&r znDI6mTDME}Op5QaSmHgGmX@UUSCJ1Y%4o{&aUBxO&#&e$^YG)YT&}#o^|h9BQssr2nVZi5@AK<0hs#UsTuPCC&O->&tl#h%JZI@=HKw83q2##_9} zDpGRJ>(O^WjPgRlN0HGx7aXe)cBR4F7jJG)c1w(*Xt?9lM3kZcX6ZC|M6^sP%jHXh zmD!t{w6L&b3yHdJ>qXNWj6!@Jv^cV+chXd;4DJX%0^g?b{SI=vDUxUCFF1wjA4?Q; z0i

)lHLtgMucurfQtN|J^wYiyG-b+S(}s(k$PuM{JjG4BZg~HXL_#WM6JvAjj4< zR_%Ko0rth1;d7pz06~`k;BFKE z9DzUGT?PO&6aZGO0RZ*{04{pIsE5meF$>kdWvB)ME~XCr@BTmUfwQwSEx36h7=Tb; zgsuSqP*dKO-&0D@WLa3{aS9}D8>YK?YKdt%KZesbo~a}h{(b%R&@Rcz9&63geyxIsYQ*2KdYVPp? z=52g(uQL6`9=Zl`s8kk>B@IF{o6c2^ogryGgqE}8!ww5c#@7WlyBCQ;Q~}L>-t9kV zW~10P;>PbdAlf@IgaOSiC!bIIOIVyU9Vcn_&1wN-s@|Uj-xI#LCq%Zkt7hLpHQB=l z3{;)SL}~;!=?Mky=qev!_HI@Qe{L`Msoyjl`w*Sk7g(gN?8)EkNI2(6Dn85POP^#b z^B{po>H##E$L&<*F#Z~;=ka;}QATP#LO-3$^mC0|ypXJ9MBiwF{>Ov89M5qG@V zf-TdFGm?vC9+*&9e(qg%lH@LUd@I@D`NK(ZtA*U?JD1w*TRl3)7vSvu%WvzdCm4Qo z<<%!NJaMB@8YIuZEZOND*gq{b8OLS79`V7z+M>Jm38EYG;nq}s!_YLx{!m3L&Sy62 zAW1bznfgu%7y=7qt=}<3)0h!V_u

AbhYIqF(;eE=f7Om8g=V+}kN}496ZVBx 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 JnX>i0{{tcq(H8&! diff --git a/sitestatic/logos/apple-touch-icon-114x114.png b/sitestatic/logos/apple-touch-icon-114x114.png deleted file mode 100644 index a5b4282ad85fb55c28e6ab0fbd70884305d6ab79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2088 zcmWmEdpr}07Xa|NarM4;J#LYZyecy9x?IBiF!Jt}6y1_Xo>95nP~8f7#Ktg>Nhxo6 z#pHEa%%f?xVVjxR%Vx$l%shW{KHqcB=bXRK=cKy3Ivm=sydMAn9CC65d&+wBZtmS9 zt8IH8yUChdjHiPwpbo3Tl@0r%9DQN{07d3*$`wOA@Uo@iBd4qOic<=5$4{9!pX#{= z0Q^+y?&58K0){&Y!ztz9lyh*Wa&aoTW2bY+RN-T4@GW? z*Qnft9XL2dM46g>n*e}JNgwbR4D&PIHljqI3>>X?1Fi}A3N5#7m%>0&(UVm$6< z#C9|P?qSCDFysGYKJ8^C^s*BBSV?`X=V{q)uuLn5E1DsS0=M9FF zHaM3)$VnfZ%NUx=8kXT^k8q(QT-bMR&UbF^cOD$eg=2YnSYG}puV9pikohrR_+!2Z zH(!jKFBzLhj`2&!`0w!i_XPe28R9}Yap5Cz;nVm+)r6pCQcyc7s3QsL$%~)Kiw%^; zM#^FnWvN+aYN=&v=?itKO=ep7l_u<%5q8dqx@JV(bWsmo)H^HcWr+J2Vl+eijVbPD ziU(L?3~PCiy*$KT9%e6(aF)MwR(+nZb4Tid&_v$F%K z^gg_M;CG!Jz_gN(u|oiWf}9iB#yfa=fz0(ke*c)_l3JSl3&@*uj|_q4NA!&C&|}Sw z=^7xr10afK3K*g{bXr%--4_&M_mi>l#C|WY=iaLzXz@SWxqg6FR4g_oE>JMiG1nKj zF9<6!jtwk{!-@}LL_NBfA!g=2uI%szM6(-`9AxMt_cYK@D*qXCQ`G*;vluw^GT`$# zq|y2qVAEG$b65_5Y0A1~=1Bfo?`(biA?T&MN~jP=aL2WPNDL@dISpfX7-(=4d~y5j z!LZhsHP1Cf`e(dy0)mkW0cqV(aHT>(9V|sxJUIQe$jKYw3U5!j5%~M%(Oh)BHq5#T ztXbev=Lx$Pfq?jl|Ab*cxlap#hIF-~gPB5=)M9O@g%6Ov^)Y*oWJ%M?G{aKkS75ku zoUvy>Vko&KtmvHjqWR*P5QILc+xV4b?zBC@GFj(DzOB^@j4@b0Ca$ShUL+5o6(v5% zxId`qqMio;uysis0^THs^tJknJm6m~^FGVeef#v@(J?;y8t|$6d zX{(v!-3XnZ4U@WK zR=#lbFF$7|f3Qa@*&PNC!7fGY^(nJKA32NJ-mCus?Py`-Q{x0q=LAHynH@>~Lp#mn zO$uL<#ovdAlug=2zYPTbMODqd?bQsM6aZ1TlT(~dt7a9$RIsB99ia z6R!qTl@9qm!3{g$zan%Dq_)H1x;&^A;fmF{czZ$JI>c8K=(@hxg?m>^P+NBaJr7P_!By&5*Ku5`n zvw`P?zY`H1<;#KD1?M;n9jO57uS#eOu!l ze2(D62T{FSmPI@0pz^}APoDsRIJZc58y9iQUemad@Fqlj8%(R(yvK9&{#hb-u zy~AZ6ofFAXK_SQkfa!T<%u?`;MFyelAPfoUd82Hkb+JbN+1sMQI?x@z;|0GFaXmS% zI?)%x%AXh+@)g4{*Pyj@O8X#lE|E4~rasyVRlvpj;kV158$z~|FiCPoY0ReJkb9Z3 P&j@g`cLmqk-g)tV)4qw? diff --git a/sitestatic/logos/apple-touch-icon-144x144.png b/sitestatic/logos/apple-touch-icon-144x144.png deleted file mode 100644 index cd177f2c2e0a37342a7371479a9659c11624dcc9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3063 zcmVPx#32;bRa{vGh*8l(w*8xH(n|J^K00(qQO+^RX1pyTo8asG`mH+?%24YJ`L;(K) z{{a7>y{D4^01J0XL_t(|+U=eBbDVV@$NOK{YD*Qx3&l|^iXs&UkB%eaba2pVaV!oh zAfhqX+r|BC2dS;vq?6aY>rJf=Qg|9%_iB+Uh$ng zG_%QOcc0_?dG`D4e%|x>fnlJ1_WOE{@Aq@Am}OZ?D|iVQ7>j|i7#IU%F)+P~B@*!j z1GA2*oc=T20S0CnJ#f5hV`Vo3vxd6I!ynk$46~1g7?=h0%!NS(*w(rM1}3}0(fFtK zwkp6rvZp056JuaftJ2|9XeqY$>U9PtweGLzN(T0&1NJ=I-{%!D$5<$tmSVN800Wa$ z+v^8Yfo-blVPG<9IvT&FxFr?X%AL)<{xAcRPDk2&sk9W^abb{wNv93v&UC==1W*>1lMTCg7-?`B{*5K^P` z0fV(#Hb2Lzz&gDl-Lzo8eap?jOx4qGyNv)_Q)C;Rj508jgj}ebi(8BUgZ;g6n1Pw3 z65Dlyv|zWDSn?2UJz&vze4Vb{e5&oUjWIBCopkzz(1NYo-;To^1EbZqk2pmEgQ3oa zff1@(p*~7p{w6)Gn0SsolKE=QU>-uy= zYv@b8Jzm|%zy#}GjUz;~V5^I4L%|3G6RF~B9y(yKKfE)@z^ueU?zEBQ)*yG?MsU)?>*dcZDe}k zKd9>u-eNfPyu?0M+~Sw`A(Iyv0+ndmuxw4k_WFT^ib^ypT6hXY84l?TOtaqX^krDn zyGk7kUo~t=Hk5Y?1a|9dttfG4U>byODC^6zKR5SPbRj}EJKwSB7u9_NneCCag^r}a zPCCam#Ya%%JUgG91BZnWV4r>6J{^rQFjc}<@attAT9kzB zu^BfU^8Dc#1Ix5Iyt~XH4=~u@E)6rVv^w4Gmx`9+_>jtlFA=bW=p@m+e8?mMrs?cu zrXfz|nT|5BrJlpD9Bh{p80=YT8u-Zq>`1#;T3Sk+Op*dXDS)9)>vlmEM0ED&`XL7P zzDjIklGB3Sv|Ea_s@wxZAOoIO`GLWHFG22N?tvkYVF_BWwGupJIR*yD&&O{}-mrxI zrp8^+z+P+^u@EiTs$I=aU#LKV;WVnI^{Z_5^Ruo31-64MhnL!NSWlKSVCd$06Is0% zwIRA)aKL_7H(*g(iZu>S77#EDL-|lqv!#K3?^ss>0eiH%-_o=cd#5j05WreJp_SIB z1^d>~&O{*qqv*AfD?^Ap&w(`!Pv#9RrRB59BOA>I_TY)0d;$hT7G>T7yU-srCk}#i zQY1HibdMQcO4QCET%L!(sB>(92QkL?hNqI34}QOwnnpiY(niXxtZgh0ff-4_&T6QG z&XDnmvW6ELMo?Hr^tU5iZd!9wlYm9yiDj$vg!I=aclgv?0}7KqK^Dq+^_nNIfDt7D zpyd#%X4PMY!#j;)J&G&2^|dy0#%!7a3={P5dnlF(xmH>)29EZdi%DWSX!?>Tz%aFo zVu7~S>1m$p9z8C#YM3kFEk z8mI4&#WqQR&GoT4)IqTj>&3kf6`^ev(T#P!$8Q;6rEOHzD8dgq7z<&ou#0$LX#0dy ztyMzu@JiE#&C1)o76A5A6Ja0a!QhPW3*K1SMRc`@!wGL#B^VfjQgk5<)VWZ+!10=; zyTkU1?g}Ru*fW&r@<=PA0ESkyTCW7L&<*9z?;h*S>c>Ge2f+$SfgxRfEoHj=meaiy z!0P*T?mN(}@qBNf(&78%Iah`%H?eI#L<0MDO&=XCBk`2Xa*i9Cas~Gr9KJ{qIOQBi z%H`^mhK=wt3vBZt448c^v}#u~DX`}*l60g&-*bZ(_Tg7-XcMfYb-+dWhHdPgLyJ0Q zZ5KClLKv`3RpbeW*nd(0!)Zy#<-uu^oNbSszK5!MSKdfva0O;00!DZIOtzvXsu;Y` zBIth11z-4+QKy59F1&k0gHxqy%RgDOk*q1quUp1~p0U!iiHlONk6%lq3 z0Ib4cQd2LY5nrNSiK$IJ!i#&UCqH>P1BPotzgDwaE|3IsF|3j3g5d#2%w4X7bI}!# zIkc1ww1nIG%!WO^*xBBOfME-3W?K{@Pe&tt1r!b>82poaU{Am8HjS2&lO*bACo6R% z4^d6@k|}8KZ`soPqICaWKQJ6DRu`Gww*jMZgaiA_yF=z&{JMSiWgC2yxBIr7cK!5p z?_=lskYDs@waYU#mn#Pc2}V~hfu|oBJbUI>&x!pWDB5gd2`@@FN>gf+!m+q_I{N(z zC;r(zG4r+3_Lu)RcjEj<;>m9{&2jq)|%Dm z1p%GpV00{=n2f|X&F5O-p#7)+4nA>yZV>nrHGR)F42c1D-@l#Icj5!byU>}hd34&e z`bI>bQ4hHHs^`HI-D`;7_K2D;+)O6=dI0oUg{XAK^!-7Xx0frlN4wygu!lmJ>BU4DT2!vx# z*7O?%hTBm1M7-Nd+VGZ8MoP&h>`QS2VLvRqunZ5e`-Vpt%&v`2O-5oMhmBP zwF9^Yd#HdR#Z33c7iUI9 zv*aHfuS3}EVK-}}f&OT%iFNUbX6Xt54PT=eG59&eiD+A$q6Y*NQm;aAz3B|9*X|LQ>pqtY!TC1P>1cBKBax}mn&fgNb|GAiRj zS~L#bnX#$K5zYb(o|1H}&~WJc)ww=*V1{9+7tWv=T7;nR$(t=4kp)<~-UvvqDDZ8C zA#A=-y8a5=>fHK)4NpcenJ%?Q24WDr=*ER*+?e9uLU;JgQT0r~w$(05*}!2QKC}d{ zv``@`yMFQLYB(tL081`zfPWg9Dsg5-qr`lOF?pyYT3KrbhVCFrq7pu1M%r+(R0{jM zomV_cbDsMvy0ig<_YeOYTrAj(@=}^9OaR2PWASTU0ky#J>ciKoiFXz`-H#x_ZP{(j*{=EJthwFO9Xtz!(^dfw34E17n$@{{vIh3%HjO`hEZa002ovPDHLk FV1lY*z2*P_ diff --git a/sitestatic/logos/apple-touch-icon-57x57.png b/sitestatic/logos/apple-touch-icon-57x57.png deleted file mode 100644 index d7d592c7bf422068667bf0944ba3377f89a3504b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1173 zcmV;G1Zw+Px#32;bRa{vGX@&Et>@&TtCiA?|i00(qQO+^RW3K$g)Fyg8X=Kuf!%TP>IMHiFN z7?aT%l+hZL(HoV~9F@`@meL=V(jl1BBAL@8nA9Yh(MXB0GsoF=V+eoR}N~_yTtlCVg+fA(8POaQft=v?v-BqyMR7UZh}BV_WJGj`|kJr@b~-i`TOzt z{PX(#^!fbs`Th3${rLO+`uzU-{r>y?{rvv^{r>;{{{H^||NsC02zyyx00001VoOIv zn0CuHFi=h zFp)52BYkENs;p)Btf_=?OZmdk>rTd7Wma^ zQtP`$<){7aiz6K4a6miYKwMr1IOpdarQe;8E<)rW^eDZPx#32;bRa{vGY`~Uz1`~kyy?YIB{00(qQO+^RW3K$g)6{)V;pa1{@8Bk1AMHiFN z7?aT%l+hZL(HoV~9hK4^meL=V(jb@8A(zr2nA0Md(<7MEB$?ADn$#(q)GC|QE1c9T zoYgFy)h(UXE}qpdp4Bj()-s>gGoaQqpw=~^*EXToIHK1%qt`m4*gT}zJ*3z^rPx5G z*+Hh+LZ{h7r`bfP+C`|^Myc9JsoF`Z+e)k3Osm^XtlLkm+)%CDQm))nuG~|v-BqyN zSFzn$vEEy<-dwZZU9{g{wBKO0-($AmWVhgEx8P^E;AgnuXu08Px#4WO;cdI(Z@l7g zyy9}b<8!{_biU(xz~p+t@y9 z=#9$gkjv6FdsmCfpx&gz)Y>Y2~#n$PN*(CeGf>zvW+ozd%_((9kn?4i@_ zqSNf7)a<0x?4{N1r`GML*6pg-?yT7Et=R6a+3&F0@3PzPv)k~s-0-&D@VMRZxZd%( z-toHM@xI{l!sGM9h{y> z_SWn6*6jD#?f2R3_uKCG-S7C|@c7{I`Qq{U-PKX_WSMj`|kJq@Av!g`26ws{POwy^ZESr`TX?y{q_3&_WS+!`~CR*{rUX;`uzU; z{r>#@{{8;`{{H^||NkR@-K_us00Cl4M?|u%YR~8Z00R9^&H-yuU{OM&qb5PsRpvlGM}o%`=qYgD6lf2SW(L#;0G%d4rvM<|I5ZUn z0G2_+P(1(uWrm@Rekgj%AoLOoQD+d!bE zaato(B;mmJT@&OAlY($U6I3Yaz}l|?>VZrg(E#PiL18Y{&_~EdzG^5}9>OP;&|3uu z`&2?XN)X{10~iFzdzIvrxET?O=*c8Pw)vaGKyg|=oYL*8|yM@+ZBc_@)e z&lRBtQg7+z+TSlFiBv`bnp#2X3;0YOy`)wJ=sYcd$7d$!C2jD@LPHUxdWSG~h<-=2 zEL1{^ZwqrTXl{*H26Ble*bZTGo?a~)WuX0{arcX4lLJdP03gXN33Z5^D0<)9x%R}1 zm0JMRNJ8l%Xd8tN@|oPhf%3?>X$h!B{ENz_P^lob?6PL_Ex00000NkvXXu0mjfhZq_M diff --git a/sitestatic/logos/icon-transparent-64x64.png b/sitestatic/logos/icon-transparent-64x64.png deleted file mode 100644 index 0318f18304464a10c867c81120e45e44f935b166..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1430 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`a29w(76TPu z2Vq7hjoB4ILG}_)Usv`!tc;?(#wVXYP-I|WVhr#JaRo|=O}-#D`I7jAi{g_miBG;L z(SKfY;w6Uv|HY?WVrcl!uxb@U!+wUDXS5rxs!Y1AF#okMqHVGssI`O>Z)XNf+&PhzUAU^S;*tE-{ zlP*Y2xhOgLvc%N$5|b{7PXXF~QEbX3v57$S7epsrl$>%&V$vmvi5GxQ5}O2c;RT6F z=RwW`I(0Hsz4&CH`IkWMp9ItnQVB8#Xb4dK6rjqBKodZUfwB-Opn8ztMTsewAU1*w z2bl)e3p5#G5t>G@jX*PjCL@^!VuP&!8V)oKVglGAptFJ2flLFt2c#WrDMS!x9gqQ$ zLe>R!A=Dg*`#~xp>Ol-N1Tq$iARdHr!Cr$);br{)|9^S;5ocf`SXmO}7YwAqfRT}j znT3^&or9B$hnJ6ENLXA#T2@X$Nm)fzQ%hS%&(O%k)Xdz%(#pox&fd|<&E4BCG&~|Q zDmo@EDLExAJu@pOH!r`Su%xuSvZ}haxuw0Mv%9yif5N26Q)bMZJ!kH`g^Lz1S-O11 z%C+k@Y}&GQ`;MKvcJJAD^!SOBr_WrteEr7FTet7rz4zeJlc&#~zkK!j?fVZOKYjl4 z_1pI!KY#uH^YE{-7*l6MdObna%9Vf%30R`zvR zprzKSnNPA>WE7n}Cvk9gPFd`7&Pn9uk`g`H^Yxk8uWR?O-h2D^zTa!lvwO#2F;l{}zmV=+BzTs`Jv@EgW`aJK_OIsiBIZICS%?LeXX=-rt)?v&4lM>Du zR!uoP$E@m4Z?j}%NKA_)Z%9e&!5vRDSM?p(QN*>@VBO?PaT3#Rxj&TU>Dr+9*t}Io zqPXv>;q6~5s(781>L$jvPqqu*%I-F2>FL{Z*tBLPI)v!oy%i-hXFLBd(E!8KmFpMG z-rBwIO;cRiuP>wlMNeiE#?W#G1w>yT#EnJX!A{|x8y#mimrW^J+2V*BirYyRNy zwaluW><=wk)e93pESz|6p7RcemA1UyvQL;~1y;RCeWW6`X-kk)bz~94p>vmx1#)c` zT^O-1>8X*%rxjB5bEI2c7Zqh6Ut!g|b@jD1$M(F)t2(pohSEaCOV^CN`~O9FOn+fk zqs?2lG@S49TdtNC$6Y12lLZ2L_O|OOcLv;Da(R1=c1h=n_e(CvYD`i)G0!;cg;?Yb zf2$ya^?l7{+B}_la!Ix}+xn*;KfIykQ|H|R>-lWKm$)~o{9)IR*tG7<+Q3jy-tctw Kb6Mw<&;$Th1(4hT diff --git a/templates/base.html b/templates/base.html index 7dfedd1a..eb7e90e4 100644 --- a/templates/base.html +++ b/templates/base.html @@ -5,32 +5,21 @@ {% block title %}Arch Linux{% endblock %} + - - - - - - + + + + + + {% block head %}{% endblock %} -

+
+ {% include "archlinux_common_style/navbar-django.html" with anb_home_url="/" anb_packages_url="/packages/" anb_download_url="/download/" %} +
{% if user.is_authenticated %} diff --git a/templates/packages/flaghelp.html b/templates/packages/flaghelp.html index 15214335..179cc3c9 100644 --- a/templates/packages/flaghelp.html +++ b/templates/packages/flaghelp.html @@ -3,8 +3,8 @@ Flagging Packages - - + + diff --git a/templates/packages/opensearch.xml b/templates/packages/opensearch.xml index 4e16d252..85204949 100644 --- a/templates/packages/opensearch.xml +++ b/templates/packages/opensearch.xml @@ -4,8 +4,9 @@ Arch Linux Package Repository Search Search the Arch Linux package repositories by keyword in package names and descriptions. linux archlinux package software - {{ domain }}{% static "favicon.png" %} - {{ domain }}{% static "logos/icon-transparent-64x64.png" %} + {{ domain }}{% static "archlinux_common_style/favicon.ico" %} + {{ domain }}{% static "archlinux_common_style/favicon.png" %} + {{ domain }}{% static "archlinux_common_style/icon-transparent-64x64.png" %} en-us UTF-8 UTF-8