From 6bf97f6e49fde6779f5a46e064b2e252caf42ba0 Mon Sep 17 00:00:00 2001 From: Mimi <1119186082@qq.com> Date: Wed, 17 Apr 2024 01:30:15 +0800 Subject: [PATCH] Refactor .menu-item style --- source/css/_common/outline/header/menu.styl | 10 ---------- source/css/_mixins.styl | 9 +++++++++ source/css/_schemes/Mist/_menu.styl | 2 ++ source/css/_schemes/Muse/_menu.styl | 2 ++ source/css/_schemes/Pisces/_menu.styl | 4 +--- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/source/css/_common/outline/header/menu.styl b/source/css/_common/outline/header/menu.styl index 377f1e1..2f23ee0 100644 --- a/source/css/_common/outline/header/menu.styl +++ b/source/css/_common/outline/header/menu.styl @@ -36,18 +36,8 @@ } .badge { - display: inline-block; font-weight: bold; line-height: 1; - margin-left: .35em; - margin-top: .35em; - text-align: center; - white-space: nowrap; - - +mobile() { - float: right; - margin-left: 0; - } } } diff --git a/source/css/_mixins.styl b/source/css/_mixins.styl index 2cb0470..d5e7278 100644 --- a/source/css/_mixins.styl +++ b/source/css/_mixins.styl @@ -272,3 +272,12 @@ gemini-block-not-first() { margin-top: $content-mobile-padding; } } + +menu-item-row() { + display: flex; + align-items: center; + + .badge { + margin-left: auto; + } +} diff --git a/source/css/_schemes/Mist/_menu.styl b/source/css/_schemes/Mist/_menu.styl index 6c15a5a..9f87c0a 100644 --- a/source/css/_schemes/Mist/_menu.styl +++ b/source/css/_schemes/Mist/_menu.styl @@ -31,6 +31,7 @@ +mobile() { text-align: left; + menu-item-row(); } } @@ -38,6 +39,7 @@ background: white; border-radius: 10px; color: $black-light; + margin-left: .35em; padding: 1px 4px; text-shadow: 1px 1px 0 rgba(0, 0, 0, .1); } diff --git a/source/css/_schemes/Muse/_menu.styl b/source/css/_schemes/Muse/_menu.styl index d583618..b9b21e4 100644 --- a/source/css/_schemes/Muse/_menu.styl +++ b/source/css/_schemes/Muse/_menu.styl @@ -27,6 +27,7 @@ +mobile() { padding: 5px 10px; + menu-item-row(); } &:hover, &.menu-item-active { @@ -51,6 +52,7 @@ .badge { background: $gainsboro; color: $black-light; + margin-left: .35em; padding: 1px 4px; } } diff --git a/source/css/_schemes/Pisces/_menu.styl b/source/css/_schemes/Pisces/_menu.styl index 79b1c20..6f3e9eb 100644 --- a/source/css/_schemes/Pisces/_menu.styl +++ b/source/css/_schemes/Pisces/_menu.styl @@ -10,9 +10,8 @@ a { padding: 5px 20px; - position: relative; - text-align: left; transition-property: background-color; + menu-item-row(); } +tablet-mobile() { @@ -25,7 +24,6 @@ background: $grey-light; border-radius: 10px; color: var(--content-bg-color); - float: right; padding: 2px 5px; text-shadow: 1px 1px 0 rgba(0, 0, 0, .1); }