From dfde01c9941fa13477d0a0a983765000dabde9e8 Mon Sep 17 00:00:00 2001 From: undefined Date: Fri, 11 Mar 2022 17:57:22 +0800 Subject: [PATCH] ui: set nav max line height to 70 --- .../components/navigation/navigation.page.js | 10 ++++++---- packages/ui-default/package.json | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/ui-default/components/navigation/navigation.page.js b/packages/ui-default/components/navigation/navigation.page.js index a036cd2c4..737757d81 100644 --- a/packages/ui-default/components/navigation/navigation.page.js +++ b/packages/ui-default/components/navigation/navigation.page.js @@ -73,9 +73,11 @@ function handleNavbar() { } trigger.show(); + const base = 70; + let navItems = $('.nav__list--main > .nav__list-item'); let navItem = navItems.length - 2; - while (navItem && $('#menu').children('div').height() > 45) { + while (navItem && $('#menu').children('div').height() > base) { if (!$(navItems[navItem]).children('a').hasClass('nav--active')) { $(navItems[navItem]).removeClass('nav__list-item').addClass('menu__item'); $(navItems[navItem]).children('a').removeClass('nav__item').addClass('menu__link'); @@ -86,7 +88,7 @@ function handleNavbar() { } if (!fromHide && menu.children().length) { - while ($('#menu').children('div').height() <= 45 && menu.children().length) { + while ($('#menu').children('div').height() <= base && menu.children().length) { const ele = menu.children(0); $(ele).addClass('nav__list-item').removeClass('menu__item'); $(ele).children('a').addClass('nav__item').removeClass('menu__link'); @@ -96,8 +98,8 @@ function handleNavbar() { navItems = $('.nav__list--main > .nav__list-item'); navItem = navItems.length - 2; - if ($('#menu').children('div').height() > 45) { - while (navItem && $('#menu').children('div').height() > 45) { + if ($('#menu').children('div').height() > base) { + while (navItem && $('#menu').children('div').height() > base) { if (!$(navItems[navItem]).children('a').hasClass('nav--active')) { $(navItems[navItem]).removeClass('nav__list-item').addClass('menu__item'); $(navItems[navItem]).children('a').removeClass('nav__item').addClass('menu__link'); diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index 0f4baa010..8b8f0e731 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/ui-default", - "version": "4.33.4", + "version": "4.33.5", "author": "undefined ", "license": "AGPL-3.0", "main": "hydro.js",