diff --git a/install/install.js b/install/install.js index 473bc76f5..dd8bab616 100644 --- a/install/install.js +++ b/install/install.js @@ -187,7 +187,8 @@ apt-get -qq update && apt-get -q install -y mongodb-org`, { retry: true }], init: '正在启动 / Starting', operations: [ () => { - [MINIO_ACCESS_KEY, MINIO_SECRET_KEY] = fs.readfile('/root/.hydro/env').split('\n').map((i) => i.split('=')[1].trim()); + [MINIO_ACCESS_KEY, MINIO_SECRET_KEY] = fs.readfile('/root/.hydro/env') + .split('\n').filter((i) => i.trim()).map((i) => i.split('=')[1].trim()); }, `pm2 start "MINIO_ACCESS_KEY=${MINIO_ACCESS_KEY} MINIO_SECRET_KEY=${MINIO_SECRET_KEY} minio server /data/file" --name minio`, 'pm2 start "mongod --auth --bind_ip 0.0.0.0" --name mongodb', @@ -202,7 +203,8 @@ apt-get -qq update && apt-get -q install -y mongodb-org`, { retry: true }], init: '安装完成 / Install done', operations: [ () => { - [MINIO_ACCESS_KEY, MINIO_SECRET_KEY] = fs.readfile('/root/.hydro/env').split('\n').map((i) => i.split('=')[1].trim()); + [MINIO_ACCESS_KEY, MINIO_SECRET_KEY] = fs.readfile('/root/.hydro/env') + .split('\n').filter((i) => i.trim()).map((i) => i.split('=')[1].trim()); DATABASE_PASSWORD = loadconfig('/root/.hydro/config.json').password; }, () => log.info('请重启终端并切换到 root 用户执行其他操作'), diff --git a/packages/ui-default/components/header/header-background.png b/packages/ui-default/components/header/header-background.png deleted file mode 100644 index ae4c578af..000000000 Binary files a/packages/ui-default/components/header/header-background.png and /dev/null differ diff --git a/packages/ui-default/components/header/header-background@2x.png b/packages/ui-default/components/header/header-background@2x.png deleted file mode 100644 index 8d6d2692e..000000000 Binary files a/packages/ui-default/components/header/header-background@2x.png and /dev/null differ diff --git a/packages/ui-default/components/header/header-logo-summer.png b/packages/ui-default/components/header/header-logo-summer.png deleted file mode 100644 index eaf4fda4c..000000000 Binary files a/packages/ui-default/components/header/header-logo-summer.png and /dev/null differ diff --git a/packages/ui-default/components/header/header-logo-summer@2x.png b/packages/ui-default/components/header/header-logo-summer@2x.png deleted file mode 100644 index e4ab84b54..000000000 Binary files a/packages/ui-default/components/header/header-logo-summer@2x.png and /dev/null differ diff --git a/packages/ui-default/components/header/header-logo.png b/packages/ui-default/components/header/header-logo.png deleted file mode 100644 index 13dab1386..000000000 Binary files a/packages/ui-default/components/header/header-logo.png and /dev/null differ diff --git a/packages/ui-default/components/header/header-logo@2x.png b/packages/ui-default/components/header/header-logo@2x.png deleted file mode 100644 index 9e032946c..000000000 Binary files a/packages/ui-default/components/header/header-logo@2x.png and /dev/null differ diff --git a/packages/ui-default/components/header/header.page.styl b/packages/ui-default/components/header/header.page.styl index c28d262f6..c30b68cd5 100644 --- a/packages/ui-default/components/header/header.page.styl +++ b/packages/ui-default/components/header/header.page.styl @@ -8,10 +8,6 @@ $header-gap-mini-domain = ($header-bg-height-mini - $nav-item-height - $header-l &.warning background: #ffe1a6 -.header__options - background-image: url(./header-background.png) - background-image: url(./header-background@2x.png) - .header position: relative height: rem($header-bg-height) @@ -32,12 +28,6 @@ $header-gap-mini-domain = ($header-bg-height-mini - $nav-item-height - $header-l .header__content display: none -.header__logo__options - background-image: url(./header-logo.png) - background-image: url(./header-logo@2x.png) - background-image: url(./header-logo-summer.png) - background-image: url(./header-logo-summer@2x.png) - .header__logo display: block width: rem($header-logo-width-real) @@ -52,35 +42,6 @@ $header-gap-mini-domain = ($header-bg-height-mini - $nav-item-height - $header-l +mobile() display: inline-block -.header__logo--domain - font-size: rem(40px) - margin-top: rem($header-gap-mini-domain + $nav-item-height) - height: rem($header-logo-domain-lh) - line-height: rem($header-logo-domain-lh) - - a - text-shadow: 1px 1px 5px rgba(#000, 0.4) - - &, &:hover, &:visited, &:link - color: #FFF - text-decoration: none - -.header__logo--system - line-height: rem($header-logo-system-lh) - color: #FFF - font-size: rem($font-size-small) - - a - opacity: 0.8 - - &, &:hover, &:visited, &:link - text-decoration: none - color: #FFF - - &:hover - opacity: 1 - text-decoration: underline - .header--collapsed #panel @@ -115,30 +76,6 @@ $header-gap-mini-domain = ($header-bg-height-mini - $nav-item-height - $header-l +mobile() display: block -.header.mini .location - display: none - -.location-path - color: rgba(#FFF, 0.3) - line-height: rem(30px) - margin-top: rem(10px) - a, a:visited - color: rgba(#FFF, 0.6) - a:hover - color: rgba(#FFF, 0.9) - -.location-current - color: #9ad4f1 - line-height: rem(40px) - white-space: nowrap - overflow: hidden - text-overflow: ellipsis - - +mobile() - color: #91fcff - font-size: 1.7rem - white-space: normal - .header--mobile display: none @@ -162,13 +99,6 @@ $header-gap-mini-domain = ($header-bg-height-mini - $nav-item-height - $header-l +retina() background-size: $nav-logo-width $nav-logo-height // no rem -.header--mobile__system - margin-left: rem(10px) - font-size: rem($font-size-secondary) - - &, &:hover, &:visited - color: $supplementary-color - .header__hamburger background: none border: 0 diff --git a/packages/ui-default/components/navigation/navigation.page.styl b/packages/ui-default/components/navigation/navigation.page.styl index 55ae1b6d2..7f272bf5f 100644 --- a/packages/ui-default/components/navigation/navigation.page.styl +++ b/packages/ui-default/components/navigation/navigation.page.styl @@ -38,6 +38,9 @@ background-color: $primary-color color: #FFF + a + color: $primary-color + .hasjs & position: fixed diff --git a/packages/ui-default/locales/zh.yaml b/packages/ui-default/locales/zh.yaml index abc7eadc3..2b50d46b3 100644 --- a/packages/ui-default/locales/zh.yaml +++ b/packages/ui-default/locales/zh.yaml @@ -325,10 +325,6 @@ Hard Deadline: 最终截止时间 Hash: 散列 Have ALL PERMISSIONS in this domain: 在此域中拥有全部权限 He: 他 -Header Background: 顶部背景 -Header Background@2x: 顶部背景（大） -Header Logo: 顶部图标 -Header Logo@2x: 顶部图标（大） Help: 帮助 Hidden: 隐藏 Hide all tags: 隐藏所有标签 diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index 4fb17b452..da37173ba 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/ui-default", - "version": "4.10.1", + "version": "4.10.2", "author": "undefined ", "license": "AGPL-3.0", "main": "hydro.js", diff --git a/packages/ui-default/templates/partials/header_mobile.html b/packages/ui-default/templates/partials/header_mobile.html index 266770a73..c286b3151 100644 --- a/packages/ui-default/templates/partials/header_mobile.html +++ b/packages/ui-default/templates/partials/header_mobile.html @@ -2,7 +2,7 @@
-   +  
{% include "partials/hamburger.html" %}