From 08796015e29dd8aba38519db1a36bbf745488d34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=AA=E3=82=B9=E3=82=AB=E3=83=BC=E3=80=81?= Date: Wed, 9 Oct 2024 19:04:49 +0900 Subject: [PATCH] Merge upstream (Tangerine UI) --- .../tangerineui-cherry/tangerineui-cherry.scss | 14 ++++++++++++-- .../tangerineui-lagoon/tangerineui-lagoon.scss | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss b/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss index 8d3a225e4b..9d880f9eab 100644 --- a/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss +++ b/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss @@ -8,7 +8,7 @@ /* 📄 Meta */ :root { - --version: "v2.0.0-pre7~"; + --version: "v2.0"; --variant-name: "Cherry"; --variant-emoji: "\1F352\00A0"; @@ -4098,9 +4098,19 @@ button { border: 0; z-index: 1; } -.app-body .compose-panel hr, .navigation-panel hr { +.app-body .compose-panel hr, +.app-body .navigation-panel .list-panel hr { display: none; } + +@media screen and (min-width:1175px) { + .app-body .navigation-panel hr:has(+ .column-link[href="/settings/preferences"]) { + margin-right: 25px; + margin-left: 10px; + margin-bottom: 12px; + border-color: var(--color-lines); + } +} .app-body .column-link span { vertical-align: middle; } diff --git a/app/javascript/styles/tangerineui-lagoon/tangerineui-lagoon.scss b/app/javascript/styles/tangerineui-lagoon/tangerineui-lagoon.scss index 9134639c7d..fa0bf419e8 100644 --- a/app/javascript/styles/tangerineui-lagoon/tangerineui-lagoon.scss +++ b/app/javascript/styles/tangerineui-lagoon/tangerineui-lagoon.scss @@ -8,7 +8,7 @@ /* 📄 Meta */ :root { - --version: "v2.0.0-pre7~"; + --version: "v2.0"; --variant-name: "Lagoon"; --variant-emoji: "\1F420\00A0"; @@ -4098,9 +4098,19 @@ button { border: 0; z-index: 1; } -.app-body .compose-panel hr, .navigation-panel hr { +.app-body .compose-panel hr, +.app-body .navigation-panel .list-panel hr { display: none; } + +@media screen and (min-width:1175px) { + .app-body .navigation-panel hr:has(+ .column-link[href="/settings/preferences"]) { + margin-right: 25px; + margin-left: 10px; + margin-bottom: 12px; + border-color: var(--color-lines); + } +} .app-body .column-link span { vertical-align: middle; }