Skip to content

Commit

Permalink
样式微调
Browse files Browse the repository at this point in the history
  • Loading branch information
jjj201200 committed Dec 26, 2017
1 parent daabca1 commit 4b9f6cc
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 3 deletions.
3 changes: 1 addition & 2 deletions src/bilibili_live.js
Original file line number Diff line number Diff line change
Expand Up @@ -2144,9 +2144,8 @@
const infoBox = Live.giftpackage.linkBoxGiftInfo.clone().append(
items,
$('<div class="intimacy"></div>').append(
`${hasMedal ? '' : '无勋章'}`,
!hasMedal && hasWearedMedal ? medalDOM : '',
` 共计增加亲密度:${intimacyData.intimacy}⬆ + ${wearedMedal.intimacy} / ${wearedMedal.next_intimacy}`
` 共计增加亲密度:<span class="up">${intimacyData.intimacy}</span> + ${wearedMedal.intimacy} / ${wearedMedal.next_intimacy}`
)
).on('DOMMouseScroll mousewheel', Live.scrollEvent);
if (!hasMedal) {
Expand Down
16 changes: 15 additions & 1 deletion src/live.css
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@
overflow: auto;
margin-bottom: 10px;
}
.gift-info.not-weared {
.gift-info.not-weared, .gift-info.no-medal {
border: 1px solid #f39c9c;
border-radius: 4px;
padding: 17px 0 3px;
Expand All @@ -492,10 +492,24 @@
color: #fff;
border-radius: 0 0 4px 0;
}
.gift-info.no-medal::after{
content: '无勋章';
display: block;
position: absolute;
top: 0px;
left: 0px;
padding: 2px;
background-color: #ff5858;
color: #fff;
border-radius: 0 0 4px 0;
}
.gift-info .intimacy {
text-align: center;
line-height: 16px;
}
.gift-info .intimacy .up{
color: #ff5858;
}
.gift-info .intimacy .fans-medal-item {
position: relative;
top: -1px;
Expand Down

0 comments on commit 4b9f6cc

Please sign in to comment.