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 bf1d5899b..000000000 Binary files a/packages/ui-default/components/navigation/nav-logo-small@2x_dark.png and /dev/null differ 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 dd1998718..bf1d5899b 100644 Binary files a/packages/ui-default/components/navigation/nav-logo-small_dark.png and b/packages/ui-default/components/navigation/nav-logo-small_dark.png differ diff --git a/packages/ui-default/components/navigation/navigation.page.styl b/packages/ui-default/components/navigation/navigation.page.styl index 70893030c..afc7f2770 100644 --- a/packages/ui-default/components/navigation/navigation.page.styl +++ b/packages/ui-default/components/navigation/navigation.page.styl @@ -13,10 +13,6 @@ z-index: 500 background: rgba(#FFF, 0.98) - .nav__logo - width: rem($nav-logo-width + 10) - opacity: 1 - .nav__item color: $text-1-color &.nav--active @@ -137,20 +133,10 @@ .nav__list--secondary .nav__item--round margin-left: rem(5px) -.nav__logo__options - background-image: url(./nav-logo-small_dark.png) - background-image: url(./nav-logo-small@2x_dark.png) - .nav__logo display: block - background-size:100% 100%; - width: 0 - opacity: 0 height: rem($nav-logo-height) - margin: rem((($nav-item-height - $nav-logo-height) / 2) 0) - background: no-repeat - transition: width .3s, opacity .3s - transition-timing-function: ease-out-cubic + margin: rem((($nav-item-height - $nav-logo-height) / 2) 5px) &:hover text-decoration: none diff --git a/packages/ui-default/entry.js b/packages/ui-default/entry.js index 08b540dd5..60ec942ba 100644 --- a/packages/ui-default/entry.js +++ b/packages/ui-default/entry.js @@ -46,22 +46,6 @@ document.addEventListener('DOMContentLoaded', async () => { // 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 @@