From 7cb8d0fbeb8ed5ac4f22c86adeb08d0c8389fc9b Mon Sep 17 00:00:00 2001 From: Van Date: Mon, 12 Nov 2018 18:02:07 +0800 Subject: [PATCH] https://github.com/b3log/solo/issues/12570 --- nijigen/css/base.css | 82 ++++++++++++++++++------------ nijigen/css/base.scss | 43 +++++++++++++--- nijigen/lang/lang_en_US.properties | 3 +- nijigen/lang/lang_zh_CN.properties | 3 +- nijigen/macro-comments.ftl | 1 + 5 files changed, 91 insertions(+), 41 deletions(-) diff --git a/nijigen/css/base.css b/nijigen/css/base.css index c091a26..6b966dc 100644 --- a/nijigen/css/base.css +++ b/nijigen/css/base.css @@ -20,7 +20,7 @@ * skin style * * @author Liyuan Li - * @version 0.2.0.0, Sep 25, 2018 + * @version 0.3.0.0, Nov 12, 2018 */ /* * Symphony - A modern community (forum/BBS/SNS/blog) platform written in Java. @@ -513,7 +513,7 @@ blockquote { * comment * * @author Liyuan Li - * @version 0.1.0.0, Sep 1, 2018 + * @version 0.2.0.0, Nov 12, 2018 */ .em00, .em01, .em02, .em03, .em04, .em05, .em06, .em07, .em08, .em09, .em10, .em11, .em12, .em13, .em14 { cursor: pointer; @@ -527,7 +527,8 @@ blockquote { -webkit-transition: all .2s ease-out; -moz-transition: all .2s ease-out; } -#emotions span:hover { +#emotions span:hover, +#emotionsReply span:hover { transform: scale(1.2) rotate(360deg); -webkit-transform: scale(1.2) rotate(360deg); -moz-transform: scale(1.2) rotate(360deg); } @@ -1022,6 +1023,8 @@ a { background-color: #fff; } .comments__item:hover .comments__meta { background-color: #d9edf7; } + .comments__item:hover .comments__reply:after { + background-color: #d9edf7; } .comments__meta { border-radius: 5px 5px 0 0; min-height: 37px; @@ -1040,8 +1043,10 @@ a { .comments__content { border-radius: 0 0 5px 5px; background-color: rgba(255, 255, 255, 0.8); - padding: 15px 15px 15px 45px; + padding: 15px 45px; position: relative; } + .comments__content textarea { + margin: 15px 0; } .comments__avatar { position: absolute; height: 54px; @@ -1058,6 +1063,16 @@ a { .comments__reply { border-radius: 5px; margin: 15px auto 0; } + .comments__reply #cancelCommentButton { + line-height: 34px; } + .comments__reply:after { + content: " "; + position: absolute; + height: 15px; + width: 5px; + right: 60px; + top: -15px; + background-color: rgba(217, 237, 247, 0.6); } .comment-body-ref { right: 0; @@ -1066,30 +1081,30 @@ a { .comment-body-ref .breadcrumb { display: none; } -.form input, -.form textarea { - border: 1px solid #d1d5da; - background-color: #fafafa; - border-radius: 3px; - box-shadow: inset 0 1px 2px rgba(27, 31, 35, 0.075); - padding: 7px 8px; - width: 100%; - line-height: 17px; - box-sizing: border-box; } - .form input:focus, - .form textarea:focus { - background-color: #fff; - box-shadow: inset 0 1px 2px rgba(27, 31, 35, 0.075), 0 0 0 0.2em #dbedff; - border: 1px solid #4285f4; } - -.form .ft__red { - line-height: 34px; } - -.form .btn { - float: right; - height: 34px; - margin: 0 0 0 10px; - padding: 0 15px; } +.form { + width: 100%; } + .form input, + .form textarea { + border: 1px solid #d1d5da; + background-color: #fafafa; + border-radius: 3px; + box-shadow: inset 0 1px 2px rgba(27, 31, 35, 0.075); + padding: 7px 8px; + width: 100%; + line-height: 17px; + box-sizing: border-box; } + .form input:focus, + .form textarea:focus { + background-color: #fff; + box-shadow: inset 0 1px 2px rgba(27, 31, 35, 0.075), 0 0 0 0.2em #dbedff; + border: 1px solid #4285f4; } + .form .ft__red { + line-height: 34px; } + .form .btn { + float: right; + height: 34px; + margin: 0 0 0 10px; + padding: 0 15px; } .icon__up { position: fixed; @@ -1150,7 +1165,8 @@ a { .article-list .item__date { display: none; } .article-list .item, - .module { + .module, + .comments__item { margin-bottom: 15px; } .footer { margin: 0 15px 15px; @@ -1201,6 +1217,8 @@ a { .module__content.ft__center { text-align: left; } .comments__avatar { - height: 48px; - width: 48px; - left: -14px; } } + height: 34px; + width: 34px; + left: -7px; } + .comments__content { + padding: 15px; } } diff --git a/nijigen/css/base.scss b/nijigen/css/base.scss index f365f03..907e058 100644 --- a/nijigen/css/base.scss +++ b/nijigen/css/base.scss @@ -19,7 +19,7 @@ * skin style * * @author Liyuan Li - * @version 0.2.0.0, Sep 25, 2018 + * @version 0.3.0.0, Nov 12, 2018 */ @import "../../../scss/reset"; @import "../../../scss/reset-content"; @@ -457,6 +457,11 @@ a { .comments__meta { background-color: rgba(217, 237, 247, 1); } + + .comments__reply:after { + background-color: #d9edf7; + } + } } @@ -485,8 +490,12 @@ a { &__content { border-radius: 0 0 5px 5px; background-color: rgba(255, 255, 255, 0.8); - padding: 15px 15px 15px 45px; + padding: 15px 45px; position: relative; + + textarea { + margin: 15px 0; + } } &__avatar { @@ -508,7 +517,21 @@ a { &__reply { border-radius: 5px; - margin: 15px auto 0 + margin: 15px auto 0; + + #cancelCommentButton { + line-height: 34px; + } + + &:after { + content: " "; + position: absolute; + height: 15px; + width: 5px; + right: 60px; + top: -15px; + background-color: rgba(217, 237, 247, 0.6); + } } } @@ -523,6 +546,7 @@ a { } .form { + width: 100%; input, textarea { border: 1px solid #d1d5da; @@ -634,7 +658,8 @@ a { } .article-list .item, - .module { + .module, + .comments__item { margin-bottom: 15px; } @@ -717,8 +742,12 @@ a { } .comments__avatar { - height: 48px; - width: 48px; - left: -14px; + height: 34px; + width: 34px; + left: -7px; + } + + .comments__content { + padding: 15px; } } \ No newline at end of file diff --git a/nijigen/lang/lang_en_US.properties b/nijigen/lang/lang_en_US.properties index 9b93099..e9f688a 100644 --- a/nijigen/lang/lang_en_US.properties +++ b/nijigen/lang/lang_en_US.properties @@ -18,10 +18,11 @@ # # Description: Solo language configurations(en_US). -# Version: 1.2.0.0, Apr 8, 2017 +# Version: 1.3.0.0, Nov 12, 2018 # Author: Liyuan Li # +cancelLabel=\u53D6\u6D88 siteViewLabel=Site onlineVisitorLabel=Visitor tocLabel=Article ToC diff --git a/nijigen/lang/lang_zh_CN.properties b/nijigen/lang/lang_zh_CN.properties index c89866a..1d43424 100644 --- a/nijigen/lang/lang_zh_CN.properties +++ b/nijigen/lang/lang_zh_CN.properties @@ -18,10 +18,11 @@ # # Description: Solo default language configurations(zh_CN). -# Version: 1.2.0.0, Apr 8, 2017 +# Version: 1.3.0.0, Nov 12, 2018 # Author: Liyuan Li # +cancelLabel=\u53D6\u6D88 siteViewLabel=\u7AD9\u70B9\u6982\u8981 onlineVisitorLabel=\u8BBF\u5BA2 tocLabel=\u6587\u7AE0\u76EE\u5F55 diff --git a/nijigen/macro-comments.ftl b/nijigen/macro-comments.ftl index b0b9db3..9012b99 100644 --- a/nijigen/macro-comments.ftl +++ b/nijigen/macro-comments.ftl @@ -89,6 +89,7 @@ + ${cancelLabel}