From f6b132a1f50e44df9c66cfce1a7ac6b2a1193118 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 29 Aug 2017 22:13:32 +0900 Subject: [PATCH] Fix #743 --- CHANGELOG.md | 1 + src/web/app/desktop/tags/timeline.tag | 22 ++++++++++++---------- src/web/app/mobile/tags/timeline.tag | 19 ++++++++++--------- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30ff40a62..06d88d08c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ChangeLog (Release Notes) unreleased ---------- +* Fix: repostのborder-radiusが効いていない (#743) * ユーザビリティの向上 2493-2 (2017/08/29) diff --git a/src/web/app/desktop/tags/timeline.tag b/src/web/app/desktop/tags/timeline.tag index 91bf7a637..bce27cd7f 100644 --- a/src/web/app/desktop/tags/timeline.tag +++ b/src/web/app/desktop/tags/timeline.tag @@ -10,16 +10,6 @@ :scope display block - > mk-timeline-post - border-bottom solid 1px #eaeaea - - &:first-child - border-top-left-radius 6px - border-top-right-radius 6px - - &:last-of-type - border-bottom none - > .date display block margin 0 @@ -166,6 +156,18 @@ margin 0 padding 0 background #fff + border-bottom solid 1px #eaeaea + + &:first-child + border-top-left-radius 6px + border-top-right-radius 6px + + > .repost + border-top-left-radius 6px + border-top-right-radius 6px + + &:last-of-type + border-bottom none &:focus z-index 1 diff --git a/src/web/app/mobile/tags/timeline.tag b/src/web/app/mobile/tags/timeline.tag index 6895384a5..43470d197 100644 --- a/src/web/app/mobile/tags/timeline.tag +++ b/src/web/app/mobile/tags/timeline.tag @@ -46,15 +46,6 @@ font-size 3em color #ccc - > mk-timeline-post - border-bottom solid 1px #eaeaea - - &:first-child - border-radius 8px 8px 0 0 - - &:last-of-type - border-bottom none - > .date display block margin 0 @@ -208,6 +199,16 @@ margin 0 padding 0 font-size 12px + border-bottom solid 1px #eaeaea + + &:first-child + border-radius 8px 8px 0 0 + + > .repost + border-radius 8px 8px 0 0 + + &:last-of-type + border-bottom none @media (min-width 350px) font-size 14px