summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo⭐️ <Syuilotan@yahoo.co.jp>2017-02-18 18:42:13 +0900
committerGitHub <noreply@github.com>2017-02-18 18:42:13 +0900
commita57ff16fd7dbbc1827bdee0892c06b64c991ceb2 (patch)
treebd74d740f898be0e5285a2b72dbc7a9c32c35cf3 /src
parent[Client] Fix bug (diff)
parentタイムラインヘッダー訂正 (diff)
downloadsharkey-a57ff16fd7dbbc1827bdee0892c06b64c991ceb2.tar.gz
sharkey-a57ff16fd7dbbc1827bdee0892c06b64c991ceb2.tar.bz2
sharkey-a57ff16fd7dbbc1827bdee0892c06b64c991ceb2.zip
Merge pull request #180 from tamaina/lets_flex
投稿表示`header`改良
Diffstat (limited to 'src')
-rw-r--r--src/web/app/desktop/tags/post-preview.tag14
-rw-r--r--src/web/app/desktop/tags/timeline-post-sub.tag1
-rw-r--r--src/web/app/mobile/tags/timeline-post-sub.tag1
-rw-r--r--src/web/app/mobile/tags/timeline-post.tag3
4 files changed, 9 insertions, 10 deletions
diff --git a/src/web/app/desktop/tags/post-preview.tag b/src/web/app/desktop/tags/post-preview.tag
index b088ceaac9..f36a2a1868 100644
--- a/src/web/app/desktop/tags/post-preview.tag
+++ b/src/web/app/desktop/tags/post-preview.tag
@@ -45,31 +45,31 @@
width calc(100% - 68px)
> header
- margin-bottom 4px
+ display flex
+ margin 4px 0
white-space nowrap
> .name
- display inline
- margin 0
+ margin 0 .5em 0 0
padding 0
color #607073
font-size 1em
+ line-height 1.1em
font-weight 700
text-align left
text-decoration none
+ white-space normal
&:hover
text-decoration underline
> .username
text-align left
- margin 0 0 0 8px
+ margin 0 .5em 0 0
color #d1d8da
> .time
- position absolute
- top 0
- right 0
+ margin-left auto
color #b2b8bb
> .body
diff --git a/src/web/app/desktop/tags/timeline-post-sub.tag b/src/web/app/desktop/tags/timeline-post-sub.tag
index 98686ae212..54e308d76d 100644
--- a/src/web/app/desktop/tags/timeline-post-sub.tag
+++ b/src/web/app/desktop/tags/timeline-post-sub.tag
@@ -63,6 +63,7 @@
display block
margin 0 .5em 0 0
padding 0
+ overflow hidden
color #607073
font-size 1em
font-weight 700
diff --git a/src/web/app/mobile/tags/timeline-post-sub.tag b/src/web/app/mobile/tags/timeline-post-sub.tag
index d6b0d808ff..3d3a1a9210 100644
--- a/src/web/app/mobile/tags/timeline-post-sub.tag
+++ b/src/web/app/mobile/tags/timeline-post-sub.tag
@@ -56,7 +56,6 @@
> header
display flex
- flex-wrap wrap
margin-bottom 2px
white-space nowrap
diff --git a/src/web/app/mobile/tags/timeline-post.tag b/src/web/app/mobile/tags/timeline-post.tag
index ff4007f0c9..8a4cd9e0c1 100644
--- a/src/web/app/mobile/tags/timeline-post.tag
+++ b/src/web/app/mobile/tags/timeline-post.tag
@@ -147,7 +147,6 @@
> header
display flex
- flex-wrap wrap
white-space nowrap
@media (min-width 500px)
@@ -179,7 +178,7 @@
> .username
text-align left
- margin 0
+ margin 0 0.5em 0 0
color #ccc
> .created-at