From 0624fb83adf5a75b7d1348fa88078cb46b02cf21 Mon Sep 17 00:00:00 2001 From: machida Date: Thu, 8 Feb 2024 11:07:52 +0900 Subject: [PATCH] =?UTF-8?q?=E7=B4=B9=E4=BB=8B=E8=A8=98=E4=BA=8B=E3=81=A7?= =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC=E3=82=A2=E3=82=A4=E3=82=B3?= =?UTF-8?q?=E3=83=B3=E7=B5=B5=E6=96=87=E5=AD=97=E3=81=8C=E3=82=BA=E3=83=AC?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stylesheets/atoms/_a-user-icon.sass | 20 ------------ .../config/mixins/_long-text-style.sass | 31 ++++++++++++++++--- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/app/javascript/stylesheets/atoms/_a-user-icon.sass b/app/javascript/stylesheets/atoms/_a-user-icon.sass index 5787d7ff272..9e15d33cf70 100644 --- a/app/javascript/stylesheets/atoms/_a-user-icon.sass +++ b/app/javascript/stylesheets/atoms/_a-user-icon.sass @@ -12,23 +12,3 @@ +size(1.5rem) +media-breakpoint-down(sm) +size(1.125rem) - -.a-long-text - .a-user-emoji-link - +size(2em) - display: inline-block - &:not(:first-child) - margin-left: .5em - .header-anchor + .a-user-emoji-link - margin-left: 0 - .a-user-emoji - +size(1.8em) - object-fit: cover - background-color: var(--base) - border-radius: 2px - display: inline-block !important - border: none !important - margin-left: 0 !important - margin-right: 0 !important - .articles & .a-user-emoji-link - pointer-events: none diff --git a/app/javascript/stylesheets/config/mixins/_long-text-style.sass b/app/javascript/stylesheets/config/mixins/_long-text-style.sass index da2d2f647e8..2810db8e169 100644 --- a/app/javascript/stylesheets/config/mixins/_long-text-style.sass +++ b/app/javascript/stylesheets/config/mixins/_long-text-style.sass @@ -311,11 +311,6 @@ +speak - *:first-child - margin-top: 0 - *:last-child - margin-bottom: 0 - // header-anchor h1, h2, @@ -346,3 +341,29 @@ &:link, &:visited color: var(--main) + + .a-user-emoji-link + +size(2em) + display: inline-block + &:not(:first-child) + margin-left: .5em + .header-anchor + .a-user-emoji-link + margin-left: 0 + .a-user-emoji + +size(1.8em) + object-fit: cover + background-color: var(--base) + border-radius: 2px + display: inline-block !important + border: none !important + margin-left: 0 !important + margin-right: 0 !important + vertical-align: middle + body.articles & .a-user-emoji-link, + body.buzz & .a-user-emoji-link + pointer-events: none + + *:first-child + margin-top: 0 + *:last-child + margin-bottom: 0