diff --git a/Jane/article-list.ftl b/Jane/article-list.ftl index db050ed..dd8921f 100644 --- a/Jane/article-list.ftl +++ b/Jane/article-list.ftl @@ -34,13 +34,25 @@ - +
+ +   + <#list article.articleTags?split(",") as articleTag> + <#if articleTag_has_next>, + +
+ <#if article.articleCommentCount gt 0>${article.articleCommentCount} ${commentLabel} + • + ${article.articleViewCount} ${viewLabel} +
+
${article.articleAbstract}
- More... + More... diff --git a/Jane/article.ftl b/Jane/article.ftl index a03b926..f88f971 100644 --- a/Jane/article.ftl +++ b/Jane/article.ftl @@ -51,21 +51,13 @@ <#include "header.ftl"> -
-
+
<#if pjax> -
-
- - -

- - ${article.articleTitle} - +
+

+ + ${article.articleTitle} + <#if article.articlePutTop> ${topArticleLabel} @@ -76,98 +68,62 @@ ${updatedLabel} -

+

-
- +
+
- -
- - - <#list article.articleTags?split(",") as articleTag> - <#if articleTag_has_next>, - - - - ${article.articleCommentCount} ${commentLabel} - - - + +   + <#list article.articleTags?split(",") as articleTag> + <#if articleTag_has_next>, + +
+ <#if article.articleCommentCount gt 0>${article.articleCommentCount} ${commentLabel} + • ${article.articleViewCount} ${viewLabel} -
+
-
+
${article.articleContent} - <#if "" != article.articleSign.signHTML?trim> -
- ${article.articleSign.signHTML} -
- + <#if "" != article.articleSign.signHTML?trim> +
+ ${article.articleSign.signHTML}
+
<#if previousArticlePermalink?? || nextArticlePermalink??> -
-
- <#if previousArticlePermalink??> - - - <#if nextArticlePermalink??> - - -
+
+ <#if nextArticlePermalink??> + + <#else> +   + + <#if previousArticlePermalink??> + + <#else> +   +
- - <@comments commentList=articleComments article=article> - -
-
-
-
-
-
-
       
-
-
-
-
-
-
       
-
-
-
-
-
-
-
- <#if pjax>
+ + <@comments commentList=articleComments article=article> + <#if pjax>
<#include "footer.ftl"> <#if pjax> <@comment_script oId=article.oId> -page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}"; - <#if 0 != randomArticlesDisplayCount> -page.loadRandomArticles('
${randomArticles1Label}
'); - - <#if 0 != externalRelevantArticlesDisplayCount> -page.loadExternalRelevantArticles("<#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>," - , "
${externalRelevantArticlesLabel}
"); - - <#if 0 != relevantArticlesDisplayCount> - page.loadRelevantArticles('${article.oId}', - '
${relevantArticlesLabel}
'); - <#if pjax> diff --git a/Jane/common-comment.ftl b/Jane/common-comment.ftl index 1dac368..b2a00db 100644 --- a/Jane/common-comment.ftl +++ b/Jane/common-comment.ftl @@ -17,32 +17,38 @@ along with this program. If not, see . --> -
  • -
    -
    +
  • +
    + + +
    +
    +
    <#if "http://" == comment.commentURL> ${comment.commentName} <#else> - ${comment.commentName} + ${comment.commentName} <#if comment.isReply> @${comment.commentOriginalCommentName} -
    - + • + + + <#if article.commentable> + + + + +
    + +
    + ${comment.commentContent} +
    +
    • -
    -
    -
    - ${comment.commentContent} -
    - <#if article?? && article.commentable> - ${replyLabel} - <#else> - ${viewLabel}» - -
    \ No newline at end of file diff --git a/Jane/css/base.css b/Jane/css/base.css index 638c6c2..0fbce34 100644 --- a/Jane/css/base.css +++ b/Jane/css/base.css @@ -744,12 +744,28 @@ a { color: #999; } .content-reset { + overflow: hidden; color: #555; font-size: 14px; } .content-reset a { color: #991a1a; } + .content-reset blockquote { + font-family: Georgia, "Times New Roman", serif; + background: #f7f7f7; + margin: 20px 0; + padding: 10px 20px; + border-left: 4px solid #991a1a; } + .content-reset pre > code { + color: #555; + background-color: #f7f7f7; + padding: 10px; } + +.b3-solo-list { + display: none; } .header { + padding: 10px 0; + box-sizing: border-box; top: 0; background-color: #2a2a2a; color: #fff; @@ -774,9 +790,9 @@ a { color: #999; } .wrapper { - max-width: 920px; + max-width: 768px; margin: 0 auto; - padding: 0 20px; } + padding: 0 70px 0 20px; } .footer { color: #999; @@ -801,6 +817,11 @@ a { transition: color 0.2s; } .article__title a:hover { color: #991a1a; } + .article__title sup { + font-weight: normal; + color: #999; + font-size: 12px; + top: -10px; } .article__content { margin: 20px 0; } @@ -813,6 +834,39 @@ a { color: #991a1a; display: block; } +.article__near { + margin: 50px 0 70px; + position: relative; } + .article__near:before { + width: 8px; + height: 8px; + position: absolute; + top: 50%; + left: 50%; + margin-top: -4px; + margin-left: -4px; + content: ""; + border-radius: 50%; + background: #ddd; + box-shadow: 0 1px 2px #fff; } + .article__near a { + font-size: 12px; + line-height: 1.6em; + color: #999; + padding: 0 20px; } + .article__near a:hover { + text-decoration: none; + color: #555; } + .article__near a.first { + text-align: right; } + .article__near strong { + margin-bottom: 6px; + font-size: 14px; + letter-spacing: 2px; + color: #ddd; + font-weight: bold; + display: block; } + .pagination { margin: 20px 0 40px; } .pagination__item { @@ -836,3 +890,90 @@ a { .tags a { margin-right: 20px; float: left; } + +.comments__title { + padding-top: 20px; } + +.comment__item { + list-style: none; + margin: 20px 0; } + +.comment__avatar { + width: 44px; + height: 44px; + border-radius: 3px; + background-size: cover; + background-repeat: no-repeat; + background-position: 50%; + margin-right: 20px; } + +.comment__main { + position: relative; + border: 1px solid #CFD8DC; + border-radius: 0; + padding: 20px; } + .comment__main:before, .comment__main:after { + position: absolute; + top: 11px; + left: -16px; + display: block; + width: 0; + height: 0; + pointer-events: none; + content: ""; + border-color: transparent; + border-style: solid solid outset; + border-width: 8px; + border-right-color: #CFD8DC; } + .comment__main:after { + margin-top: 1px; + margin-left: 2px; + border-width: 7px; + border-right-color: #fff; } + +.comment__btn { + cursor: pointer; + color: #666; } + .comment__btn:hover { + color: #333; } + +.comment__content { + margin-top: 20px; } + .comment__content > p:last-child { + margin-bottom: 0; } + +.form { + width: 100%; + padding: 0 0 0 64px; } + .form #commentErrorTip, + .form #commentErrorTipReply { + line-height: 37px; } + .form #captcha, + .form #captchaReply { + height: 32px; + display: inline-block; + vertical-align: inherit; } + .form input, + .form textarea, + .form button { + background-color: #fff; + padding: 7px 8px; + border: 1px solid #CFD8DC; + width: 100%; + box-sizing: border-box; + font-size: 14px; + outline: none; + font-family: "Helvetica Neue","Luxi Sans","DejaVu Sans",Tahoma,"Hiragino Sans GB","Microsoft Yahei",sans-serif; } + .form button { + width: auto; + vertical-align: bottom; + transition: all 0.3s ease; + cursor: pointer; + margin-top: 20px; } + .form button:hover { + background-color: #2a2a2a; + color: #FFF; + border-color: #2a2a2a; } + .form input:focus, + .form textarea:focus { + border-color: #2a2a2a; } diff --git a/Jane/css/base.min.css b/Jane/css/base.min.css index 57e4769..2d98102 100644 --- a/Jane/css/base.min.css +++ b/Jane/css/base.min.css @@ -15,4 +15,4 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -@charset "UTF-8";body,button,input,select,textarea{margin:0;font-family:"Helvetica Neue","Luxi Sans","DejaVu Sans",Tahoma,"Hiragino Sans GB","Microsoft Yahei",sans-serif}.content-reset pre,sub,sup{position:relative}.fn__ellipsis,.ft__nowrap{white-space:nowrap}.comments__item,.content-reset li.task-list-item{list-style:none}html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;height:100%}body{font-size:14px;background-color:#fff;-webkit-font-smoothing:antialiased;-webkit-overflow-scrolling:touch}::-moz-selection{text-shadow:none;background:rgba(65,131,196,.4)}::selection{text-shadow:none;background:rgba(66,133,244,.4)}ol,ul{margin:0;padding:0}blockquote,dd,dl,h1,h2,h3,h4,h5,h6,p{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none}a:hover{text-decoration:underline}sub,sup{font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{max-width:100%;vertical-align:middle;border:0;height:auto;-ms-interpolation-mode:bicubic;overflow:hidden;font-size:12px}button,input,select,textarea{font-size:100%;vertical-align:middle;outline:0}button,input{line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}.content-reset h1,.content-reset h2{padding-bottom:.3em;border-bottom:1px solid #eee}button,input[type=button],input[type=reset],input[type=submit]{cursor:pointer;-webkit-appearance:button}input[type=search]{box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}textarea{overflow:auto;resize:vertical}svg{fill:currentColor;display:inline-block;stroke-width:0;stroke:currentColor;width:14px;height:14px}.content-reset{word-wrap:break-word;overflow:auto;line-height:1.65;font-size:16px;word-break:break-word}.content-reset ol,.content-reset ul{padding-left:2em;margin-top:0;margin-bottom:16px}.content-reset li{margin-top:.25em}.content-reset img{cursor:zoom-in}.content-reset img.emoji{cursor:auto;max-width:18px}.content-reset h1,.content-reset h2,.content-reset h3,.content-reset h4,.content-reset h5,.content-reset h6{margin-top:24px;margin-bottom:16px;font-weight:600;line-height:1.25}.content-reset h1{font-size:1.7em}.content-reset h2{font-size:1.5em}.content-reset h3{font-size:1.25em}.content-reset h4{font-size:1em}.content-reset h5{font-size:.875em}.content-reset h6{font-size:.85em}.content-reset hr{height:.25em;padding:0;margin:24px 0;background-color:#e7e7e7;border:0}.content-reset p{margin-top:0;margin-bottom:16px}.content-reset blockquote{padding:0 1em;color:#777;border-left:.25em solid #ddd;margin-bottom:16px}.content-reset blockquote p{margin:0}.content-reset iframe{border:1px solid rgba(0,0,0,.38)}.content-reset table{width:100%;border:1px solid #dedede;margin:15px auto;border-collapse:collapse;empty-cells:show}.content-reset thead{text-align:center}.content-reset td,.content-reset th{height:35px;border:1px solid #dedede;padding:0 10px}.content-reset th{font-weight:700;text-align:center!important;background:rgba(158,188,226,.2)}.article-list .item__date,.footer,.ft__center,.header__nav,.icon__up,.tooltipped::after{text-align:center}.content-reset tbody tr:nth-child(2n){background:rgba(158,188,226,.12)}.content-reset tr:hover{background:#efefef}.content-reset code{padding:.2em .4em;margin:0;font-size:85%;background-color:rgba(252,41,41,.12);border-radius:3px;word-break:break-word}.content-reset pre textarea{position:absolute;top:-100000px}.content-reset pre>code{padding:.5em;background-color:rgba(0,0,0,.04);background-size:20px 20px;border-radius:5px}.content-reset kbd{display:inline-block;padding:3px 5px;font:11px Consolas,"Liberation Mono",Menlo,Courier,monospace;line-height:10px;color:#555;vertical-align:middle;background-color:#fcfcfc;border:1px solid rgba(0,0,0,.38);border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.content-reset li.task-list-item>input{margin-left:-2em;vertical-align:middle}.img-preview{width:100%;height:100%;top:0;z-index:211;overflow:auto;cursor:zoom-out;transition:background-color .2s ease-in-out}.fn__pointer,.tooltipped{cursor:pointer}.img-preview img{max-width:inherit;transition:transform .3s ease-in-out}.fn__flex{display:flex}.fn__flex-center{align-self:center}.fn__flex-inline{display:inline-flex;align-items:center}.fn__flex-1{flex:1;min-width:1px}.fn__flex-column{min-height:100%;display:flex;flex-direction:column}.fn__clear:after,.fn__clear:before{display:table;content:""}.fn__clear:after{clear:both}.fn__left{float:left}.fn__right{float:right}.fn__none{display:none}.fn__hidden{visibility:hidden}.fn__ellipsis{overflow:hidden;text-overflow:ellipsis;word-wrap:normal}.ft__13{font-size:13px}.ft__smaller{font-size:12px}@-webkit-keyframes tooltip-appear{from{opacity:0}to{opacity:1}}@keyframes tooltip-appear{from{opacity:0}to{opacity:1}}.tooltipped{position:relative}.tooltipped::after,.tooltipped::before{position:absolute;display:none;opacity:0;pointer-events:none}.tooltipped::after{z-index:1000000;padding:5px 8px;font-size:11px;font-weight:400;-webkit-font-smoothing:subpixel-antialiased;color:#fff;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-wrap:break-word;white-space:pre;content:attr(aria-label);background:rgba(0,0,0,.8);border-radius:3px;line-height:16px}.tooltipped::before{z-index:1000001;width:0;height:0;color:rgba(0,0,0,.8);content:"";border:5px solid transparent}.tooltipped--hover::after,.tooltipped--hover::before,.tooltipped:active::after,.tooltipped:active::before,.tooltipped:focus::after,.tooltipped:focus::before,.tooltipped:hover::after,.tooltipped:hover::before{display:inline-block;text-decoration:none;animation-name:tooltip-appear;animation-duration:.1s;animation-fill-mode:forwards;animation-timing-function:ease-in;animation-delay:.4s}.tooltipped__s::after,.tooltipped__se::after,.tooltipped__sw::after{top:100%;right:50%;margin-top:5px}.tooltipped__s::before,.tooltipped__se::before,.tooltipped__sw::before{top:auto;right:50%;bottom:-5px;margin-right:-5px;border-bottom-color:rgba(0,0,0,.8)}.tooltipped__se::after{right:auto;left:50%;margin-left:-15px}.tooltipped__sw::after{margin-right:-15px}.tooltipped__n::after,.tooltipped__ne::after,.tooltipped__nw::after{right:50%;bottom:100%;margin-bottom:5px}.tooltipped__n::before,.tooltipped__ne::before,.tooltipped__nw::before{top:-5px;right:50%;bottom:auto;margin-right:-5px;border-top-color:rgba(0,0,0,.8)}.tooltipped__ne::after{right:auto;left:50%;margin-left:-15px}.tooltipped__nw::after{margin-right:-15px}.tooltipped__n::after,.tooltipped__s::after{transform:translateX(50%)}.tooltipped__w::after{right:100%;bottom:50%;margin-right:5px;transform:translateY(50%)}.tooltipped__w::before{top:50%;bottom:50%;left:-5px;margin-top:-5px;border-left-color:rgba(0,0,0,.8)}.tooltipped__e::after{bottom:50%;left:100%;margin-left:5px;transform:translateY(50%)}.tooltipped__e::before{top:50%;right:-5px;bottom:50%;margin-top:-5px;border-right-color:rgba(0,0,0,.8)}.em00,.em01,.em02,.em03,.em04,.em05,.em06,.em07,.em08,.em09,.em10,.em11,.em12,.em13,.em14{cursor:pointer;background-image:url(../../../images/emotions/emotions.png);background-size:120px;float:left;height:24px;margin-right:5px;width:24px;transition:all .2s ease-out;-webkit-transition:all .2s ease-out;-moz-transition:all .2s ease-out}.module,a{transition:all .3s}#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)}.em01{background-position:-24px 0}.em02{background-position:-48px 0}.em03{background-position:-72px 0}.em04{background-position:-96px 0}.em05{background-position:0 -24px}.em06{background-position:-24px -24px}.em07{background-position:-48px -24px}.em08{background-position:-72px -24px}.em09{background-position:-96px -24px}.em10{background-position:0 -48px}.em11{background-position:-24px -48px}.em12{background-position:-48px -48px}.em13{background-position:-72px -48px}.em14{background-position:-96px -48px}#nprogress{pointer-events:none}#nprogress .bar{background:#d23f31;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #d23f31,0 0 5px #d23f31;opacity:1;-webkit-transform:rotate(3deg) translate(0,-4px);-ms-transform:rotate(3deg) translate(0,-4px);transform:rotate(3deg) translate(0,-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#d23f31;border-left-color:#d23f31;border-radius:50%;-webkit-animation:nprogress-spinner .4s linear infinite;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@-webkit-keyframes nprogress-spinner{0%{-webkit-transform:rotate(0)}100%{-webkit-transform:rotate(360deg)}}@keyframes nprogress-spinner{0%{transform:rotate(0)}100%{transform:rotate(360deg)}}@font-face{font-family:icomoon;src:url(fonts/icomoon.eot?oyqnlj);src:url(fonts/icomoon.eot?oyqnlj#iefix) format("embedded-opentype"),url(fonts/icomoon.ttf?oyqnlj) format("truetype"),url(fonts/icomoon.woff?oyqnlj) format("woff"),url(fonts/icomoon.svg?oyqnlj#icomoon) format("svg");font-weight:400;font-style:normal}[class*=" icon__"],[class^=icon__]{font-family:icomoon!important;speak:none;font-style:normal;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon__list:before{content:"\f0ca"}.icon__home:before{content:"\f015"}.icon__comments:before{content:"\f0e6"}.icon__date:before{content:"\f073"}.icon__search:before{content:"\f002"}.icon__up:before{content:"\f077"}.icon__inbox:before{content:"\f01c"}.icon__tags:before{content:"\f02c"}.icon__link:before{content:"\f0c1"}.icon__refresh:before{content:"\f021"}.icon__category:before{content:"\e9bc"}.icon__logout:before{content:"\ea14"}.icon__views:before{content:"\e900"}.icon__register:before{content:"\e973"}.icon__setting:before{content:"\e994"}.icon__login:before{content:"\ea13"}.icon__rss:before{content:"\e901"}body{cursor:url(../images/cursor.cur),url(../images/cursor.cur),auto}a{outline:0;text-decoration:none;cursor:url(../images/pointer.cur),url(../images/pointer.cur),auto}.content-reset img{vertical-align:sub}.ft__red{color:#b94a48}.module{border-radius:5px;overflow:hidden;margin-bottom:30px;box-shadow:1px 1px 3px 1px rgba(0,0,0,.2)}.module.item{transform:translateY(30px);transition:transform 2s cubic-bezier(.175,.885,.32,1.275)}.module.item--active{transform:translate(0)}.module:hover{box-shadow:0 0 20px 0 rgba(0,0,0,.8)}.module__content{background-color:rgba(255,255,255,.8);padding:15px;color:#3d4450;display:block}.module__content:hover{background-color:#fff}.module__content--three{padding-bottom:0}.module__header{background-color:rgba(10,10,0,.7);padding:15px;color:#fff}.module__header a{color:#fff}.module__header:hover{background-color:rgba(10,10,0,.9)}.module__list li{border-bottom:1px solid #ddd;background-color:rgba(255,255,255,.8);line-height:20px}.module__list li a{padding:15px;display:block;color:#3d4450}.module__list li a:hover{text-decoration:none;color:#b94a48;background-color:#fff}.header,.header a,.tag,.tag a{color:#fff}.form{position:relative}.form__input{border:1px solid #7266BA;height:30px;line-height:30px;padding:0 15px;border-radius:15px;width:100%;box-sizing:border-box}.bg{height:100%;width:100%;position:fixed;top:0;left:0;background-image:url(../images/background1.jpg);background-size:cover;background-position:center center;z-index:-1;animation:imageAnimation 36s linear infinite 0s;opacity:0}.bg--1{background-image:url(../images/background2.jpg);animation-delay:6s}.bg--2{background-image:url(../images/background3.jpg);animation-delay:12s}.bg--3{background-image:url(../images/background4.jpg);animation-delay:18s}.bg--4{background-image:url(../images/background5.jpg);animation-delay:24s}.bg--5{background-image:url(../images/background6.jpg);animation-delay:30s}@keyframes imageAnimation{0%{opacity:0;animation-timing-function:ease-in}8%{opacity:1;transform:scale(1.05);animation-timing-function:ease-out}17%{opacity:1;transform:scale(1.1) rotate(0)}25%{opacity:0;transform:scale(1.1) rotate(0)}100%{opacity:0}}.header{background-color:rgba(10,10,0,.7);height:50px;line-height:50px;transition:all .3s;box-shadow:0 0 8px #000}.header:hover{background-color:rgba(10,10,0,.9)}.header a{padding:0 15px;display:inline-block}.header a.current,.header a:hover{text-decoration:none;background-color:rgba(102,88,184,.8)}.header__logo{position:absolute;left:30px}.header__nav img{float:left;height:20px;width:20px;margin:15px 5px 0 0}.header__login{position:absolute;right:30px;top:0}.main{max-width:1170px;padding:30px;margin:auto;display:flex}.content{flex:1;min-width:1px}.side{width:280px;min-width:280px;margin-left:30px}.side__btn{background-color:transparent;border:0;top:5px;position:absolute;right:10px}.side__avatar{border-radius:50%;height:100px;width:100px;display:block;margin:10px auto 15px;transition:transform .3s}.side__avatar:hover{transform:rotate(360deg) scale(1.2);border:5px solid rgba(114,102,186,.36);margin-top:0}.tag{float:left;padding:2px 5px;border:1px solid transparent;height:20px;white-space:nowrap;word-wrap:normal;background-color:rgba(10,10,0,.7);border-radius:3px;line-height:21px;margin:0 15px 15px 0}.article-list .item,.footer{margin-bottom:30px;padding:15px}.tag:hover{background-color:#b94a48;box-shadow:0 1px 1px rgba(0,0,0,.2);text-decoration:none}.breadcrumb{color:#7266BA!important}.breadcrumb:hover{color:#3d4450!important}.footer{color:#fff}.footer a{color:#7266BA}.article-list .item{border-radius:5px;box-shadow:1px 1px 3px 1px rgba(0,0,0,.2);background-color:rgba(255,255,255,.8);position:relative;transition:all .3s,transform 1s cubic-bezier(.175,.885,.32,1.275);transform:perspective(2500px) rotateX(-100deg)}.article-list .item--active{transform:perspective(2500px) rotateX(0)}.article-list .item:hover{background-color:#fff;box-shadow:0 0 20px 0 rgba(0,0,0,.8)}.article-list .item .tag{float:none;display:inline-block}.article-list .item__title{text-align:center;font-size:24px;font-weight:500}.article-list .item__title a{color:rgba(10,10,0,.7);padding:0 15px;border-radius:5px;display:inline-block;margin-bottom:15px;line-height:36px}.article-list .item__title a:hover{color:#fff;text-decoration:none;background-color:#6658b8}.article-list .item__title>sup{color:#b94a48}.article-list .item__date{position:absolute;background-color:#7266BA;color:#fff;height:70px;width:70px;font-size:12px;top:-20px;border-radius:35px;left:-20px;padding-top:9px;box-sizing:border-box}.article-list .item__day{font-size:30px;display:block}.pagination__item{color:#fff;border-radius:3px;padding:0 10px;line-height:24px;display:inline-block;margin:0 0 10px 10px;background-color:rgba(114,102,186,.58)}.comment-body-ref .breadcrumb,.icon__up{display:none}.pagination__item--text{background-color:rgba(255,255,255,.8);color:#7266BA}.pagination__item--current{background-color:#6658b8}.pagination a.pagination__item:hover{text-decoration:none;background-color:#6658b8}.comments{position:relative}.comments__item{border-radius:5px;margin-bottom:30px;box-shadow:1px 1px 3px 1px rgba(0,0,0,.2);transition:all .3s}.comments__item:hover{box-shadow:0 0 20px 0 rgba(0,0,0,.8)}.comments__item:hover .comments__avatar{transform:rotate(720deg);border-radius:0}.comments__item:hover .comments__content{background-color:#fff}.comments__item:hover .comments__meta,.comments__item:hover .comments__reply:after{background-color:#d9edf7}.comments__meta{border-radius:5px 5px 0 0;min-height:37px;line-height:37px;padding-left:45px;background:rgba(217,237,247,.6);color:#3d4450;padding-right:15px}.comments__meta a{font-weight:700;color:#3d4450}.comments__meta a:hover{color:#b94a48}.comments__meta--only{border-radius:5px}.comments__content{border-radius:0 0 5px 5px;background-color:rgba(255,255,255,.8);padding:15px 45px;position:relative}.comments__content textarea{margin:15px 0}.comments__avatar{position:absolute;height:54px;width:54px;background-position:center center;background-size:cover;border:2px solid #fff;border-radius:35px;left:-29px;top:-23px;transition:all .8s ease}.comments__captcha{height:30px}.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,.6)}.comment-body-ref{right:0;position:absolute;left:64px}.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,.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,.075),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}.b3-solo-list,.b3-solo-list-h1,.b3-solo-list-h2,.b3-solo-list-h3,.b3-solo-list-h4,.b3-solo-list-h5{margin:0!important}.icon__up{position:fixed;bottom:30px;right:30px;color:#fff;background-color:rgba(114,102,186,.8);height:30px;width:30px;line-height:28px;border-radius:15px;cursor:pointer}.icon__up:hover{background-color:#6658b8}.content .b3-solo-list{display:none!important}.b3-solo-list{font-size:14px!important}.b3-solo-list-h2 a{padding-left:30px!important}.b3-solo-list-h3 a{padding-left:45px!important}.b3-solo-list-h4 a{padding-left:60px!important}.b3-solo-list-h5 a{padding-left:75px!important}@media (max-width:768px){.header__nav{display:none}.main{display:block;margin:15px;padding:0}.side{margin:0;width:auto}.article-list{overflow:hidden}.article-list .item__title{font-size:20px}.article-list .item__date--m{text-align:center;margin-bottom:10px;color:#3d4450;display:block}.article-list .item__date,.footer .fn__none--m{display:none}.article-list .item,.comments__item,.module{margin-bottom:15px}.footer{margin:0 15px 15px;background-color:rgba(255,255,255,.8);border-radius:5px;color:#3d4450;line-height:20px}.footer a{text-decoration:underline}.footer .fn__none{display:block}.tag{margin:0 5px 10px 0;font-size:12px}.header__logo{left:0}.header__login{display:none}.header__m{display:block;position:absolute;width:100%;z-index:1}.header__m img{float:left;height:20px;width:20px;margin:0 5px 0 0}.header__m a.current{color:#b94a48}.header__m .icon__list{position:absolute;top:-35px;right:15px;font-size:20px;color:#fff}.header__m .module__list{display:none}.header__m .module__list li{background-color:#fff}.module__content.ft__center{text-align:left}.comments__avatar{height:34px;width:34px;left:-7px}.comments__content{padding:15px}.content-reset{font-size:14px}} \ No newline at end of file +@charset "UTF-8";body,button,input,select,textarea{margin:0;font-family:"Helvetica Neue","Luxi Sans","DejaVu Sans",Tahoma,"Hiragino Sans GB","Microsoft Yahei",sans-serif}.content-reset pre,sub,sup{position:relative}.fn__ellipsis,.ft__nowrap{white-space:nowrap}.comment__item,.content-reset li.task-list-item{list-style:none}html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;height:100%}body{font-size:14px;background-color:#fff;-webkit-font-smoothing:antialiased;-webkit-overflow-scrolling:touch}::-moz-selection{text-shadow:none;background:rgba(65,131,196,.4)}::selection{text-shadow:none;background:rgba(66,133,244,.4)}ol,ul{margin:0;padding:0}blockquote,dd,dl,h1,h2,h3,h4,h5,h6,p{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none}a:hover{text-decoration:underline}sub,sup{font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{max-width:100%;vertical-align:middle;border:0;height:auto;-ms-interpolation-mode:bicubic;overflow:hidden;font-size:12px}button,input,select,textarea{font-size:100%;vertical-align:middle;outline:0}button,input{line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}.content-reset h1,.content-reset h2{padding-bottom:.3em;border-bottom:1px solid #eee}button,input[type=button],input[type=reset],input[type=submit]{cursor:pointer;-webkit-appearance:button}input[type=search]{box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}textarea{overflow:auto;resize:vertical}svg{fill:currentColor;display:inline-block;stroke-width:0;stroke:currentColor;width:14px;height:14px}.content-reset{word-wrap:break-word;line-height:1.65;word-break:break-word}.content-reset ol,.content-reset ul{padding-left:2em;margin-top:0;margin-bottom:16px}.content-reset li{margin-top:.25em}.content-reset img{cursor:zoom-in}.content-reset img.emoji{cursor:auto;max-width:18px}.content-reset h1,.content-reset h2,.content-reset h3,.content-reset h4,.content-reset h5,.content-reset h6{margin-top:24px;margin-bottom:16px;font-weight:600;line-height:1.25}.content-reset h1{font-size:1.7em}.content-reset h2{font-size:1.5em}.content-reset h3{font-size:1.25em}.content-reset h4{font-size:1em}.content-reset h5{font-size:.875em}.content-reset h6{font-size:.85em}.content-reset hr{height:.25em;padding:0;margin:24px 0;background-color:#e7e7e7;border:0}.content-reset p{margin-top:0;margin-bottom:16px}.content-reset blockquote{color:#777;margin-bottom:16px}.content-reset blockquote p{margin:0}.content-reset iframe{border:1px solid rgba(0,0,0,.38)}.content-reset table{width:100%;border:1px solid #dedede;margin:15px auto;border-collapse:collapse;empty-cells:show}.content-reset thead{text-align:center}.content-reset td,.content-reset th{height:35px;border:1px solid #dedede;padding:0 10px}.content-reset th{font-weight:700;text-align:center!important;background:rgba(158,188,226,.2)}.content-reset tbody tr:nth-child(2n){background:rgba(158,188,226,.12)}.content-reset tr:hover{background:#efefef}.content-reset code{padding:.2em .4em;margin:0;font-size:85%;background-color:rgba(252,41,41,.12);border-radius:3px;word-break:break-word}.content-reset pre textarea{position:absolute;top:-100000px}.content-reset pre>code{background-size:20px 20px;border-radius:5px}.content-reset kbd{display:inline-block;padding:3px 5px;font:11px Consolas,"Liberation Mono",Menlo,Courier,monospace;line-height:10px;color:#555;vertical-align:middle;background-color:#fcfcfc;border:1px solid rgba(0,0,0,.38);border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.content-reset li.task-list-item>input{margin-left:-2em;vertical-align:middle}.img-preview{width:100%;height:100%;top:0;z-index:211;overflow:auto;cursor:zoom-out;transition:background-color .2s ease-in-out}.comment__btn,.fn__pointer,.form button,.tooltipped{cursor:pointer}.img-preview img{max-width:inherit;transition:transform .3s ease-in-out}.fn__flex{display:flex}.fn__flex-center{align-self:center}.fn__flex-inline{display:inline-flex;align-items:center}.fn__flex-1{flex:1;min-width:1px}.fn__flex-column{min-height:100%;display:flex;flex-direction:column}.fn__clear:after,.fn__clear:before{display:table;content:""}.fn__clear:after{clear:both}.fn__left{float:left}.fn__right{float:right}.fn__none{display:none}.fn__hidden{visibility:hidden}.fn__ellipsis{overflow:hidden;text-overflow:ellipsis;word-wrap:normal}.ft__13{font-size:13px}.ft__smaller{font-size:12px}.ft__center{text-align:center}@-webkit-keyframes tooltip-appear{from{opacity:0}to{opacity:1}}@keyframes tooltip-appear{from{opacity:0}to{opacity:1}}.tooltipped{position:relative}.tooltipped::after{position:absolute;z-index:1000000;display:none;padding:5px 8px;font-size:11px;font-weight:400;-webkit-font-smoothing:subpixel-antialiased;color:#fff;text-align:center;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-wrap:break-word;white-space:pre;pointer-events:none;content:attr(aria-label);background:rgba(0,0,0,.8);border-radius:3px;line-height:16px;opacity:0}.tooltipped::before{position:absolute;z-index:1000001;display:none;width:0;height:0;color:rgba(0,0,0,.8);pointer-events:none;content:"";border:5px solid transparent;opacity:0}.tooltipped--hover::after,.tooltipped--hover::before,.tooltipped:active::after,.tooltipped:active::before,.tooltipped:focus::after,.tooltipped:focus::before,.tooltipped:hover::after,.tooltipped:hover::before{display:inline-block;text-decoration:none;animation-name:tooltip-appear;animation-duration:.1s;animation-fill-mode:forwards;animation-timing-function:ease-in;animation-delay:.4s}.tooltipped__s::after,.tooltipped__se::after,.tooltipped__sw::after{top:100%;right:50%;margin-top:5px}.tooltipped__s::before,.tooltipped__se::before,.tooltipped__sw::before{top:auto;right:50%;bottom:-5px;margin-right:-5px;border-bottom-color:rgba(0,0,0,.8)}.tooltipped__se::after{right:auto;left:50%;margin-left:-15px}.tooltipped__sw::after{margin-right:-15px}.tooltipped__n::after,.tooltipped__ne::after,.tooltipped__nw::after{right:50%;bottom:100%;margin-bottom:5px}.tooltipped__n::before,.tooltipped__ne::before,.tooltipped__nw::before{top:-5px;right:50%;bottom:auto;margin-right:-5px;border-top-color:rgba(0,0,0,.8)}.tooltipped__ne::after{right:auto;left:50%;margin-left:-15px}.tooltipped__nw::after{margin-right:-15px}.tooltipped__n::after,.tooltipped__s::after{transform:translateX(50%)}.tooltipped__w::after{right:100%;bottom:50%;margin-right:5px;transform:translateY(50%)}.tooltipped__w::before{top:50%;bottom:50%;left:-5px;margin-top:-5px;border-left-color:rgba(0,0,0,.8)}.tooltipped__e::after{bottom:50%;left:100%;margin-left:5px;transform:translateY(50%)}.tooltipped__e::before{top:50%;right:-5px;bottom:50%;margin-top:-5px;border-right-color:rgba(0,0,0,.8)}.em00,.em01,.em02,.em03,.em04,.em05,.em06,.em07,.em08,.em09,.em10,.em11,.em12,.em13,.em14{cursor:pointer;background-image:url(../../../images/emotions/emotions.png);background-size:120px;float:left;height:24px;margin-right:5px;width:24px;transition:all .2s ease-out;-webkit-transition:all .2s ease-out;-moz-transition:all .2s ease-out}#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)}.em01{background-position:-24px 0}.em02{background-position:-48px 0}.em03{background-position:-72px 0}.em04{background-position:-96px 0}.em05{background-position:0 -24px}.em06{background-position:-24px -24px}.em07{background-position:-48px -24px}.em08{background-position:-72px -24px}.em09{background-position:-96px -24px}.em10{background-position:0 -48px}.em11{background-position:-24px -48px}.em12{background-position:-48px -48px}.em13{background-position:-72px -48px}.em14{background-position:-96px -48px}#nprogress{pointer-events:none}#nprogress .bar{background:#d23f31;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #d23f31,0 0 5px #d23f31;opacity:1;-webkit-transform:rotate(3deg) translate(0,-4px);-ms-transform:rotate(3deg) translate(0,-4px);transform:rotate(3deg) translate(0,-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#d23f31;border-left-color:#d23f31;border-radius:50%;-webkit-animation:nprogress-spinner .4s linear infinite;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@-webkit-keyframes nprogress-spinner{0%{-webkit-transform:rotate(0)}100%{-webkit-transform:rotate(360deg)}}@keyframes nprogress-spinner{0%{transform:rotate(0)}100%{transform:rotate(360deg)}}@font-face{font-family:icomoon;src:url(fonts/icomoon.eot?oyqnlj);src:url(fonts/icomoon.eot?oyqnlj#iefix) format("embedded-opentype"),url(fonts/icomoon.ttf?oyqnlj) format("truetype"),url(fonts/icomoon.woff?oyqnlj) format("woff"),url(fonts/icomoon.svg?oyqnlj#icomoon) format("svg");font-weight:400;font-style:normal}[class*=" icon__"],[class^=icon__]{font-family:icomoon!important;speak:none;font-style:normal;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon__page:before{content:"\e902"}.icon__list:before{content:"\f0ca"}.icon__home:before{content:"\f015"}.icon__comments:before{content:"\f0e6"}.icon__date:before{content:"\f073"}.icon__search:before{content:"\f002"}.icon__up:before{content:"\f077"}.icon__inbox:before{content:"\f01c"}.icon__tags:before{content:"\f02c"}.icon__link:before{content:"\f0c1"}.icon__refresh:before{content:"\f021"}.icon__category:before{content:"\e9bc"}.icon__logout:before{content:"\ea14"}.icon__views:before{content:"\e900"}.icon__register:before{content:"\e973"}.icon__setting:before{content:"\e994"}.icon__login:before{content:"\ea13"}.icon__rss:before{content:"\e901"}body::-webkit-scrollbar{display:none}a{outline:0;text-decoration:none;transition:all .3s}.ft__red{color:#991a1a}.ft__gray{color:#999}.content-reset{overflow:hidden;color:#555;font-size:14px}.content-reset a{color:#991a1a}.content-reset blockquote{font-family:Georgia,"Times New Roman",serif;background:#f7f7f7;margin:20px 0;padding:10px 20px;border-left:4px solid #991a1a}.content-reset pre>code{color:#555;background-color:#f7f7f7;padding:10px}.b3-solo-list{display:none}.header{padding:10px 0;box-sizing:border-box;top:0;background-color:#2a2a2a;color:#fff;position:fixed;right:0;height:100%;width:50px;display:flex;flex-direction:column}.header a,.header span{color:#fff;padding:10px 0;display:block;text-align:center;font-size:16px;width:100%}.header a img,.header span img{height:17px;width:17px}.header a.current,.header a:hover,.header span.current,.header span:hover{text-decoration:none;color:#999}.wrapper{max-width:768px;margin:0 auto;padding:0 70px 0 20px}.footer{color:#999;padding:30px 0;line-height:1.6em;font-size:.85em}.footer a{color:#991a1a}.article__item{margin:50px 0;border-bottom:1px dashed #d9d9d9;text-align:justify}.article__title{padding:20px 0}.article__title a{text-decoration:none;font-size:25px;font-weight:700;color:#555;transition:color .2s}.article__title a:hover{color:#991a1a}.article__title sup{font-weight:400;color:#999;font-size:12px;top:-10px}.article__content{margin:20px 0}.article__content>p:last-child{margin-bottom:0}.article__more{margin-bottom:70px;text-decoration:none;color:#991a1a;display:block}.article__near{margin:50px 0 70px;position:relative}.article__near:before{width:8px;height:8px;position:absolute;top:50%;left:50%;margin-top:-4px;margin-left:-4px;content:"";border-radius:50%;background:#ddd;box-shadow:0 1px 2px #fff}.article__near a{font-size:12px;line-height:1.6em;color:#999;padding:0 20px}.article__near a:hover{text-decoration:none;color:#555}.article__near a.first{text-align:right}.article__near strong{margin-bottom:6px;font-size:14px;letter-spacing:2px;color:#ddd;font-weight:700;display:block}.pagination{margin:20px 0 40px}.pagination__item{padding:10px;color:#999;display:inline-block}.pagination__item--current{color:#991a1a;font-weight:700}.pagination a.pagination__item:hover{text-decoration:none;background:#991a1a;color:#fff}.tags{line-height:32px;margin:20px 0 70px}.tags--align a{width:180px;margin-right:0!important}.tags a{margin-right:20px;float:left}.comments__title{padding-top:20px}.comment__item{margin:20px 0}.comment__avatar{width:44px;height:44px;border-radius:3px;background-size:cover;background-repeat:no-repeat;background-position:50%;margin-right:20px}.comment__main{position:relative;border:1px solid #CFD8DC;border-radius:0;padding:20px}.comment__main:after,.comment__main:before{position:absolute;top:11px;left:-16px;display:block;width:0;height:0;pointer-events:none;content:"";border-color:transparent #CFD8DC transparent transparent;border-style:solid solid outset;border-width:8px}.comment__main:after{margin-top:1px;margin-left:2px;border-width:7px;border-right-color:#fff}.comment__content,.form button{margin-top:20px}.comment__btn{color:#666}.comment__btn:hover{color:#333}.comment__content>p:last-child{margin-bottom:0}.form{width:100%;padding:0 0 0 64px}.form #commentErrorTip,.form #commentErrorTipReply{line-height:37px}.form #captcha,.form #captchaReply{height:32px;display:inline-block;vertical-align:inherit}.form button,.form input,.form textarea{background-color:#fff;padding:7px 8px;border:1px solid #CFD8DC;width:100%;box-sizing:border-box;font-size:14px;outline:0;font-family:"Helvetica Neue","Luxi Sans","DejaVu Sans",Tahoma,"Hiragino Sans GB","Microsoft Yahei",sans-serif}.form button:hover,.form input:focus,.form textarea:focus{border-color:#2a2a2a}.form button{width:auto;vertical-align:bottom;transition:all .3s ease}.form button:hover{background-color:#2a2a2a;color:#FFF} \ No newline at end of file diff --git a/Jane/css/base.scss b/Jane/css/base.scss index b16f587..180976c 100644 --- a/Jane/css/base.scss +++ b/Jane/css/base.scss @@ -52,16 +52,37 @@ a { } .content-reset { + overflow: hidden; color: #555; font-size: 14px; a { color: $red; } + + blockquote { + font-family: Georgia, "Times New Roman", serif; + background: #f7f7f7; + margin: 20px 0; + padding: 10px 20px; + border-left: 4px solid $red; + } + + pre > code { + color: #555; + background-color: #f7f7f7; + padding: 10px; + } +} + +.b3-solo-list { + display: none; } // header .header { + padding: 10px 0; + box-sizing: border-box; top: 0; background-color: #2a2a2a; color: #fff; @@ -95,9 +116,9 @@ a { // framework .wrapper { - max-width: 920px; + max-width: 768px; margin: 0 auto; - padding: 0 20px; + padding: 0 70px 0 20px; } // footer @@ -131,6 +152,13 @@ a { color: $red; } } + + sup { + font-weight: normal; + color: $gray; + font-size: 12px; + top: -10px; + } } &__content { @@ -146,8 +174,47 @@ a { color: $red; display: block; } -} + &__near { + margin: 50px 0 70px; + position: relative; + &:before { + width: 8px; + height: 8px; + position: absolute; + top: 50%; + left: 50%; + margin-top: -4px; + margin-left: -4px; + content: ""; + border-radius: 50%; + background: #ddd; + box-shadow: 0 1px 2px #fff; + } + a { + font-size: 12px; + line-height: 1.6em; + color: $gray; + padding: 0 20px; + &:hover { + text-decoration: none; + color: #555; + } + + &.first { + text-align: right; + } + } + strong { + margin-bottom: 6px; + font-size: 14px; + letter-spacing: 2px; + color: #ddd; + font-weight: bold; + display: block; + } + } +} .pagination { margin: 20px 0 40px; @@ -169,7 +236,6 @@ a { } } - // other page .tags { line-height: 32px; @@ -184,4 +250,119 @@ a { margin-right: 20px; float: left; } -} \ No newline at end of file +} + +.comments { + &__title { + padding-top: 20px; + } +} + +.comment { + &__item { + list-style: none; + margin: 20px 0; + } + + &__avatar { + width: 44px; + height: 44px; + border-radius: 3px; + background-size: cover; + background-repeat: no-repeat; + background-position: 50%; + margin-right: 20px; + } + + &__main { + position: relative; + border: 1px solid #CFD8DC; + border-radius: 0; + padding: 20px; + &:before, + &:after { + position: absolute; + top: 11px; + left: -16px; + display: block; + width: 0; + height: 0; + pointer-events: none; + content: ""; + border-color: transparent; + border-style: solid solid outset; + border-width: 8px; + border-right-color: #CFD8DC; + } + &:after { + margin-top: 1px; + margin-left: 2px; + border-width: 7px; + border-right-color: #fff; + } + } + + &__btn { + cursor: pointer; + color: #666; + &:hover { + color: #333; + } + } + + &__content { + margin-top: 20px; + & > p:last-child { + margin-bottom: 0; + } + } +} + +.form { + width: 100%; + padding: 0 0 0 64px; + + #commentErrorTip, + #commentErrorTipReply { + line-height: 37px; + } + + #captcha, + #captchaReply { + height: 32px; + display: inline-block; + vertical-align: inherit; + } + + input, + textarea, + button { + background-color: #fff; + padding: 7px 8px; + border: 1px solid #CFD8DC; + width: 100%; + box-sizing: border-box; + font-size: 14px; + outline: none; + font-family: "Helvetica Neue","Luxi Sans","DejaVu Sans",Tahoma,"Hiragino Sans GB","Microsoft Yahei",sans-serif; + } + + button { + width: auto; + vertical-align: bottom; + transition: all 0.3s ease; + cursor: pointer; + margin-top: 20px; + } + + button:hover { + background-color: #2a2a2a; + color: #FFF; + border-color: #2a2a2a; + } + + input:focus, + textarea:focus { + border-color: #2a2a2a; + } +} diff --git a/Jane/js/common.js b/Jane/js/common.js index 4a29466..4b9cfeb 100644 --- a/Jane/js/common.js +++ b/Jane/js/common.js @@ -28,10 +28,14 @@ */ var Skin = { init: function () { - Util.initPjax() - - $('body').on('click', '.content-reset img', function () { - window.open(this.src) + Util.initPjax(function () { + $('.header a').each(function () { + if (this.href === location.href) { + this.className = 'current tooltipped tooltipped__w' + } else { + this.className = 'tooltipped tooltipped__w' + } + }) }) $('.header a').each(function () { @@ -42,33 +46,10 @@ var Skin = { $('.header a').removeClass('current') this.className = 'current tooltipped tooltipped__w' }) - }, - _initArticleCommon: function () { - if ($('.b3-solo-list li').length > 0 && $(window).width() > 1000) { - $('.side'). - prepend('
    ') - $('.side .module:eq(0) .module__list').html($('.b3-solo-list')) - } - }, - initArticle: function () { - this._initArticleCommon() - setTimeout(function () { - if ($('#externalRelevantArticlesWrap li').length === 0) { - $('#externalRelevantArticlesWrap').next().remove() - $('#externalRelevantArticlesWrap').remove() - } - - if ($('#relevantArticlesWrap li').length === 0) { - $('#relevantArticlesWrap').prev().remove() - $('#relevantArticlesWrap').remove() - } - - if ($('#randomArticlesWrap li').length === 0) { - $('#randomArticlesWrap').prev().remove() - $('#randomArticlesWrap').remove() - } - }, 1000) + $('body').on('click', '.content-reset img', function () { + window.open(this.src) + }) }, } Skin.init() \ No newline at end of file diff --git a/Jane/js/common.min.js b/Jane/js/common.min.js index 20a6c9a..a3c1265 100644 --- a/Jane/js/common.min.js +++ b/Jane/js/common.min.js @@ -15,4 +15,4 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -var Skin={_initCommon:function(e){$(window).scroll(function(){125<$(window).scrollTop()?e.show():e.hide()})},_initAnimation:function(){if(!("IntersectionObserver"in window))return $(".item").addClass("item--active"),!1;window.imageIntersectionObserver?window.imageIntersectionObserver.disconnect():window.imageIntersectionObserver=new IntersectionObserver(function(e){e.forEach(function(e){if(void 0===e.isIntersecting?0!==e.intersectionRatio:e.isIntersecting)$(e.target).addClass("item--active");else{if(1===$(e.target).closest(".side").length||$(e.target).closest(".article-list").hasClass("content")||768<$(e.target).outerHeight())return;$(e.target).removeClass("item--active")}})}),$(".item").each(function(){window.imageIntersectionObserver.observe(this)})},init:function(){Util.initPjax(function(){Skin._initAnimation(),0===$("#articlePage").length&&$(".b3-solo-list").closest(".module").remove()}),Skin._initAnimation(),$("body").on("click",".content-reset img",function(){window.open(this.src)}),this._initCommon($(".icon__up")),$(".header__nav a, .header__m a").each(function(){this.href===location.href&&(this.className="current")}).click(function(){$(".header__nav a, .header__m a").removeClass("current"),this.className="current",$(".header__m .module__list").hide()}),$(".header__logo").click(function(){$(".header__nav a, .header__m a").removeClass("current")})},_initArticleCommon:function(){0<$(".b3-solo-list li").length&&1e3<$(window).width()&&($(".side").prepend('
    '),$(".side .module:eq(0) .module__list").html($(".b3-solo-list")))},initArticle:function(){this._initArticleCommon(),setTimeout(function(){0===$("#externalRelevantArticlesWrap li").length&&($("#externalRelevantArticlesWrap").next().remove(),$("#externalRelevantArticlesWrap").remove()),0===$("#relevantArticlesWrap li").length&&($("#relevantArticlesWrap").prev().remove(),$("#relevantArticlesWrap").remove()),0===$("#randomArticlesWrap li").length&&($("#randomArticlesWrap").prev().remove(),$("#randomArticlesWrap").remove())},1e3)}};Skin.init(); \ No newline at end of file +var Skin={init:function(){Util.initPjax(function(){$(".header a").each(function(){this.href===location.href?this.className="current tooltipped tooltipped__w":this.className="tooltipped tooltipped__w"})}),$(".header a").each(function(){this.href===location.href&&(this.className="current tooltipped tooltipped__w")}).click(function(){$(".header a").removeClass("current"),this.className="current tooltipped tooltipped__w"}),$("body").on("click",".content-reset img",function(){window.open(this.src)})}};Skin.init(); \ No newline at end of file diff --git a/Jane/links.ftl b/Jane/links.ftl index ef88835..1593725 100644 --- a/Jane/links.ftl +++ b/Jane/links.ftl @@ -28,38 +28,26 @@ <#include "header.ftl"> -
    -
    +
    <#if pjax> -
    -
    -
    - - ${blogTitle} -   >   - - ${linkLabel} -
    +
    +

    + ${linkLabel} +

    +
    + ${links?size} ${cntLabel}${linkLabel}
    -
    -
    - <#if 0 != links?size> - - -
    +
    + <#list links as link> + + ${link.linkTitle} + (${link.linkDescription}) + +
    -
    - <#if pjax>
    + <#if pjax>
    <#include "footer.ftl"> diff --git a/Jane/macro-comments.ftl b/Jane/macro-comments.ftl index 3dd1c3e..aab6065 100644 --- a/Jane/macro-comments.ftl +++ b/Jane/macro-comments.ftl @@ -18,85 +18,78 @@ --> <#macro comments commentList article> -
    -
    ${commentLabel}
    +
    + ${commentLabel}
    -
      +
        <#list commentList as comment> <#include 'common-comment.ftl'/>
      <#if article.commentable> -
      -
      - ${postCommentsLabel} -
      -
      - - - <#if !isLoggedIn> - - - - - - - - - - - - - - - - - <#if !isLoggedIn> - - - - - - - - -
      - -
      - -
      - -
      - - - - - - - - - - - - - - - -
      - -
      - - validate -
      - - ${cancelLabel} - -
      -
      -
      + + + <#if !isLoggedIn> + + + + + + + + + + + + + + + + + <#if !isLoggedIn> + + + + + + + + +
      + +
      + +
      + +
      + + + + + + + + + + + + + + + +
      + +
      + + validate +
      + + + +
      @@ -122,8 +115,11 @@ page.addReplyForm(id, commentFormHTML) }; (function () { - page.load() - Skin.initArticle() + page.load({ + language: { + theme: 'tomorrow-night-eighties' + } + }) // emotions page.replaceCommentsEm('#comments .content-reset') <#nested> diff --git a/Jane/page.ftl b/Jane/page.ftl index dd8a1be..8f55ff7 100644 --- a/Jane/page.ftl +++ b/Jane/page.ftl @@ -29,21 +29,19 @@ <#include "header.ftl"> -
      -
      +
      <#if pjax> -
      -
      -
      -
      - ${page.pageContent} -
      -
      -
      - <@comments commentList=pageComments article=page> -
      + + <@comments commentList=pageComments article=page> <#if pjax> -
      <#include "footer.ftl"> <#if pjax> diff --git a/Jane/tag-articles.ftl b/Jane/tag-articles.ftl index f4929f5..bed47dc 100644 --- a/Jane/tag-articles.ftl +++ b/Jane/tag-articles.ftl @@ -29,25 +29,21 @@ <#include "header.ftl"> -
      -
      +
      <#if pjax> -
      -
      -
      - - ${blogTitle} -   >   +
      +

      + - ${allTagsLabel} -   >   - ${tag.tagTitle} ${tagLabel} -

      + ${allTagsLabel} + + +
      + ${tag.tagTitle}
      - <#include "article-list.ftl"> -
      - <#if pjax>
      + <#include "article-list.ftl"> + <#if pjax>
      <#include "footer.ftl"> diff --git a/Jane/tags.ftl b/Jane/tags.ftl index 4c42619..3cfed96 100644 --- a/Jane/tags.ftl +++ b/Jane/tags.ftl @@ -28,31 +28,25 @@ <#include "header.ftl"> -
      -
      +
      <#if pjax> -
      -
      -
      - - ${blogTitle} -   >   - ${sumLabel} ${tags?size} ${tagLabel} -
      +
      +

      + ${allTagsLabel} +

      +
      + ${sumLabel} ${tags?size} ${tagLabel}
      - -
      -
      - <#list tags as tag> - - -
      +
      + <#list tags as tag> + +
      -
      +
      <#if pjax>
      @@ -63,7 +57,7 @@