Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change comment style #5

Merged
merged 1 commit into from
Aug 25, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/comment/CommentItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ export default {
flex-direction: column;
width: 900px;
margin: 10px auto;
border-bottom: 1px solid gray;
border-bottom: 1px solid #464343;
}
.commentItemInBox {
display: flex;
Expand Down Expand Up @@ -249,7 +249,7 @@ export default {
display: inline-block;
}
.replyContent {
color: white;
color: #c5c8c6;
height: auto;
text-align: left;
margin: -10px 10px;
Expand Down
25 changes: 13 additions & 12 deletions src/components/comment/PostReply.vue
Original file line number Diff line number Diff line change
Expand Up @@ -181,29 +181,30 @@ export default {
margin: auto auto;
}
.replyInfoBox textarea {
height: 60px;
height: 50px;
width: 700px;
margin: auto auto;
resize: none;
border-radius: 5px;
padding: 10px 10px 10px 10px;
border: 1px solid gray;
transition: border 0.2s;
background: rgba(255, 255, 255, 0.397);
background: rgb(27, 27, 33);
outline: none;
color: #c5c8c6;
}
.replyInfoBox textarea:hover {
border: 1px solid white;
border: 1px solid #583b3b;
}
.replyInfoBox textarea:focus {
border: 1px solid rgb(100, 149, 237);
border: 1px solid #3e1c1c;
}
.replyBtn {
margin: auto auto;
background: rgb(0, 164, 240);
border-radius: 10px;
height: 80px;
width: 80px;
height: 75px;
width: 75px;
display: flex;
flex-direction: column;
transition: background 0.2s;
Expand All @@ -212,7 +213,7 @@ export default {
.replyBtn p {
margin: auto auto;
width: 40px;
height: 40px;
/*height: 40px;*/
color: white;
font-weight: bold;
text-align: center;
Expand All @@ -225,10 +226,10 @@ export default {
}
.emojiBox {
background: rgba(255, 255, 255, 0.219);
color: black;
color: lightgray;
font-size: 14px;
font-weight: bold;
height: 20px;
height: 23px;
width: 60px;
line-height: 20px;
border: 1px solid black;
Expand All @@ -242,17 +243,17 @@ export default {
}
.emojiBox:hover {
color: rgb(255, 255, 255);
border: 1px solid white;
border: 1px solid #583b3b;
}
.emojiBox:active {
background: rgba(27, 27, 27, 0.219);
color: rgb(255, 255, 255);
border: 1px solid white;
border: 1px solid #3e1c1c;
}
.emojiTitle {
text-align: center;
font-size: 12px !important;
line-height: 20px;
line-height: 24px;
margin: auto auto;
}
.replyLoginTip{
Expand Down
69 changes: 58 additions & 11 deletions src/components/comment/RealComment.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,14 @@
></root-reply>
</div>
</div>
<div v-if="hotReplies && hotReplies.length!==0" class="hotLine">
<p style="color:white">------------------以上为热门评论,点击</p>
<p @click="sortByHot" style="color: rgb(24, 109, 189);font-weight:bold;cursor:pointer;">查看更多</p>
<p style="color:white">------------------</p>
<div v-if="hotReplies && hotReplies.length!==0" class="hot-line">
<span>以上为热门评论,<a class="more-hot" @click="sortByHot">查看更多</a></span>
</div>
<!--<div v-if="hotReplies && hotReplies.length!==0" class="hotLine">-->
<!--<p style="color:white">-&#45;&#45;&#45;&#45;&#45;&#45;以上为热门评论,点击</p>-->
<!--<p @click="sortByHot" style="color: rgb(24, 109, 189);font-weight:bold;cursor:pointer;">查看更多</p>-->
<!--<p style="color:white">&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;</p>-->
<!--</div>-->
<div>
<div v-for="(rootReply,index) in rootReplies" style="color:red;" :key="rootReply.rpid">
<root-reply
Expand Down Expand Up @@ -273,7 +276,7 @@
width: 900px;
margin: auto auto;
height: 50px;
border-bottom: 2px solid rgb(65, 163, 134);
border-bottom: 1px solid rgb(65, 163, 134);
}
.commentAll {
color: antiquewhite;
Expand All @@ -287,18 +290,62 @@
line-height: 30px;
cursor: pointer;
}
.hotLine {
display: flex;
flex-direction: row;
margin: auto auto;
/*.hotLine {*/
/*display: flex;*/
/*flex-direction: row;*/
/*margin: auto auto;*/
/*}*/
.hot-line{
text-align: center;
border-bottom: 1px solid #e0e3e84f;
position: relative;
margin: 40px auto;
font-size: 14px;
width: 900px;
}
.hot-line span{
position: absolute;
top: -10px;
margin-left: -115px;
padding: 0 20px;
background: #06060c;
color: #e4e4e6;
}
.more-hot{
color: rgb(67, 160, 183);
/*font-weight:bold;*/
cursor:pointer;
}
.pagination {
width: 80%;
margin: auto 0;
/*width: 80%;*/
/*margin: auto 0;*/
width: 900px;
margin: 10px auto;
}
.stickReplyBox{
border-radius: 5px;
margin: 10px auto;
width: 950px;
}
</style>
<style>
.el-pagination{
text-align: left;
}
.el-pagination button:disabled{
background-color: #06060c;
}
.el-pagination .btn-prev{
background-color: #06060c;
}
.el-pagination .btn-next{
background-color: #06060c;
}
.el-pager li{
background-color: #06060c;
}
.el-pagination__editor.el-input .el-input__inner{
background-color: #06060c;
border-color: #795548;
}
</style>
32 changes: 20 additions & 12 deletions src/components/comment/RootReply.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</a>
<div class="commentContentBox">
<div class="replyUsername">
<a :href="'#/user/'+rootReply.uid" target="_blank" style="text-decoration: none;color: rgb(127, 162, 238);">
<a :href="'#/user/'+rootReply.uid" target="_blank" style="text-decoration: none;color: #607D8B">
{{rootReply.user.nick}}
</a>
<img v-if="top" class="stickFlag" src="../../../static/img/stick.png">
Expand Down Expand Up @@ -56,7 +56,12 @@
@onShowSubReplyBox="showSubReplyBox">
</sub-reply>
</div>
<div @click="seeMore" v-show="!noMore" v-if="rootReply.rcount>3 && !page" class="seeMore">共{{rootReply.rcount}}条回复,点击查看更多</div>
<div v-if="rootReply.rcount>3 && !page" style="text-align: left;margin-bottom: 10px;">
<span style="color: #c5c8c6;font-size: 13px;">共{{rootReply.rcount}}条回复,</span>
<span @click="seeMore" v-show="!noMore" class="seeMore">点击查看更多</span>
<!--<div @click="seeMore" v-show="!noMore" v-if="rootReply.rcount>3 && !page" class="seeMore">点击查看更多</div>-->
</div>

<div v-if="noMore">
<el-pagination
v-show="noMore"
Expand Down Expand Up @@ -365,7 +370,7 @@ export default {
flex-direction: column;
width: 900px;
margin: 10px auto;
border-bottom: 1px solid gray;
border-bottom: 1px solid #504141;
}
.commentItemInBox {
display: flex;
Expand All @@ -375,13 +380,14 @@ export default {
height: 50px;
width: 50px;
border-radius: 50px;
margin: 12px auto;
cursor: pointer;
margin: 12px 10px 12px auto;
}
.commentContentBox {
margin: auto auto;
text-align: left;
position: relative;

}
.commentControlBox {
display: flex;
Expand Down Expand Up @@ -409,7 +415,7 @@ export default {
margin-left: 5px;
}
.replyContent {
color: white;
color: #c5c8c6;
height: auto;
text-align: left;
margin: -8px 10px;
Expand Down Expand Up @@ -439,18 +445,19 @@ export default {
cursor: pointer;
}
.commentUpvote img {
width: 20px;
height: 20px;
width: 17px;
height: 17px;
margin: auto auto;
}
.commentUpvote p {
font-size: 12px;
margin: auto auto;
color: gray;
padding-left: 3px;
}
.commentReplyBtn {
margin: auto 10px;
color: rgb(24, 109, 189);
color: rgb(87, 117, 146);
}
.commentDeleteBtn {
margin: auto auto;
Expand All @@ -468,12 +475,13 @@ export default {
margin-bottom: 10px;
}
.seeMore {
color: rgb(127, 162, 238);
color: rgb(67, 160, 183);
font-size: 13px;
font-weight: bold;
margin-bottom: 10px;
/*font-weight: bold;*/
/*margin-bottom: 10px;*/
text-align: left;
margin-left: 50px;
/*margin-left: 50px;*/
cursor: pointer;
}
.childRepliesPageBox {
display: flex;
Expand Down
26 changes: 14 additions & 12 deletions src/components/comment/SubReply.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</a>
<div class="commentChildContentBox">
<div class="replyChildUsername">
<a :href="'#/user/'+subReply.uid" target="_blank" style="text-decoration: none;color: rgb(127, 162, 238);">
<a :href="'#/user/'+subReply.uid" target="_blank" style="text-decoration: none;color: #607D8B;">
{{subReply.user.nick}}
</a>
<div class="adminBoxOutBox" tabindex="1" @blur="showAdminBox=false">
Expand Down Expand Up @@ -186,7 +186,7 @@
.replyChildUsername {
text-align: left;
font-weight: bold;
font-size: 13px;
/*font-size: 13px;*/
margin: 10px 10px;
color: rgb(127, 162, 238);
position: relative;
Expand All @@ -203,10 +203,10 @@
cursor: pointer;
}
.replyChildContent {
color: white;
color: #c5c8c6;
height: auto;
text-align: left;
font-size: 13px;
/*font-size: 13px;*/
margin: -8px 10px;
width: 770px;
word-wrap: break-word;
Expand All @@ -219,29 +219,31 @@
position: relative;
}
.commentChildTime {
font-size: 10px;
margin: auto 0px;
font-size: 13px;
margin: auto 0;
color: gray;
}
.commentChildUpvote {
display: flex;
flex-direction: row;
margin: auto 5px;
margin: auto 10px;
cursor: pointer;
}
.commentChildUpvote img {
width: 15px;
height: 15px;
width: 17px;
height: 17px;
margin: auto auto;
}
.commentChildUpvote p {
font-size: 10px;
font-size: 13px;
margin: auto auto;
color: gray;
padding-left: 3px;
}
.commentChildReplyBtn {
margin: auto 10px;
color: rgb(24, 109, 189);
color: rgb(87, 117, 146);
font-size: 13px;
}
.commentChildDeleteBtn {
margin: auto auto;
Expand All @@ -250,7 +252,7 @@
}
.commentChildDeleteBtn,
.commentChildReplyBtn {
font-size: 11px;
font-size: 13px;
cursor: pointer;
font-weight: bold;
}
Expand Down