From ae00cbc53b086679ca5c953d4c8dc8bd67337ce7 Mon Sep 17 00:00:00 2001 From: undefined Date: Thu, 27 Oct 2022 14:25:42 +0800 Subject: [PATCH] ui: update nav logo renderer --- packages/ui-default/common/variables.inc.styl | 3 +-- .../components/header/header.page.styl | 5 ++++- .../navigation/nav-logo-small@2x_dark.png | Bin 1963 -> 0 bytes .../navigation/nav-logo-small_dark.png | Bin 1089 -> 1963 bytes .../navigation/navigation.page.styl | 16 +--------------- packages/ui-default/entry.js | 16 ---------------- packages/ui-default/index.ts | 6 +----- packages/ui-default/package.json | 2 +- packages/ui-default/setting.yaml | 5 ----- .../templates/partials/header_mobile.html | 4 +++- .../ui-default/templates/partials/nav.html | 4 +++- 11 files changed, 14 insertions(+), 47 deletions(-) delete mode 100644 packages/ui-default/components/navigation/nav-logo-small@2x_dark.png diff --git a/packages/ui-default/common/variables.inc.styl b/packages/ui-default/common/variables.inc.styl index d49fe75c1..95d7788ca 100644 --- a/packages/ui-default/common/variables.inc.styl +++ b/packages/ui-default/common/variables.inc.styl @@ -80,8 +80,7 @@ $nav-item-active-immersive-color = #9AE3F3 $nav-item-round-height = 32px $nav-item-round-color = $primary-color $nav-item-round-border = 2px -$nav-logo-width = 45px -$nav-logo-height = 23px +$nav-logo-height = 32px $header-layer-height = 100px $header-bg-width = 1920px diff --git a/packages/ui-default/components/header/header.page.styl b/packages/ui-default/components/header/header.page.styl index 1d0604d7e..8166881fb 100644 --- a/packages/ui-default/components/header/header.page.styl +++ b/packages/ui-default/components/header/header.page.styl @@ -68,10 +68,13 @@ $header-gap-mini-domain = ($header-bg-height-mini - $nav-item-height - $header-l display: block width: $nav-logo-width // no rem height: $nav-logo-height // no rem - margin-top: rem(10px) + margin-top: rem(5px) +retina() background-size: $nav-logo-width $nav-logo-height // no rem + img + height: 100% + .header__hamburger background: none border: 0 diff --git a/packages/ui-default/components/navigation/nav-logo-small@2x_dark.png b/packages/ui-default/components/navigation/nav-logo-small@2x_dark.png deleted file mode 100644 index bf1d5899b6cd035004025f5c177b17c5c719530d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1963 zcmXX`3p~`>9zTa&>#^AFNqLN2OWTdjCv|t-^-*3K*K5VD+Vv`8JrWIz*>an>L_&ED zd5axlQ<0`dHd~8|LDwW{yNY3+=HWjN;hr;h=X2)#&-~8sd>_Bx`OoXs&y>#sxrYHNYpx1O0?yJa9(^m}>9~0lJi+PmLpeYH%MfU=$zp ztHG~Iz*OPIEhRk42iFv!TLoBZ(5b{hGzz3RKT!yO5~Cb&R}F5fFix)u6w6?m2%ZpP z%)4rsFTt2s32;S@@ijRpf*0)ya9s(b`7n}?&=3VIkir}Z-a=WilAS z1I1EMzl`ac33wi-!HZHDCBXSe+YKemmtv@U8YP8Nth_=FvzBlIvQW2-l_Q---WT;qetJ0e0e0*v9~kt9SN#6)NpHS4w#9l>0;mAHn;Ci1H( z3r;AGbkx=Q7qjV9B)ZFdMGMFlYDMEaCVg!HPJ*v2!`U1ZdLQ0_D zA@ImdUrX0iL^h#XvZ|}t)h?f#Y<%xQk3qGI*5;;L*Va}DIgiI%T;Ouw z%)a7GPOyiDh92I$(NKS-v^YPPcJ?eaGc_^xcywe~$hSdf&JALK&g|(H%w#^$1 z)>JALA(zXRmc(MAfRBK9^KWKnU;p`P=K1sS@v)KN!2u?-r>nEQy{);ip{}mHtgNuG zATKBDG?j8PDJC++*N5!o;j!P@>C1h4_mV8k8Sw>Y0MI^3c0UjlG9a7`4%+mM*&h;1 zfqg?`FO&I6Pl47>ot>nRY<-&74%!U**jYWtkC~Y+lGahn7*Wks&1X7WrvBb%tQc9J zJN56!bn2F`=1Lj4tXmGThO@%utD*7d$DAt?6Fh5cAG+lB6^db(wX=W8 z>FX?-z@hV_w>CuBFJ135Qa=9L|FHY$K;Fd_EmEwAx8*41gJ#~*JYq_)ed@xOFC4eN zH&-;;VJjq!?y9l&{4S|z6XW$qpK!**Z9EOn_H3_O8ZoF9 zy7SW`zWY{m4%bgFj-;42)Yv4;;$3s;VQX2LmEAeX60OZX`HY2^KF)^4Mi;~T$Bv~g zgx`r=_WH+Y?QrL*cQ2{bR|T~7<7xVtA7?N*yHm_2%S-JIE?o;aXshg*7Z-J;+3s{u zDV0G{PEXhdvs>a8f-l1<)9s4ttM8b0bVAgXRPkh<}`8BRXwxlkwU5x7rDMt1Eh|vi}ZFT#8_~F~%N@1eHvl4RLU6 zS>G{S=&S?Zn9}FhbH`bw0vmI?Q@2JQvkiUohx}-c-p=n=PCJo0vYLX;+>UXBot~0o zjiQs1mZm17IcKzIbQ8%7kLC@1r9=89qmS;r2}rvs^R26`G4X6UAnI>@p7DCS-=YDD zLZ%-(5SrOnmEdVX`j6i^PeqHM%_rj7d>7lX>+8Ej_v=`4m@9XT{af6cTPtOwd6k9i z?Y_5-(@jq*?RV8b{e5BlPrZ(p{e46}@5zRecZaE@Y|*Fn1$kq0<1i% z2K^fQa(Pv+)gf~iW9`i|Jm(LemAUDg*l_0#><&oMA+=ulaKhz^x6IQxhb=^ZI)Loq K=iccWLHi%>rr+5B diff --git a/packages/ui-default/components/navigation/nav-logo-small_dark.png b/packages/ui-default/components/navigation/nav-logo-small_dark.png index dd19987183c8680d317461b5d0533ee7fc9ac0ce..bf1d5899b6cd035004025f5c177b17c5c719530d 100644 GIT binary patch literal 1963 zcmXX`3p~`>9zTa&>#^AFNqLN2OWTdjCv|t-^-*3K*K5VD+Vv`8JrWIz*>an>L_&ED zd5axlQ<0`dHd~8|LDwW{yNY3+=HWjN;hr;h=X2)#&-~8sd>_Bx`OoXs&y>#sxrYHNYpx1O0?yJa9(^m}>9~0lJi+PmLpeYH%MfU=$zp ztHG~Iz*OPIEhRk42iFv!TLoBZ(5b{hGzz3RKT!yO5~Cb&R}F5fFix)u6w6?m2%ZpP z%)4rsFTt2s32;S@@ijRpf*0)ya9s(b`7n}?&=3VIkir}Z-a=WilAS z1I1EMzl`ac33wi-!HZHDCBXSe+YKemmtv@U8YP8Nth_=FvzBlIvQW2-l_Q---WT;qetJ0e0e0*v9~kt9SN#6)NpHS4w#9l>0;mAHn;Ci1H( z3r;AGbkx=Q7qjV9B)ZFdMGMFlYDMEaCVg!HPJ*v2!`U1ZdLQ0_D zA@ImdUrX0iL^h#XvZ|}t)h?f#Y<%xQk3qGI*5;;L*Va}DIgiI%T;Ouw z%)a7GPOyiDh92I$(NKS-v^YPPcJ?eaGc_^xcywe~$hSdf&JALK&g|(H%w#^$1 z)>JALA(zXRmc(MAfRBK9^KWKnU;p`P=K1sS@v)KN!2u?-r>nEQy{);ip{}mHtgNuG zATKBDG?j8PDJC++*N5!o;j!P@>C1h4_mV8k8Sw>Y0MI^3c0UjlG9a7`4%+mM*&h;1 zfqg?`FO&I6Pl47>ot>nRY<-&74%!U**jYWtkC~Y+lGahn7*Wks&1X7WrvBb%tQc9J zJN56!bn2F`=1Lj4tXmGThO@%utD*7d$DAt?6Fh5cAG+lB6^db(wX=W8 z>FX?-z@hV_w>CuBFJ135Qa=9L|FHY$K;Fd_EmEwAx8*41gJ#~*JYq_)ed@xOFC4eN zH&-;;VJjq!?y9l&{4S|z6XW$qpK!**Z9EOn_H3_O8ZoF9 zy7SW`zWY{m4%bgFj-;42)Yv4;;$3s;VQX2LmEAeX60OZX`HY2^KF)^4Mi;~T$Bv~g zgx`r=_WH+Y?QrL*cQ2{bR|T~7<7xVtA7?N*yHm_2%S-JIE?o;aXshg*7Z-J;+3s{u zDV0G{PEXhdvs>a8f-l1<)9s4ttM8b0bVAgXRPkh<}`8BRXwxlkwU5x7rDMt1Eh|vi}ZFT#8_~F~%N@1eHvl4RLU6 zS>G{S=&S?Zn9}FhbH`bw0vmI?Q@2JQvkiUohx}-c-p=n=PCJo0vYLX;+>UXBot~0o zjiQs1mZm17IcKzIbQ8%7kLC@1r9=89qmS;r2}rvs^R26`G4X6UAnI>@p7DCS-=YDD zLZ%-(5SrOnmEdVX`j6i^PeqHM%_rj7d>7lX>+8Ej_v=`4m@9XT{af6cTPtOwd6k9i z?Y_5-(@jq*?RV8b{e5BlPrZ(p{e46}@5zRecZaE@Y|*Fn1$kq0<1i% z2K^fQa(Pv+)gf~iW9`i|Jm(LemAUDg*l_0#><&oMA+=ulaKhz^x6IQxhb=^ZI)Loq K=iccWLHi%>rr+5B literal 1089 zcmXAp3rtg27{|W@ZWIC?3XU;Y2oJFk%{1Feov^`%l}CA12KZR3Jce^155Z?aU_8PI zt2`_esXzx2K?+!;Lao#doY73S2?Ur!mSuCarL>gN!iemgF8S`g=ls9#{JzJ%xs|ce z2OaF*wgUi%@UT!ee(uJX3&k4WJ9p4i08n2nEB*l9LiIA_YoSt)xN7J(!Q==1VP^?3@37S`km!m>udgwCYU>LC&Uf_cTOC(IT1~mra>NgV( zUJR}gc%4POMC`An|Mxw|p3P$0B@-+|`pmrJIQhQBs)qrvqQKcRv zCgQzm!a!7^N4zDny={j7$#=}83tRv$19MWqxH7RS>P9Dm|$U2Vm=3g?1z9`WrpMLu)XgQXM*{1*w?;OLdrlau-pW8iv+T zhGmlNM!2yG*H$nPeSwE*nH6rKOoy@-3Axn>_t&9jndIfFpwU417=_a{7@%o|kS}P- zNPA4ZG*%6MW&AvL^dYdeLN4|cDK*32*G}AcK9B41`ojm^;`-Vm-o?DHIIPf+zySJQ ze?MO@FE2M&7l%hbj11rI?doW2X>Jl+t*$CBFD)(LJJYMiDx{Stoba_EzX%~dgn=Kn44!?F>Ta|k}weaTv7k#O}SitX*2hk zaMx67PoR$Sul~8>Y0yia#=A*u@YIzv!<0}P+8?>1tIa9(x`S3aJSOPbiSv_~y z`Lb<=+nL&kET1s>Tdc1&V-1Zh!U(INoZ-1*_NF;jSV?`EjHYd+g*_unMn%;1EeB)M z#nQGnf;YCg+*B{jf*$AuJH)gdyeEO*I zMfREW4CYPp-F%Tx;8U3=(*WL_{NN78h^9X#V64qE{n*dR zo3`fiWcxyN_g=@`lpix8a5b@Q`=2E}^i0#7Z0e7w`F*3aiai^N{{(%wKKp%%qTes2 z{k!}QTHqe3`wPhV+gtbQ@w0hlpX8(X2eJggQRSqlY`oBhz2kjXo+6Vu-5u^of!vY7 w;HA@BXtbn8w+_05RXtnXq7iwFGaNUpw~l|z776GT { // eslint-disable-next-line camelcase try { __webpack_public_path__ = UiContext.cdn_prefix; } catch (e) { } - const e = document.createElement('style'); - const dark = UiContext.domain.nav_logo_dark || UiContext.nav_logo_dark; - const dark2x = UiContext.domain.nav_logo_dark_2x || UiContext.nav_logo_dark_2x; - e.innerHTML = ` - ${dark ? `.nav__logo { background-image: url(${dark}) !important }` : ''} - ${dark2x ? ` - @media - only screen and (-webkit-min-device-pixel-ratio: 1.5), - only screen and (min-resolution: 1.5dppx), - only screen and (min-resolution: 144dpi) { - .nav__logo, .header--mobile__domain { - background-image: url(${dark2x}) !important - } - }` : ''}`; - document.body.appendChild(e); - const [data] = await Promise.all([ (await fetch(`/constant/${UiContext.constantVersion}`, { cache: 'force-cache' })).json(), await import('./modules'), diff --git a/packages/ui-default/index.ts b/packages/ui-default/index.ts index 5f77f59b3..b94badf81 100644 --- a/packages/ui-default/index.ts +++ b/packages/ui-default/index.ts @@ -19,11 +19,9 @@ declare module 'hydrooj' { } interface SystemKeys { 'ui-default.nav_logo_dark': string; - 'ui-default.nav_logo_dark_2x': string; } interface UiContextBase { nav_logo_dark?: string; - nav_logo_dark_2x?: string; constantVersion?: string; } } @@ -70,9 +68,7 @@ export async function buildUI() { logger.success('UI addons built in %d ms', Date.now() - start); } function updateLogo() { - [UiContextBase.nav_logo_dark, UiContextBase.nav_logo_dark_2x] = SystemModel.getMany([ - 'ui-default.nav_logo_dark', 'ui-default.nav_logo_dark_2x', - ]); + UiContextBase.nav_logo_dark = SystemModel.get('ui-default.nav_logo_dark'); } class WikiHelpHandler extends Handler { diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index 0033c5a42..ef846f8cf 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/ui-default", - "version": "4.42.10", + "version": "4.42.11", "author": "undefined ", "license": "AGPL-3.0", "main": "index.ts", diff --git a/packages/ui-default/setting.yaml b/packages/ui-default/setting.yaml index a02145a66..86a090e82 100644 --- a/packages/ui-default/setting.yaml +++ b/packages/ui-default/setting.yaml @@ -41,11 +41,6 @@ nav_logo_dark: name: nav_logo_dark desc: Nav Logo Dark default: /components/navigation/nav-logo-small_dark.png -nav_logo_dark_2x: - type: text - name: nav_logo_dark_2x - desc: Nav Logo Dark@2x - default: /components/navigation/nav-logo-small@2x_dark.png preferredEditorType: type: wysiwyg: WYSIWYG diff --git a/packages/ui-default/templates/partials/header_mobile.html b/packages/ui-default/templates/partials/header_mobile.html index 71699d7db..951364dc0 100644 --- a/packages/ui-default/templates/partials/header_mobile.html +++ b/packages/ui-default/templates/partials/header_mobile.html @@ -1,7 +1,9 @@
-   + + +
{% include "partials/hamburger.html" %} diff --git a/packages/ui-default/templates/partials/nav.html b/packages/ui-default/templates/partials/nav.html index 0a544522c..1984b638e 100644 --- a/packages/ui-default/templates/partials/nav.html +++ b/packages/ui-default/templates/partials/nav.html @@ -9,7 +9,9 @@