From b11b4045774608569219fb82626fcadcae9260ff Mon Sep 17 00:00:00 2001 From: morioka-hibiki Date: Tue, 25 Feb 2025 15:55:09 +0900 Subject: [PATCH 1/2] =?UTF-8?q?#account=E3=82=A8=E3=83=AA=E3=82=A2?= =?UTF-8?q?=E3=81=AB=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=E3=81=99=E3=82=8BOSS=E3=81=B8=E3=81=AE=E5=AF=BE?= =?UTF-8?q?=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sass/components/topMenu.scss | 49 +++++++++----------------------- 1 file changed, 14 insertions(+), 35 deletions(-) diff --git a/src/sass/components/topMenu.scss b/src/sass/components/topMenu.scss index adedff2..bed8afd 100644 --- a/src/sass/components/topMenu.scss +++ b/src/sass/components/topMenu.scss @@ -190,16 +190,28 @@ @apply min-h-[20px] py-1 } + // Note: ここにメニューを追加するOSSへの対策として、何もない場合はOSSアイコンを追加する + // 例）redmine work timeなど + #account ul li a { + background-image: url(images/oss_dark.svg); + @apply bg-no-repeat bg-[length:20px_20px] bg-[4px_center] + } + // 閉じているとき #account ul li a:not(.lychee-message-box-icon) { @apply block overflow-hidden indent-[100%] whitespace-nowrap } + // hoverでメニューが開いているとき + #account ul li a:not(.lychee-message-box-icon) { + @apply indent-0 pl-7 text-ellipsis + } + /* MessageBox: 閉じているとき */ #top-menu .lychee-message-box-icon.lychee-message-box-icon, #top-menu .lychee-message-box-icon.lychee-message-box-icon.unread { background-image: url(images/mail_dark.svg); - @apply block overflow-hidden indent-[100%] whitespace-nowrap relative bg-no-repeat bg-[length:20px_20px] bg-[4px_center] pl-7 + @apply block overflow-hidden indent-[100%] whitespace-nowrap relative pl-7 } #top-menu .lychee-message-box-icon.lychee-message-box-icon::before, @@ -233,59 +245,26 @@ /* 個人設定 */ #top-menu .my-account { background-image: url(images/construnction_dark.svg); - @apply bg-no-repeat bg-[length:20px_20px] bg-[4px_center] - } - - // 開いているとき - #top-menu.aw_topMenuHover .my-account { - @apply indent-0 pl-7 text-ellipsis } /* ログアウト */ #top-menu .logout { background-image: url(images/logout_dark.svg); - @apply bg-no-repeat bg-[length:20px_20px] bg-[4px_center] - } - - // 開いているとき - #top-menu.aw_topMenuHover .logout { - @apply indent-0 pl-7 text-ellipsis } - /* ログイン */ #top-menu .login { background-image: url(images/login_dark.svg); - @apply bg-no-repeat bg-[length:20px_20px] bg-[4px_center] } - // 開いているとき - #top-menu.aw_topMenuHover .login { - @apply indent-0 pl-7 text-ellipsis - } - - /* 登録する */ #top-menu .register { background-image: url(images/person_add_dark.svg); - @apply bg-no-repeat bg-[length:20px_20px] bg-[4px_center] - } - - // 開いているとき - #top-menu.aw_topMenuHover .register { - @apply indent-0 pl-7 text-ellipsis } - /* フィードバックリンク */ - .aw_fbLink { + #top-menu .aw_fbLink { background-image: url(images/feedback_dark.svg); - @apply bg-no-repeat bg-[length:20px_20px] bg-[4px_center] - } - - // 閉じているとき - #top-menu.aw_topMenuHover .aw_fbLink { - @apply indent-0 pl-7 text-ellipsis } From b43a7475eea28d07428a1693d0c10ed3c608192b Mon Sep 17 00:00:00 2001 From: morioka-hibiki Date: Tue, 25 Feb 2025 16:42:23 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=83=A2=E3=83=90=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E7=94=A8=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=81=A7=E3=82=A2?= =?UTF-8?q?=E3=82=A4=E3=82=B3=E3=83=B3=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95?= =?UTF-8?q?=E3=82=8C=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C?= =?UTF-8?q?=E3=81=AB=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sass/responsives/responsive.scss | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/sass/responsives/responsive.scss b/src/sass/responsives/responsive.scss index c6a6c63..32c245e 100644 --- a/src/sass/responsives/responsive.scss +++ b/src/sass/responsives/responsive.scss @@ -464,6 +464,12 @@ } /* アイコン */ + .flyout-menu .js-profile-menu a { + // Note: ここにメニューを追加するOSSへの対策として、何もない場合はOSSアイコンを追加する + // 例）redmine work timeなど + background-image: url(images/oss_dark.svg); + } + .flyout-menu .js-profile-menu .login { background-image: url(images/login_dark.svg); } @@ -517,7 +523,8 @@ } /* fbリンク調整 */ - .flyout-menu .aw_fbLink { + .flyout-menu .js-profile-menu .aw_fbLink { + background-image: url(images/feedback_dark.svg); padding-left: 2rem !important; }