Skip to content

Commit

Permalink
Merge pull request #1 from YamiOdymel/master
Browse files Browse the repository at this point in the history 
錯字：Perview -> Preview
  • Loading branch information
@gnehs
gnehs authored Jul 3, 2018
2 parents c097ccb + 31cbd45 commit 3ba9348
Show file tree
Hide file tree
Showing 8 changed files with 57 additions and 57 deletions.
46 changes: 23 additions & 23 deletions css/ChatUI.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/ChatUI.min.css
View file

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions sass/_Style_Messenger.sass
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
>img+.text,>iframe+.text,>video+.text
margin-top: 0.2em
border-top-left-radius: 0.25em
&.perview
&.preview
background: #000
>.perview
>.preview
margin-top: 0.2em
border: 1px solid #eee
border-radius: 1.219em
Expand Down Expand Up @@ -82,24 +82,24 @@
&>.author
display: none
>.content
>.text,>img,>iframe,>video,>.perview
>.text,>img,>iframe,>video,>.preview
border-radius: 0.25em 1.219em 1.219em 0.25em !important
// todo n-1 last-child
&:first-child:not(.img):not(.iframe):not(.video):not(.perview)
&:first-child:not(.img):not(.iframe):not(.video):not(.preview)
&>.content
&>.text
border-radius: 1.219em 1.219em 1.219em 0.25em !important
&:last-child:not(.img):not(.iframe):not(.video):not(.perview)
&:last-child:not(.img):not(.iframe):not(.video):not(.preview)
&>.content
&>.text
border-radius: 0.25em 1.219em 1.219em 1.219em !important
&.img:first-child,&.iframe:first-child,&.video:first-child,&.perview:first-child
&.img:first-child,&.iframe:first-child,&.video:first-child,&.preview:first-child
&>.content
&>img,&>iframe,&>video,&>.perview
&>img,&>iframe,&>video,&>.preview
border-radius: 1.219em 1.219em 1.219em 0.25em!important
&.img:last-child,&.iframe:last-child,&.video:last-child,&.perview:last-child
&.img:last-child,&.iframe:last-child,&.video:last-child,&.preview:last-child
&>.content
&>img,&>iframe,&>video,&>.perview
&>img,&>iframe,&>video,&>.preview
border-radius: 0.25em 1.219em 1.219em 1.219em !important

&.right
Expand All @@ -112,27 +112,27 @@
>.content
>.author
display: none
&:first-child:not(.img):not(.iframe):not(.video):not(.perview)
&:first-child:not(.img):not(.iframe):not(.video):not(.preview)
>.content
>.text
border-radius: 1.219em 1.219em 0.25em 1.219em !important
&:last-child:not(.img):not(.iframe):not(.video):not(.perview)
&:last-child:not(.img):not(.iframe):not(.video):not(.preview)
>.content
>.text
border-radius: 1.219em 0.25em 1.219em 1.219em !important
&.img:first-child,&.iframe:first-child,&.video:first-child,&.perview:first-child
&.img:first-child,&.iframe:first-child,&.video:first-child,&.preview:first-child
>.content
>img,>iframe,>video,>.perview
>img,>iframe,>video,>.preview
border-radius: 1.219em 1.219em 0.25em 1.219em !important
&.img:last-child,&.iframe:last-child,&.video:last-child,&.perview:last-child
&.img:last-child,&.iframe:last-child,&.video:last-child,&.preview:last-child
>.content
>img,>iframe,>video,>.perview
>img,>iframe,>video,>.preview
border-radius: 1.219em 0.25em 1.219em 1.219em !important

/* RWD */
@media(max-width: 768px)
.cu.chat[data-style="messenger"]
.message
>.content
>.text,>.perview>img
>.text,>.preview>img
max-width: 80vw
10 changes: 5 additions & 5 deletions sass/_Style_Telegram.sass
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.cu.chat[data-style="telegram"]
&.sticky>divider //js need
&.sticky>divider //js need
top: .4em
position: sticky
& .message
Expand Down Expand Up @@ -79,7 +79,7 @@
line-height: 1.22em
>.author
color: #37a1de
>.perview
>.preview
border-left: 0.125em solid #37a1de
padding-left: 0.625em
margin: 0.313em 0.750em 0.313em 0.750em
Expand All @@ -100,7 +100,7 @@
&>.item
font-size: .9em
color: #d1d1d1
>.perview+.meta
>.preview+.meta
margin-top: .2em
// 右側訊息
&.right
Expand All @@ -113,15 +113,15 @@
>.meta
&>.item
color: #78c67f

>.text>*:last-child:after
width: 3.75em
>.reply
margin: 0 0.750em 0.313em 0.750em
border-left: 0.125em solid rgb(93,196,82)
&>.author
color: rgb(93,196,82)
>.perview
>.preview
border-left: 0.125em solid rgb(93,196,82)
>.title
color: rgb(93,196,82)
Expand Down
8 changes: 4 additions & 4 deletions test/testMsgr.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,12 @@
</div>
</div>
<!-- 連結預覽-->
<div class="message text perview">
<div class="message text preview">
<div class="avatar"><img src="https://i.imgur.com/6oTWGHZ.png"/></div>
<div class="content">
<div class="author">熊貓貓</div>
<div class="text"><a href="https://gnehs.net/">https://gnehs.net/</a></div>
<div class="perview"><img src="https://avatars0.githubusercontent.com/u/16719720"/>
<div class="preview"><img src="https://avatars0.githubusercontent.com/u/16719720"/>
<div class="title">棒棒勝</div>
<div class="description">住在某鬼島ㄉ高中生</div>
<div class="domain">gnehs.net</div>
Expand Down Expand Up @@ -161,12 +161,12 @@
</div>
</div>
<!-- 連結預覽-->
<div class="message text right perview">
<div class="message text right preview">
<div class="avatar"><img src="https://i.imgur.com/6oTWGHZ.png"/></div>
<div class="content">
<div class="author">熊貓貓</div>
<div class="text"><a href="https://gnehs.net/">https://gnehs.net/</a></div>
<div class="perview"><img src="https://avatars0.githubusercontent.com/u/16719720"/>
<div class="preview"><img src="https://avatars0.githubusercontent.com/u/16719720"/>
<div class="title">棒棒勝</div>
<div class="description">住在某鬼島ㄉ高中生</div>
<div class="domain">gnehs.net</div>
Expand Down
8 changes: 4 additions & 4 deletions test/testMsgr.pug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,14 @@ html
.meta
.item 15:38
// 連結預覽
.message.text.perview
.message.text.preview
.avatar
img(src='https://i.imgur.com/6oTWGHZ.png')
.content
.author 熊貓貓
.text
a(href='https://gnehs.net/') https://gnehs.net/
.perview
.preview
img(src='https://avatars0.githubusercontent.com/u/16719720')
.title 棒棒勝
.description 住在某鬼島ㄉ高中生
Expand Down Expand Up @@ -131,14 +131,14 @@ html
.meta
.item 16:02
// 連結預覽
.message.text.right.perview
.message.text.right.preview
.avatar
img(src='https://i.imgur.com/6oTWGHZ.png')
.content
.author 熊貓貓
.text
a(href='https://gnehs.net/') https://gnehs.net/
.perview
.preview
img(src='https://avatars0.githubusercontent.com/u/16719720')
.title 棒棒勝
.description 住在某鬼島ㄉ高中生
Expand Down
4 changes: 2 additions & 2 deletions test/testTele.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,12 @@
</div>
</div>
<!-- 連結預覽-->
<div class="message text right perview">
<div class="message text right preview">
<div class="avatar"><img src="https://i.imgur.com/6oTWGHZ.png"/></div>
<div class="content">
<div class="author">熊貓貓</div>
<div class="text"><a href="https://gnehs.net/">https://gnehs.net/</a></div>
<div class="perview">
<div class="preview">
<div class="title">棒棒勝</div>
<div class="header">可愛ㄉ棒棒勝喔</div>
<div class="description">住在某鬼島ㄉ高中生</div><img src="https://avatars0.githubusercontent.com/u/16719720"/>
Expand Down
4 changes: 2 additions & 2 deletions test/testTele.pug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,14 +114,14 @@ html
.meta
.item 16:02
// 連結預覽
.message.text.right.perview
.message.text.right.preview
.avatar
img(src='https://i.imgur.com/6oTWGHZ.png')
.content
.author 熊貓貓
.text
a(href='https://gnehs.net/') https://gnehs.net/
.perview
.preview
.title 棒棒勝
.header 可愛ㄉ棒棒勝喔
.description 住在某鬼島ㄉ高中生
Expand Down

0 comments on commit 3ba9348

Please sign in to comment.