Skip to content

Commit

Permalink
Merge pull request #7338 from fjordllc/image-in-long-text
Browse files Browse the repository at this point in the history
紹介記事でユーザーアイコン絵文字がズレていたのを修整
  • Loading branch information
machida authored Feb 8, 2024
2 parents 2803b32 + 0624fb8 commit af01eb0
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 25 deletions.
20 changes: 0 additions & 20 deletions app/javascript/stylesheets/atoms/_a-user-icon.sass
Original file line number Diff line number Diff line change
Expand Up @@ -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
31 changes: 26 additions & 5 deletions app/javascript/stylesheets/config/mixins/_long-text-style.sass
Original file line number Diff line number Diff line change
Expand Up @@ -311,11 +311,6 @@

+speak

*:first-child
margin-top: 0
*:last-child
margin-bottom: 0

// header-anchor
h1,
h2,
Expand Down Expand Up @@ -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

0 comments on commit af01eb0

Please sign in to comment.