diff --git a/9IPHP/article.ftl b/9IPHP/article.ftl index ed0d5c5..7f3249a 100644 --- a/9IPHP/article.ftl +++ b/9IPHP/article.ftl @@ -136,6 +136,7 @@ <@comments commentList=articleComments article=article> +
diff --git a/9IPHP/css/base.css b/9IPHP/css/base.css index 4bd3d11..f1ce5e9 100644 --- a/9IPHP/css/base.css +++ b/9IPHP/css/base.css @@ -15,1208 +15,4 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -/* - * skin style - * - * @author Liyuan Li - * @version 0.5.0.0, Jan 4, 2019 -*/ -/* start common */ -html { - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100% -} -body { - margin: 0; - font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif; - font-size: 14px; - color: #333 -} -::-moz-selection { - text-shadow: none; - background: rgba(65, 131, 196, 0.4) -} -::selection { - text-shadow: none; - background: rgba(66, 133, 244, 0.4) -} -ul, -ol { - margin: 0; - padding: 0 -} -h1, -h2, -h3, -h4, -h5, -h6, -dl, -dd, -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 { - outline: 0; - text-decoration: none; - color: #383838; -} -a:hover { - color: #ff4d3a; - text-decoration: underline; -} -sub, -sup { - position: relative; - font-size: 75%; - line-height: 0; - vertical-align: baseline -} -sup { - top: -0.5em -} -sub { - bottom: -0.25em -} -img { - max-width: 100%; - vertical-align: middle; - border: 0; - height: auto; - -ms-interpolation-mode: bicubic -} -button, -input, -select, -textarea { - margin: 0; - font-size: 100%; - vertical-align: middle; - font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif; - outline: none -} -button, -input { - line-height: normal -} -button::-moz-focus-inner, -input::-moz-focus-inner { - padding: 0; - border: 0 -} -button, -input[type="button"], -input[type="reset"], -input[type="submit"] { - cursor: pointer; - -webkit-appearance: button -} -input[type="search"] { - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; - -webkit-appearance: textfield -} -input[type="search"]::-webkit-search-decoration, -input[type="search"]::-webkit-search-cancel-button { - -webkit-appearance: none -} -textarea { - overflow: auto; - resize: vertical -} -svg { - vertical-align: text-top; - fill: currentColor -} -blockquote { - margin: 0 -} -.content-reset { - font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif; - word-wrap: break-word; - overflow: auto; - line-height: 1.5; - font-size: 16px; - word-break: break-all -} -.content-reset a { - color: #ff4d3a; -} -.content-reset ul, -.content-reset ol { - padding-left: 2em; - margin-top: 0; - margin-bottom: 16px -} -.content-reset li { - margin-top: 0.25em -} -.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 { - padding-bottom: 0.3em; - font-size: 2em; - border-bottom: 1px solid #eee -} -.content-reset h2 { - padding-bottom: 0.3em; - font-size: 1.5em; - border-bottom: 1px solid #eee -} -.content-reset h3 { - font-size: 1.25em -} -.content-reset h4 { - font-size: 1em -} -.content-reset h5 { - font-size: 0.875em -} -.content-reset h6 { - font-size: 0.85em -} -.content-reset hr { - height: 0.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: 0.25em solid #ddd; - margin-bottom: 16px -} -.content-reset blockquote p { - margin: 0 -} -.content-reset iframe { - border: 1px solid #ccc -} -.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: bold; - text-align: center !important; - background: rgba(158, 188, 226, 0.2) -} -.content-reset tbody tr:nth-child(2n) { - background: rgba(158, 188, 226, 0.12) -} -.content-reset tr:hover { - background: #efefef -} -.content-reset code { - padding: 0.2em 0.4em; - margin: 0; - font-size: 85%; - background-color: rgba(252, 41, 41, 0.12); - border-radius: 3px; - color: #d23f31; - font-family: mononoki, Consolas, "Liberation Mono", Menlo, Courier, monospace -} -.content-reset pre>code { - padding: 0.5em; - color: #333; - background-color: rgba(0, 0, 0, 0.04); - background-image: url(../images/code-bg.png); - background-size: 20px 20px; - border-radius: 5px; - display: block; -} -.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: solid 1px #ccc; - border-bottom-color: #bbb; - border-radius: 3px; - box-shadow: inset 0 -1px 0 #bbb -} -.fn-pointer { - cursor: pointer -} -.fn-inline { - display: inline; -} -.fn-clear:before, -.fn-clear:after { - 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; - white-space: nowrap; - word-wrap: normal -} -.tooltipped { - position: relative; - cursor: pointer; -} - -.tooltipped::after { - position: absolute; - z-index: 1000000; - display: none; - padding: 5px 8px; - font-size: 11px; - font-weight: normal; - -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,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,0.8); - pointer-events: none; - content: ""; - border: 5px solid transparent; - opacity: 0 -} - -@-webkit-keyframes tooltip-appear { - from { - opacity: 0 - } - - to { - opacity: 1 - } -} - -@keyframes tooltip-appear { - from { - opacity: 0 - } - - to { - opacity: 1 - } -} - -.tooltipped-hover::before, -.tooltipped-hover::after, -.tooltipped:hover::before, -.tooltipped:hover::after, -.tooltipped:active::before, -.tooltipped:active::after, -.tooltipped:focus::before, -.tooltipped:focus::after { - display: inline-block; - text-decoration: none; - -webkit-animation-name: tooltip-appear; - animation-name: tooltip-appear; - -webkit-animation-duration: 0.1s; - animation-duration: 0.1s; - -webkit-animation-fill-mode: forwards; - animation-fill-mode: forwards; - -webkit-animation-timing-function: ease-in; - animation-timing-function: ease-in; - -webkit-animation-delay: 0.4s; - animation-delay: 0.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,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,0.8) -} - -.tooltipped-ne::after { - right: auto; - left: 50%; - margin-left: -15px -} - -.tooltipped-nw::after { - margin-right: -15px -} - -.tooltipped-s::after,.tooltipped-n::after { - -webkit-transform: translateX(50%); - transform: translateX(50%) -} - -.tooltipped-w::after { - right: 100%; - bottom: 50%; - margin-right: 5px; - -webkit-transform: translateY(50%); - transform: translateY(50%); -} - -.tooltipped-w::before { - top: 50%; - bottom: 50%; - left: -5px; - margin-top: -5px; - border-left-color: rgba(0,0,0,0.8); -} - -.tooltipped-e::after { - bottom: 50%; - left: 100%; - margin-left: 5px; - -webkit-transform: translateY(50%); - transform: translateY(50%) -} - -.tooltipped-e::before { - top: 50%; - right: -5px; - bottom: 50%; - margin-top: -5px; - border-right-color: rgba(0,0,0,0.8) -} - -a[class^="icon-"], -a[class*=" icon-"] { - color: #333 -} -a[class^="icon-"]:hover, -a[class*=" icon-"]:hover { - text-decoration: none; - color: #4285f4 -} -.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 { - 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: 0px -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; -} - -#commentForm, -#replyForm { - width: 100%; -} - -.comments { - position: relative; -} - -.comment-body-ref { - position: absolute; - width: 80%; - background-color: #fff; - right: 0; - border: 1px solid #eee; -} -/* end common */ - -/* start reset common */ -@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: normal; - font-style: normal; -} - -[class^="icon-"], [class*=" icon-"] { - /* use !important to prevent issues with browser extensions that change fonts */ - font-family: 'icomoon' !important; - speak: none; - font-style: normal; - font-weight: normal; - font-variant: normal; - text-transform: none; - line-height: 1; - - /* Better Font Rendering =========== */ - -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"; -} - -*::selection { - background: none repeat scroll 0% 0% #3D4450; - color: #FFF; - outline: none; -} - -a { - transition: all .3s; - outline: none; -} - -.pagination { - margin-bottom: 30px; - line-height: 30px; - font-family: Georgia; -} - -.pagination .page-number:first-child { - border-left: 1px solid #ddd; -} - -.pagination .page-number { - display: inline-block; - padding: 0 10px; - border: 1px solid #ddd; - border-left:0; - text-decoration: none; - float: left; -} - -.pagination a.page-number:hover { - color: #ff4d3a; - background-color: #eee; -} - -.pagination .page-number.current { - color: #fff; - background: #ff4d3a; - border-color: #ff4d3a; - margin-left: -1px; -} - -.module { - box-shadow: .0 1px 1px rgba(0,0,0,0.05); - margin-bottom: 20px; -} - -.module header h2 { - border-bottom: 1px solid #ff4d3a; - padding: 10px; - line-height: 18px; - font-size: 16px; - font-weight: 400; -} - -.module main { - padding: 20px; -} - -.ft-warn { - color: #ff4d3a; -} - -.ft-gray { - color: #aaa; -} - -.ft-center { - text-align: center; -} - -.list, -.module main.list { - padding: 0; -} - -.list li { - list-style: none; - border-bottom: 1px solid #eee; - line-height: 40px; - padding: 0 20px; -} - -.list li:last-child { - border-bottom: 0; -} - -.list a { - color: #666; - text-decoration: none; - display: block; -} - -.list a:hover { - color: #ff4d3a; -} - -.form input, -.form textarea { - border: 1px solid #ccc; - background-color: #FAFAFA; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075) inset; - padding: 0 10px; - width: 100%; - line-height: 28px; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box -} - -.form input { - height: 30px; -} - -.form input:focus, -.form textarea:focus { - background-color: #FFF; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075) inset, 0 0 5px rgba(81, 167, 232, 0.5); - border: 1px solid #51A7E8 -} - -.form button { - background-color: #EB5750; - border: 0; - color: #fff; -} - -.form button:hover { - background-color: #e42f19; -} -/* end reset common */ - -/* start framework */ -.wrapper { - width: 90%; - margin: 0 auto; - min-width: 720px; - max-width: 1300px; -} - -aside { - width: 28%; - min-width: 236px; -} - -.main-wrap { - display: flex; -} - -.main-wrap > main { - margin-right: 30px; - flex: 1; - min-width: 1px; -} -/* end framework */ - -/* start header */ -.banner { - background-color: #393939; - height: 75px; -} - -.banner h1 a { - color: #fff; - line-height: 75px; - text-decoration: none; -} - -.banner small { - color: #DFDFDF; - font-size: 15px; -} - -.banner .fn-right a { - line-height: 75px; - color: #DFDFDF; - text-decoration: none; - margin-left: 10px; - opacity: 0.6; -} - -.banner .fn-right a:hover { - opacity: 1; -} - -.navbar { - border-bottom: 1px solid #eee; - height: 50px; - margin-bottom: 30px; -} - -.navbar.pin { - position: fixed; - width: 100%; - background-color: rgba(255, 255, 255, 0.95); - top: 0; - z-index: 10; -} - -.navbar nav a { - color: #555; - text-decoration: none; - line-height: 50px; - padding: 0 10px; - display: inline-block; -} - -.navbar nav a:hover { - color: #333; -} - -.navbar nav a.current { - background-color: #eee; -} - -.navbar form { - position: relative; - margin-top: 8px; -} - -.navbar .form input { - padding-right: 40px; -} - -.navbar button { - background-color: #EB5750; - border: 0; - color: #fff; - position: absolute; - top: 0; - right: 0; - height: 30px; - width: 30px; -} - -.navbar button:hover { - background-color: #e42f19; -} - -.page-icon { - float: left; - height: 14px; - width: 14px; - margin: 18px 5px 0 0; -} -/* end header */ - -/* start footer */ -.footer { - padding: 30px 0; - text-align: center; - background: #111; - margin-top: 30px; - color: #fff; -} - -.footer a { - color: #ff4d3a; - text-decoration: none; -} - -.icon-up { - position: fixed; - bottom: 122px; - right: 20px; - color: #fff; - background-color: #111; - height: 30px; - width: 30px; - text-align: center; - line-height: 28px; - border-radius: 15px; - transition: all .3s; - cursor: pointer; - display: none; -} - -.icon-up:hover { - background-color: #ff4d3a; -} -/* end footer */ - -/* start side */ -aside .ad { - background-color: #3cbc8d; - border-color: #36a96b; - color: #fff; - padding: 20px; - margin-bottom: 20px; - border: 1px solid transparent; - box-sizing: border-box; -} - -aside .meta main { - text-align: right; - line-height: 20px; -} - -aside .meta img { - float: left; - height: 80px; - width: 80px; - border-radius: 5px; -} - -aside .tag.tooltipped { - display: inline-block; - padding: 2px 5px; - margin-bottom: 10px; - border: 1px solid #e1e1e1; - text-decoration: none; - margin-right: 10px; - line-height: 22px; -} - -aside.has-toc > ul > li { - list-style: none; - float: left; - width: 50%; - margin: 0; - cursor: pointer; - line-height: 18px; - font-size: 16px; - text-align: center; - font-weight: 400; -} - -aside.has-toc ul > li.current { - color: #ff4d3a; -} - -aside .b3-solo-list { - font-size: 14px; -} - -aside.has-toc > section:last-child { - margin-top: 20px; -} -/* end side */ - -/* start article list */ -.post { - border: 1px solid #ededed; - margin-bottom: 20px; - padding: 20px; - box-sizing: border-box; -} - -.post h1 { - margin-bottom: 10px; -} - -.post h1 a { - font-size: 24px; - font-weight: 500; - text-decoration: none; -} - -.post sup { - color: #aaa; - font-weight: 300; -} - -.post .meta { - color: #aaa; - margin-bottom: 10px; -} - -.post .meta a { - color: #aaa; - text-decoration: none; -} - -.post .meta a:hover { - color: #ff4d3a; -} - -.tags > a.tag { - color: #fff; - font-size: 12px; - display: inline-block; - background-color: #bbb; - margin-right: 10px; - padding: 0 5px; - line-height: 22px; - text-decoration: none; - margin-top: 10px; -} -.tags > a.tag:before { - content: "#"; -} -.tags > a.tag:hover { - background: #999; -} - -.post footer .copyright { - padding: 10px; - font-size: 14px; - line-height: 16px; - border: 1px solid #ff4d3a; - border-left-width: 20px; - margin: 20px 0; -} - -.post .rel a { - display: inline-block; - padding: 5px 14px; - background-color: #fff; - border: 1px solid #ddd; - border-radius: 15px; - text-decoration: none; - margin: 20px 0; -} - -.post .rel a:hover { - background-color: #eee; -} - -.title h2 { - font-size: 16px; - font-weight: bold; - padding-bottom: 10px; - border-bottom: 1px solid #f1f1f1; - margin-top: 20px; -} - -.title > h2.tip { - border-bottom: 0 -} -/* end article list */ - -/* start comments */ -.comments > li { - list-style: none; - border-bottom: 1px solid #f1f1f1; - padding: 10px; -} - -.comments > li > div { - display: flex; -} - -.comments .avatar { - width: 50px; - height: 50px; - border-radius: 100%; - margin-right: 20px; - background-size: contain; -} - -.comments main { - flex: 1; - min-width: 1px; -} - -.comments .content-reset { - margin-top: 10px; -} - -.comments .user-name { - color: #666; - text-decoration: none; -} - -.comments .user-name:hover { - color: #ff4d3a; -} - -.comments .reply-btn { - float: right; - background-color: #ff4d3a; - color: #fff; - text-decoration: none; - font-size: 12px; - padding: 2px 5px; -} - -.comments .reply-btn:hover { - background-color: #e42f19; -} - -#commentForm { - margin-top: 20px; -} - -.form .captcha { - height: 28px; -} -/* end comments */ - -/* start other */ -.other { - border: 1px solid #ededed; - margin-bottom: 20px; - padding: 0 20px 20px; -} -/* end other */ - -/* start responsive */ -@media (max-width: 900px) { - .navbar .form { - display: none; - } -} -@media (max-width: 700px) { - .page-icon { - margin: 13px 3px 0 0; - } - - .wrapper { - width: 100%; - min-width: auto; - padding: 0 10px; - box-sizing: border-box; - } - - .main-wrap > main { - margin-right: 0; - } - - .main-wrap, - .responsive { - display: block; - } - - aside { - width: 100%; - box-sizing: border-box; - } - - .banner { - margin-bottom: 20px; - } - - .banner small, - .banner .fn-right, - .navbar { - display: none; - } - - .icon-list { - position: absolute; - right: 10px; - top: 20px; - background-color: #fff; - font-size: 20px; - padding: 8px 6px; - cursor: pointer; - } - - .responsive .list { - background-color: #fff; - position: absolute; - width: 100%; - border: 1px solid #eee; - left: 0; - display: none; - z-index: 10; - top: 75px; - } - - .responsive .list li.current { - background-color: #eee; - } -} -/* end responsive */ \ No newline at end of file +html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;height:100%}body{margin:0;font-family:"Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif;font-size:14px;background-color:#fff;-webkit-font-smoothing:antialiased;-webkit-overflow-scrolling:touch}::-moz-selection{text-shadow:none;background:rgba(65,131,196,0.4)}::selection{text-shadow:none;background:rgba(66,133,244,0.4)}ul,ol{margin:0;padding:0}h1,h2,h3,h4,h5,h6,dl,dd,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{outline:0;text-decoration:none}a:hover{text-decoration:underline}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.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{margin:0;font-size:100%;vertical-align:middle;font-family:"Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif;outline:none}button,input{line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}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-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;resize:vertical}svg{fill:currentColor;display:inline-block;stroke-width:0;stroke:currentColor;width:14px;height:14px}blockquote{margin:0}.content-reset{word-wrap:break-word;overflow:auto;line-height:1.65;font-size:16px;word-break:break-word}.content-reset ul,.content-reset ol{padding-left:2em;margin-top:0;margin-bottom:16px}.content-reset li{margin-top:0.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{padding-bottom:0.3em;font-size:1.7em;border-bottom:1px solid #eee}.content-reset h2{padding-bottom:0.3em;font-size:1.5em;border-bottom:1px solid #eee}.content-reset h3{font-size:1.25em}.content-reset h4{font-size:1em}.content-reset h5{font-size:0.875em}.content-reset h6{font-size:0.85em}.content-reset hr{height:0.15em;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:0.25em solid #ddd;margin-bottom:16px}.content-reset blockquote p{margin:0}.content-reset ins>iframe{border:0}.content-reset iframe{border:1px solid rgba(0,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:bold;text-align:center !important;background:rgba(158,188,226,0.2)}.content-reset tbody tr:nth-child(2n){background:rgba(158,188,226,0.12)}.content-reset tr:hover{background:#efefef}.content-reset code{padding:0.2em 0.4em;margin:0;font-size:85%;background-color:rgba(252,41,41,0.12);border-radius:3px;word-break:break-word}.content-reset pre{position:relative}.content-reset pre textarea{position:absolute;top:-100000px}.content-reset pre>code{padding:0.5em;background-color:rgba(0,0,0,0.04);background-size:20px 20px;border-radius:5px;display:block}.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:solid 1px rgba(0,0,0,0.38);border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.content-reset__task,.content-reset .task-list-item{list-style:none;margin-left:-1em}.img-preview{width:100%;height:100%;top:0;z-index:211;overflow:auto;cursor:zoom-out;transition:background-color .2s ease-in-out}.img-preview img{max-width:inherit;transition:transform .3s ease-in-out}@-webkit-keyframes tooltip-appear{from{opacity:0}to{opacity:1}}@keyframes tooltip-appear{from{opacity:0}to{opacity:1}}.tooltipped{position:relative;cursor:pointer}.tooltipped::after{position:absolute;z-index:1000000;display:none;padding:5px 8px;font-size:11px;font-weight:normal;-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,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,0.8);pointer-events:none;content:"";border:5px solid transparent;opacity:0}.tooltipped--hover::before,.tooltipped--hover::after,.tooltipped:hover::before,.tooltipped:hover::after,.tooltipped:active::before,.tooltipped:active::after,.tooltipped:focus::before,.tooltipped:focus::after{display:inline-block;text-decoration:none;animation-name:tooltip-appear;animation-duration:0.1s;animation-fill-mode:forwards;animation-timing-function:ease-in;animation-delay:0.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,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,0.8)}.tooltipped__ne::after{right:auto;left:50%;margin-left:-15px}.tooltipped__nw::after{margin-right:-15px}.tooltipped__s::after,.tooltipped__n::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,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,0.8)}a{outline:0;text-decoration:none;color:#383838}a:hover{color:#ff4d3a;text-decoration:underline}.content-reset a{color:#ff4d3a}.fn-pointer{cursor:pointer}.fn-inline{display:inline}.fn-clear:before,.fn-clear:after{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;white-space:nowrap;word-wrap:normal}a[class^="icon-"],a[class*=" icon-"]{color:#333}a[class^="icon-"]:hover,a[class*=" icon-"]:hover{text-decoration:none;color:#4285f4}#commentForm,#replyForm{width:100%}.comments{position:relative}.comment-body-ref{position:absolute;width:80%;background-color:#fff;right:0;border:1px solid #eee}@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:normal;font-style:normal}[class^="icon-"],[class*=" icon-"]{font-family:'icomoon' !important;speak:none;font-style:normal;font-weight:normal;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"}*::selection{background:none repeat scroll 0% 0% #3D4450;color:#FFF;outline:none}a{transition:all .3s;outline:none}.pagination{margin-bottom:30px;line-height:30px;font-family:Georgia}.pagination .page-number:first-child{border-left:1px solid #ddd}.pagination .page-number{display:inline-block;padding:0 10px;border:1px solid #ddd;border-left:0;text-decoration:none;float:left}.pagination a.page-number:hover{color:#ff4d3a;background-color:#eee}.pagination .page-number.current{color:#fff;background:#ff4d3a;border-color:#ff4d3a;margin-left:-1px}.module{box-shadow:0 1px 1px rgba(0,0,0,0.05);margin-bottom:20px}.module header h2{border-bottom:1px solid #ff4d3a;padding:10px;line-height:18px;font-size:16px;font-weight:400}.module main{padding:20px}.ft-warn{color:#ff4d3a}.ft-gray{color:#aaa}.ft-center{text-align:center}.list,.module main.list{padding:0}.list li{list-style:none;border-bottom:1px solid #eee;line-height:40px;padding:0 20px}.list li:last-child{border-bottom:0}.list a{color:#666;text-decoration:none;display:block}.list a:hover{color:#ff4d3a}.form input,.form textarea{border:1px solid #ccc;background-color:#FAFAFA;box-shadow:0 1px 2px rgba(0,0,0,0.075) inset;padding:0 10px;width:100%;line-height:28px;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}.form input{height:30px}.form input:focus,.form textarea:focus{background-color:#FFF;box-shadow:0 1px 2px rgba(0,0,0,0.075) inset,0 0 5px rgba(81,167,232,0.5);border:1px solid #51A7E8}.form button{background-color:#EB5750;border:0;color:#fff}.form button:hover{background-color:#e42f19}.wrapper{width:90%;margin:0 auto;min-width:720px;max-width:1300px}aside{width:28%;min-width:236px}.main-wrap{display:flex}.main-wrap>main{margin-right:30px;flex:1;min-width:1px}.banner{background-color:#393939;height:75px}.banner h1 a{color:#fff;line-height:75px;text-decoration:none}.banner small{color:#DFDFDF;font-size:15px}.banner .fn-right a{line-height:75px;color:#DFDFDF;text-decoration:none;margin-left:10px;opacity:0.6}.banner .fn-right a:hover{opacity:1}.navbar{border-bottom:1px solid #eee;height:50px;margin-bottom:30px}.navbar.pin{position:fixed;width:100%;background-color:rgba(255,255,255,0.95);top:0;z-index:10}.navbar nav a{color:#555;text-decoration:none;line-height:50px;padding:0 10px;display:inline-block}.navbar nav a:hover{color:#333}.navbar nav a.current{background-color:#eee}.navbar form{position:relative;margin-top:8px}.navbar .form input{padding-right:40px}.navbar button{background-color:#EB5750;border:0;color:#fff;position:absolute;top:0;right:0;height:30px;width:30px}.navbar button:hover{background-color:#e42f19}.page-icon{float:left;height:14px;width:14px;margin:18px 5px 0 0}.footer{padding:30px 0;text-align:center;background:#111;margin-top:30px;color:#fff}.footer a{color:#ff4d3a;text-decoration:none}.icon-up{position:fixed;bottom:122px;right:20px;color:#fff;background-color:#111;height:30px;width:30px;text-align:center;line-height:28px;border-radius:15px;transition:all .3s;cursor:pointer;display:none}.icon-up:hover{background-color:#ff4d3a}aside .ad{background-color:#3cbc8d;border-color:#36a96b;color:#fff;padding:20px;margin-bottom:20px;border:1px solid transparent;box-sizing:border-box}aside .meta main{text-align:right;line-height:20px}aside .meta img{float:left;height:80px;width:80px;border-radius:5px}aside .tag.tooltipped{display:inline-block;padding:2px 5px;margin-bottom:10px;border:1px solid #e1e1e1;text-decoration:none;margin-right:10px;line-height:22px}aside.has-toc>ul>li{list-style:none;float:left;width:50%;margin:0;cursor:pointer;line-height:18px;font-size:16px;text-align:center;font-weight:400}aside.has-toc ul>li.current{color:#ff4d3a}aside .b3-solo-list{font-size:14px}aside.has-toc>section:last-child{margin-top:20px}.post{border:1px solid #ededed;margin-bottom:20px;padding:20px;box-sizing:border-box}.post h1{margin-bottom:10px}.post h1 a{font-size:24px;font-weight:500;text-decoration:none}.post sup{color:#aaa;font-weight:300}.post .meta{color:#aaa;margin-bottom:10px}.post .meta a{color:#aaa;text-decoration:none}.post .meta a:hover{color:#ff4d3a}.tags>a.tag{color:#fff;font-size:12px;display:inline-block;background-color:#bbb;margin-right:10px;padding:0 5px;line-height:22px;text-decoration:none;margin-top:10px}.tags>a.tag:before{content:"#"}.tags>a.tag:hover{background:#999}.post footer .copyright{padding:10px;font-size:14px;line-height:16px;border:1px solid #ff4d3a;border-left-width:20px;margin:20px 0}.post .rel a{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px;text-decoration:none;margin:20px 0}.post .rel a:hover{background-color:#eee}.title h2{font-size:16px;font-weight:bold;padding-bottom:10px;border-bottom:1px solid #f1f1f1;margin-top:20px}.title>h2.tip{border-bottom:0}.comments>li{list-style:none;border-bottom:1px solid #f1f1f1;padding:10px}.comments>li>div{display:flex}.comments .avatar{width:50px;height:50px;border-radius:100%;margin-right:20px;background-size:contain}.comments main{flex:1;min-width:1px}.comments .content-reset{margin-top:10px}.comments .user-name{color:#666;text-decoration:none}.comments .user-name:hover{color:#ff4d3a}.comments .reply-btn{float:right;background-color:#ff4d3a;color:#fff;text-decoration:none;font-size:12px;padding:2px 5px}.comments .reply-btn:hover{background-color:#e42f19}#commentForm{margin-top:20px}.form .captcha{height:28px}.other{border:1px solid #ededed;margin-bottom:20px;padding:0 20px 20px}@media (max-width: 900px){.navbar .form{display:none}}@media (max-width: 700px){.page-icon{margin:13px 3px 0 0}.wrapper{width:100%;min-width:auto;padding:0 10px;box-sizing:border-box}.main-wrap>main{margin-right:0}.main-wrap,.responsive{display:block}aside{width:100%;box-sizing:border-box}.banner{margin-bottom:20px}.banner small,.banner .fn-right,.navbar{display:none}.icon-list{position:absolute;right:10px;top:20px;background-color:#fff;font-size:20px;padding:8px 6px;cursor:pointer}.responsive .list{background-color:#fff;position:absolute;width:100%;border:1px solid #eee;left:0;display:none;z-index:10;top:75px}.responsive .list li.current{background-color:#eee}} diff --git a/9IPHP/css/base.min.css b/9IPHP/css/base.min.css deleted file mode 100644 index 17cb333..0000000 --- a/9IPHP/css/base.min.css +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Solo - A small and beautiful blogging system written in Java. - * Copyright (c) 2010-2019, b3log.org & hacpai.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -blockquote,body,dd,dl,h1,h2,h3,h4,h5,h6,ol,p,ul{margin:0}.content-reset,body,button,input,select,textarea{font-family:"Helvetica Neue","Luxi Sans","DejaVu Sans",Tahoma,"Hiragino Sans GB","Microsoft Yahei",sans-serif}html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{font-size:14px;color:#333}::-moz-selection{text-shadow:none;background:rgba(65,131,196,.4)}ol,ul{padding: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{text-decoration:none;color:#383838}.content-reset a,a:hover{color:#ff4d3a}a:hover{text-decoration:underline}sub,sup{position:relative;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}button,input,select,textarea{margin:0;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]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;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{vertical-align:text-top;fill:currentColor}.content-reset{word-wrap:break-word;overflow:auto;line-height:1.5;font-size:16px;word-break:break-all}.content-reset ol,.content-reset ul{padding-left:2em;margin-top:0;margin-bottom:16px}.content-reset li{margin-top:.25em}.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:2em}.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 #ccc}.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)}.footer,.ft-center,.icon-up{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;color:#d23f31;font-family:mononoki,Consolas,"Liberation Mono",Menlo,Courier,monospace}.content-reset pre>code{padding:.5em;color:#333;background-color:rgba(0,0,0,.04);background-image:url(../images/code-bg.png);background-size:20px 20px;border-radius:5px;display:block}.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 #ccc;border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.fn-pointer{cursor:pointer}.fn-inline{display:inline}.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;white-space:nowrap;word-wrap:normal}.tooltipped{position:relative;cursor:pointer}.tooltipped::after,.tooltipped::before{position:absolute;display:none;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-align:center;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;opacity:0}.tooltipped::before{z-index:1000001;width:0;height:0;color:rgba(0,0,0,.8);content:"";border:5px solid transparent;opacity:0}@-webkit-keyframes tooltip-appear{from{opacity:0}to{opacity:1}}@keyframes tooltip-appear{from{opacity:0}to{opacity:1}}.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;-webkit-animation-name:tooltip-appear;animation-name:tooltip-appear;-webkit-animation-duration:.1s;animation-duration:.1s;-webkit-animation-fill-mode:forwards;animation-fill-mode:forwards;-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in;-webkit-animation-delay:.4s;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{-webkit-transform:translateX(50%);transform:translateX(50%)}.tooltipped-w::after{right:100%;bottom:50%;margin-right:5px;-webkit-transform:translateY(50%);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;-webkit-transform:translateY(50%);transform:translateY(50%)}.tooltipped-e::before{top:50%;right:-5px;bottom:50%;margin-top:-5px;border-right-color:rgba(0,0,0,.8)}a[class*=" icon-"],a[class^=icon-]{color:#333}a[class*=" icon-"]:hover,a[class^=icon-]:hover{text-decoration:none;color:#4285f4}.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}.icon-up,a{transition:all .3s}.emotions 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}#commentForm,#replyForm{width:100%}.comments{position:relative}.comment-body-ref{position:absolute;width:80%;background-color:#fff;right:0;border:1px solid #eee}@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"}::selection{text-shadow:none;background:#3D4450;color:#FFF;outline:0}a{outline:0}.pagination{margin-bottom:30px;line-height:30px;font-family:Georgia}.pagination .page-number:first-child{border-left:1px solid #ddd}.pagination .page-number{display:inline-block;padding:0 10px;border:1px solid #ddd;border-left:0;text-decoration:none;float:left}.pagination a.page-number:hover{color:#ff4d3a;background-color:#eee}.pagination .page-number.current{color:#fff;background:#ff4d3a;border-color:#ff4d3a;margin-left:-1px}.module{box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:20px}.module header h2{border-bottom:1px solid #ff4d3a;padding:10px;line-height:18px;font-size:16px;font-weight:400}.module main{padding:20px}.ft-warn{color:#ff4d3a}.ft-gray{color:#aaa}.list,.module main.list{padding:0}.list li{list-style:none;border-bottom:1px solid #eee;line-height:40px;padding:0 20px}.list li:last-child{border-bottom:0}.list a{color:#666;text-decoration:none;display:block}.list a:hover{color:#ff4d3a}.form input,.form textarea{border:1px solid #ccc;background-color:#FAFAFA;box-shadow:0 1px 2px rgba(0,0,0,.075) inset;padding:0 10px;width:100%;line-height:28px;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}.banner .fn-right a,.banner h1 a{line-height:75px;text-decoration:none}.post,aside .ad{box-sizing:border-box}.form input{height:30px}.form input:focus,.form textarea:focus{background-color:#FFF;box-shadow:0 1px 2px rgba(0,0,0,.075) inset,0 0 5px rgba(81,167,232,.5);border:1px solid #51A7E8}.form button{background-color:#EB5750;border:0;color:#fff}.form button:hover{background-color:#e42f19}.wrapper{width:90%;margin:0 auto;min-width:720px;max-width:1300px}aside{width:28%;min-width:236px}.main-wrap{display:flex}.main-wrap>main{margin-right:30px;flex:1;min-width:1px}.banner{background-color:#393939;height:75px}.banner h1 a{color:#fff}.banner small{color:#DFDFDF;font-size:15px}.banner .fn-right a{color:#DFDFDF;margin-left:10px;opacity:.6}.banner .fn-right a:hover{opacity:1}.navbar{border-bottom:1px solid #eee;height:50px;margin-bottom:30px}.navbar.pin{position:fixed;width:100%;background-color:rgba(255,255,255,.95);top:0;z-index:10}.navbar nav a{color:#555;text-decoration:none;line-height:50px;padding:0 10px;display:inline-block}.navbar nav a:hover{color:#333}.navbar nav a.current{background-color:#eee}.navbar form{position:relative;margin-top:8px}.navbar .form input{padding-right:40px}.navbar button{background-color:#EB5750;border:0;color:#fff;position:absolute;top:0;right:0;height:30px;width:30px}.navbar button:hover{background-color:#e42f19}.page-icon{float:left;height:14px;width:14px;margin:18px 5px 0 0}.footer{padding:30px 0;background:#111;margin-top:30px;color:#fff}.footer a{color:#ff4d3a;text-decoration:none}.icon-up{position:fixed;bottom:122px;right:20px;color:#fff;background-color:#111;height:30px;width:30px;line-height:28px;border-radius:15px;cursor:pointer;display:none}.post .rel a,.tags>a.tag,aside .tag.tooltipped{display:inline-block;text-decoration:none}.icon-up:hover{background-color:#ff4d3a}aside .ad{background-color:#3cbc8d;color:#fff;padding:20px;margin-bottom:20px;border:1px solid transparent}aside .meta main{text-align:right;line-height:20px}aside .meta img{float:left;height:80px;width:80px;border-radius:5px}aside .tag.tooltipped{padding:2px 5px;margin-bottom:10px;border:1px solid #e1e1e1;margin-right:10px;line-height:22px}aside.has-toc>ul>li{list-style:none;float:left;width:50%;margin:0;cursor:pointer;line-height:18px;font-size:16px;text-align:center;font-weight:400}aside.has-toc ul>li.current{color:#ff4d3a}.post .meta,.post sup{color:#aaa}aside .b3-solo-list{font-size:14px}aside.has-toc>section:last-child{margin-top:20px}.post{border:1px solid #ededed;margin-bottom:20px;padding:20px}.post .meta,.post h1{margin-bottom:10px}.post h1 a{font-size:24px;font-weight:500;text-decoration:none}.post sup{font-weight:300}.post .meta a{color:#aaa;text-decoration:none}.post .meta a:hover{color:#ff4d3a}.tags>a.tag{color:#fff;font-size:12px;background-color:#bbb;margin-right:10px;padding:0 5px;line-height:22px;margin-top:10px}.tags>a.tag:before{content:"#"}.tags>a.tag:hover{background:#999}.post footer .copyright{padding:10px;font-size:14px;line-height:16px;border:1px solid #ff4d3a;border-left-width:20px;margin:20px 0}.post .rel a{padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px;margin:20px 0}.post .rel a:hover{background-color:#eee}.title h2{font-size:16px;font-weight:700;padding-bottom:10px;border-bottom:1px solid #f1f1f1;margin-top:20px}.title>h2.tip{border-bottom:0}.comments>li{list-style:none;border-bottom:1px solid #f1f1f1;padding:10px}.comments>li>div{display:flex}.comments .avatar{width:50px;height:50px;border-radius:100%;margin-right:20px;background-size:contain}.comments main{flex:1;min-width:1px}.comments .content-reset{margin-top:10px}.comments .user-name{color:#666;text-decoration:none}.comments .user-name:hover{color:#ff4d3a}.comments .reply-btn{float:right;background-color:#ff4d3a;color:#fff;text-decoration:none;font-size:12px;padding:2px 5px}.comments .reply-btn:hover{background-color:#e42f19}#commentForm{margin-top:20px}.form .captcha{height:28px}.other{border:1px solid #ededed;margin-bottom:20px;padding:0 20px 20px}@media (max-width:900px){.navbar .form{display:none}}@media (max-width:700px){.wrapper,aside{box-sizing:border-box;width:100%}.icon-list,.responsive .list{background-color:#fff;position:absolute}.page-icon{margin:13px 3px 0 0}.wrapper{min-width:auto;padding:0 10px}.main-wrap>main{margin-right:0}.main-wrap,.responsive{display:block}.banner{margin-bottom:20px}.banner .fn-right,.banner small,.navbar{display:none}.icon-list{right:10px;top:20px;font-size:20px;padding:8px 6px;cursor:pointer}.responsive .list{width:100%;border:1px solid #eee;left:0;display:none;z-index:10;top:75px}.responsive .list li.current{background-color:#eee}} \ No newline at end of file diff --git a/9IPHP/css/base.scss b/9IPHP/css/base.scss new file mode 100644 index 0000000..54bb323 --- /dev/null +++ b/9IPHP/css/base.scss @@ -0,0 +1,745 @@ +/** + * Solo - A small and beautiful blogging system written in Java. + * Copyright (c) 2010-2019, b3log.org & hacpai.com + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +/* + * skin style + * + * @author Liyuan Li + * @version 1.0.0.0, Feb 21, 2019 +*/ +/* start common */ +@import "../../../scss/reset"; +@import "../../../scss/reset-content"; +@import "../../../scss/tooltipped"; +a { + outline: 0; + text-decoration: none; + color: #383838; +} +a:hover { + color: #ff4d3a; + text-decoration: underline; +} +.content-reset a { + color: #ff4d3a; +} +.fn-pointer { + cursor: pointer +} +.fn-inline { + display: inline; +} +.fn-clear:before, +.fn-clear:after { + 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; + white-space: nowrap; + word-wrap: normal +} + +a[class^="icon-"], +a[class*=" icon-"] { + color: #333 +} +a[class^="icon-"]:hover, +a[class*=" icon-"]:hover { + text-decoration: none; + color: #4285f4 +} + +#commentForm, +#replyForm { + width: 100%; +} + +.comments { + position: relative; +} + +.comment-body-ref { + position: absolute; + width: 80%; + background-color: #fff; + right: 0; + border: 1px solid #eee; +} +/* end common */ + +/* start reset common */ +@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: normal; + font-style: normal; +} + +[class^="icon-"], [class*=" icon-"] { + /* use !important to prevent issues with browser extensions that change fonts */ + font-family: 'icomoon' !important; + speak: none; + font-style: normal; + font-weight: normal; + font-variant: normal; + text-transform: none; + line-height: 1; + + /* Better Font Rendering =========== */ + -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"; +} + +*::selection { + background: none repeat scroll 0% 0% #3D4450; + color: #FFF; + outline: none; +} + +a { + transition: all .3s; + outline: none; +} + +.pagination { + margin-bottom: 30px; + line-height: 30px; + font-family: Georgia; +} + +.pagination .page-number:first-child { + border-left: 1px solid #ddd; +} + +.pagination .page-number { + display: inline-block; + padding: 0 10px; + border: 1px solid #ddd; + border-left:0; + text-decoration: none; + float: left; +} + +.pagination a.page-number:hover { + color: #ff4d3a; + background-color: #eee; +} + +.pagination .page-number.current { + color: #fff; + background: #ff4d3a; + border-color: #ff4d3a; + margin-left: -1px; +} + +.module { + box-shadow: .0 1px 1px rgba(0,0,0,0.05); + margin-bottom: 20px; +} + +.module header h2 { + border-bottom: 1px solid #ff4d3a; + padding: 10px; + line-height: 18px; + font-size: 16px; + font-weight: 400; +} + +.module main { + padding: 20px; +} + +.ft-warn { + color: #ff4d3a; +} + +.ft-gray { + color: #aaa; +} + +.ft-center { + text-align: center; +} + +.list, +.module main.list { + padding: 0; +} + +.list li { + list-style: none; + border-bottom: 1px solid #eee; + line-height: 40px; + padding: 0 20px; +} + +.list li:last-child { + border-bottom: 0; +} + +.list a { + color: #666; + text-decoration: none; + display: block; +} + +.list a:hover { + color: #ff4d3a; +} + +.form input, +.form textarea { + border: 1px solid #ccc; + background-color: #FAFAFA; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075) inset; + padding: 0 10px; + width: 100%; + line-height: 28px; + box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box +} + +.form input { + height: 30px; +} + +.form input:focus, +.form textarea:focus { + background-color: #FFF; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075) inset, 0 0 5px rgba(81, 167, 232, 0.5); + border: 1px solid #51A7E8 +} + +.form button { + background-color: #EB5750; + border: 0; + color: #fff; +} + +.form button:hover { + background-color: #e42f19; +} +/* end reset common */ + +/* start framework */ +.wrapper { + width: 90%; + margin: 0 auto; + min-width: 720px; + max-width: 1300px; +} + +aside { + width: 28%; + min-width: 236px; +} + +.main-wrap { + display: flex; +} + +.main-wrap > main { + margin-right: 30px; + flex: 1; + min-width: 1px; +} +/* end framework */ + +/* start header */ +.banner { + background-color: #393939; + height: 75px; +} + +.banner h1 a { + color: #fff; + line-height: 75px; + text-decoration: none; +} + +.banner small { + color: #DFDFDF; + font-size: 15px; +} + +.banner .fn-right a { + line-height: 75px; + color: #DFDFDF; + text-decoration: none; + margin-left: 10px; + opacity: 0.6; +} + +.banner .fn-right a:hover { + opacity: 1; +} + +.navbar { + border-bottom: 1px solid #eee; + height: 50px; + margin-bottom: 30px; +} + +.navbar.pin { + position: fixed; + width: 100%; + background-color: rgba(255, 255, 255, 0.95); + top: 0; + z-index: 10; +} + +.navbar nav a { + color: #555; + text-decoration: none; + line-height: 50px; + padding: 0 10px; + display: inline-block; +} + +.navbar nav a:hover { + color: #333; +} + +.navbar nav a.current { + background-color: #eee; +} + +.navbar form { + position: relative; + margin-top: 8px; +} + +.navbar .form input { + padding-right: 40px; +} + +.navbar button { + background-color: #EB5750; + border: 0; + color: #fff; + position: absolute; + top: 0; + right: 0; + height: 30px; + width: 30px; +} + +.navbar button:hover { + background-color: #e42f19; +} + +.page-icon { + float: left; + height: 14px; + width: 14px; + margin: 18px 5px 0 0; +} +/* end header */ + +/* start footer */ +.footer { + padding: 30px 0; + text-align: center; + background: #111; + margin-top: 30px; + color: #fff; +} + +.footer a { + color: #ff4d3a; + text-decoration: none; +} + +.icon-up { + position: fixed; + bottom: 122px; + right: 20px; + color: #fff; + background-color: #111; + height: 30px; + width: 30px; + text-align: center; + line-height: 28px; + border-radius: 15px; + transition: all .3s; + cursor: pointer; + display: none; +} + +.icon-up:hover { + background-color: #ff4d3a; +} +/* end footer */ + +/* start side */ +aside .ad { + background-color: #3cbc8d; + border-color: #36a96b; + color: #fff; + padding: 20px; + margin-bottom: 20px; + border: 1px solid transparent; + box-sizing: border-box; +} + +aside .meta main { + text-align: right; + line-height: 20px; +} + +aside .meta img { + float: left; + height: 80px; + width: 80px; + border-radius: 5px; +} + +aside .tag.tooltipped { + display: inline-block; + padding: 2px 5px; + margin-bottom: 10px; + border: 1px solid #e1e1e1; + text-decoration: none; + margin-right: 10px; + line-height: 22px; +} + +aside.has-toc > ul > li { + list-style: none; + float: left; + width: 50%; + margin: 0; + cursor: pointer; + line-height: 18px; + font-size: 16px; + text-align: center; + font-weight: 400; +} + +aside.has-toc ul > li.current { + color: #ff4d3a; +} + +aside .b3-solo-list { + font-size: 14px; +} + +aside.has-toc > section:last-child { + margin-top: 20px; +} +/* end side */ + +/* start article list */ +.post { + border: 1px solid #ededed; + margin-bottom: 20px; + padding: 20px; + box-sizing: border-box; +} + +.post h1 { + margin-bottom: 10px; +} + +.post h1 a { + font-size: 24px; + font-weight: 500; + text-decoration: none; +} + +.post sup { + color: #aaa; + font-weight: 300; +} + +.post .meta { + color: #aaa; + margin-bottom: 10px; +} + +.post .meta a { + color: #aaa; + text-decoration: none; +} + +.post .meta a:hover { + color: #ff4d3a; +} + +.tags > a.tag { + color: #fff; + font-size: 12px; + display: inline-block; + background-color: #bbb; + margin-right: 10px; + padding: 0 5px; + line-height: 22px; + text-decoration: none; + margin-top: 10px; +} +.tags > a.tag:before { + content: "#"; +} +.tags > a.tag:hover { + background: #999; +} + +.post footer .copyright { + padding: 10px; + font-size: 14px; + line-height: 16px; + border: 1px solid #ff4d3a; + border-left-width: 20px; + margin: 20px 0; +} + +.post .rel a { + display: inline-block; + padding: 5px 14px; + background-color: #fff; + border: 1px solid #ddd; + border-radius: 15px; + text-decoration: none; + margin: 20px 0; +} + +.post .rel a:hover { + background-color: #eee; +} + +.title h2 { + font-size: 16px; + font-weight: bold; + padding-bottom: 10px; + border-bottom: 1px solid #f1f1f1; + margin-top: 20px; +} + +.title > h2.tip { + border-bottom: 0 +} +/* end article list */ + +/* start comments */ +.comments > li { + list-style: none; + border-bottom: 1px solid #f1f1f1; + padding: 10px; +} + +.comments > li > div { + display: flex; +} + +.comments .avatar { + width: 50px; + height: 50px; + border-radius: 100%; + margin-right: 20px; + background-size: contain; +} + +.comments main { + flex: 1; + min-width: 1px; +} + +.comments .content-reset { + margin-top: 10px; +} + +.comments .user-name { + color: #666; + text-decoration: none; +} + +.comments .user-name:hover { + color: #ff4d3a; +} + +.comments .reply-btn { + float: right; + background-color: #ff4d3a; + color: #fff; + text-decoration: none; + font-size: 12px; + padding: 2px 5px; +} + +.comments .reply-btn:hover { + background-color: #e42f19; +} + +#commentForm { + margin-top: 20px; +} + +.form .captcha { + height: 28px; +} +/* end comments */ + +/* start other */ +.other { + border: 1px solid #ededed; + margin-bottom: 20px; + padding: 0 20px 20px; +} +/* end other */ + +/* start responsive */ +@media (max-width: 900px) { + .navbar .form { + display: none; + } +} +@media (max-width: 700px) { + .page-icon { + margin: 13px 3px 0 0; + } + + .wrapper { + width: 100%; + min-width: auto; + padding: 0 10px; + box-sizing: border-box; + } + + .main-wrap > main { + margin-right: 0; + } + + .main-wrap, + .responsive { + display: block; + } + + aside { + width: 100%; + box-sizing: border-box; + } + + .banner { + margin-bottom: 20px; + } + + .banner small, + .banner .fn-right, + .navbar { + display: none; + } + + .icon-list { + position: absolute; + right: 10px; + top: 20px; + background-color: #fff; + font-size: 20px; + padding: 8px 6px; + cursor: pointer; + } + + .responsive .list { + background-color: #fff; + position: absolute; + width: 100%; + border: 1px solid #eee; + left: 0; + display: none; + z-index: 10; + top: 75px; + } + + .responsive .list li.current { + background-color: #eee; + } +} +/* end responsive */ \ No newline at end of file diff --git a/9IPHP/footer.ftl b/9IPHP/footer.ftl index 7034db3..5bda392 100644 --- a/9IPHP/footer.ftl +++ b/9IPHP/footer.ftl @@ -42,25 +42,10 @@ var Label = { "markedAvailable": ${markedAvailable?c}, - "skinDirName": "${skinDirName}", - "em00Label": "${em00Label}", - "em01Label": "${em01Label}", - "em02Label": "${em02Label}", - "em03Label": "${em03Label}", - "em04Label": "${em04Label}", - "em05Label": "${em05Label}", - "em06Label": "${em06Label}", - "em07Label": "${em07Label}", - "em08Label": "${em08Label}", - "em09Label": "${em09Label}", - "em10Label": "${em10Label}", - "em11Label": "${em11Label}", - "em12Label": "${em12Label}", - "em13Label": "${em13Label}", - "em14Label": "${em14Label}" + "skinDirName": "${skinDirName}" }; Util.initSW(); - Util.parseMarkdown('content-reset'); + Util.parseMarkdown(); Util.killIE(10) ${plugins} diff --git a/9IPHP/macro-head.ftl b/9IPHP/macro-head.ftl index 3ca058a..a39d5b9 100644 --- a/9IPHP/macro-head.ftl +++ b/9IPHP/macro-head.ftl @@ -28,7 +28,7 @@ - + diff --git a/Andrea/article-list.ftl b/Andrea/article-list.ftl index 46d0ac6..5102244 100644 --- a/Andrea/article-list.ftl +++ b/Andrea/article-list.ftl @@ -55,7 +55,7 @@
-
+
${article.articleAbstract}
diff --git a/Andrea/article.ftl b/Andrea/article.ftl index 8278f3d..6fe1156 100644 --- a/Andrea/article.ftl +++ b/Andrea/article.ftl @@ -92,7 +92,7 @@
-
+
${article.articleContent} <#if "" != article.articleSign.signHTML?trim>
diff --git a/Andrea/common-comment.ftl b/Andrea/common-comment.ftl index 9b672ca..1aa93f4 100644 --- a/Andrea/common-comment.ftl +++ b/Andrea/common-comment.ftl @@ -36,7 +36,7 @@ onmouseout="page.hideComment('${comment.commentOriginalCommentId}')">${comment.commentOriginalCommentName}  ${comment.commentDate2?string("yyyy-MM-dd HH:mm:ss")} -
+
${comment.commentContent}
<#if article.commentable> diff --git a/Andrea/css/Andrea.min.css b/Andrea/css/Andrea.min.css deleted file mode 100644 index 15f78a9..0000000 --- a/Andrea/css/Andrea.min.css +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Solo - A small and beautiful blogging system written in Java. - * Copyright (c) 2010-2019, b3log.org & hacpai.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -body,img{font-size:12px}.article-relative ul,.header .right ul,.side-tool ul{list-style-type:none}.comment-info,.side-tool ul ul li a{word-wrap:break-word;overflow:hidden}body{background-image:url(../images/bg-grey.jpg);background-color:#000;color:#363636;font-family:'\5fae\8f6f\96c5\9ed1, Arial,Verdana,sans-serif';margin:0;padding:0}a,a:link,a:visited{color:#BE0700;text-decoration:underline}a:hover{text-decoration:none;color:rgba(190,7,0,.75)}img{max-width:100%;vertical-align:middle;border:0;height:auto;-ms-interpolation-mode:bicubic;overflow:hidden}.error-msg{color:#BE0700}#blueBG,#brownBG,#goTop,#greyBG,.article .day,.article .month,.brush-icon,.comment-form button,.pagination a,.side-tool ul ul li a{background-image:url(../images/icon.png)}.wrapper{width:910px;margin:0 auto;position:relative}.main{float:left;width:627px}.side-navi{float:left;width:282px}.header{background:url(../images/bgs.png) no-repeat;width:910px;height:185px;float:left}.header .left{width:566px}.header h1{margin:18px 0 0 37px}.header .left a,.sub-title{color:#FFF;font-family:'\5fae\8f6f\96c5\9ed1',Arial,Verdana,sans-serif;font-size:46px;text-decoration:none}.sub-title{color:#000;font-size:22px;margin-left:40px;margin-top:0;display:block}.header>.left>div{float:right;color:#C0BEBD}.header .right{width:343px}.header .right li{float:left;margin:18px 30px 0 0;width:84px}.header .right li a{color:#FFF;font-family:sans-serif;font-size:26px;text-decoration:none;font-weight:700}.header .right li a:hover{color:#DDD;font-family:sans-serif}.main-content{padding:0 45px;background-color:#D4D4D4}.main-content>h2{color:#BE0700;font-size:20px;line-height:145%;margin-bottom:18px;font-family:'\5fae\8f6f\96c5\9ed1'}.main-footer{background:url(../images/bgs.png) 0 -185px;height:14px;width:627px}.brush{left:-52px;position:absolute;top:283px;width:100px}#brush{background:url(../images/paint.png) 98px -150px no-repeat fixed;position:relative;top:-27px;width:82px}.brush-icon{background-position:0 -312px;height:240px;position:relative;width:92px;z-index:1}.brush-icon:hover{background-position:0 -69px}.article a.underline:hover{text-decoration:underline;color:#BE0700}.article .date{width:40px;float:left}.article .month{color:#FFF;height:20px;text-align:center;width:36px}.article .day{border:1px solid #C4BFBA;border-top:0;background-position:0 -20px;font-size:15px;height:23px;padding-top:4px;text-align:center;width:34px}.article h2{margin-bottom:3px;width:495px}.article h2 a{color:#363636;font-size:24px;line-height:24px;text-decoration:none}.article h2 a:hover{color:#BE0700;text-decoration:underline}.article h2 sup{color:#BE0700;font-size:10px;vertical-align:top}.article-abstract{border-top:2px dashed #F1EEE9;margin-top:15px;padding:20px 0 25px;overflow:hidden;line-height:145%}.article-abstract p:first-child:first-letter,.article-abstract:first-letter{font-size:38px;float:left;font-weight:700;margin:0 3px 3px 0;line-height:38px}.pagination{line-height:21px}.pagination a{background-position:0 -47px;border:1px solid #C5C3C2;color:#8C8C8C;padding:1px 6px;text-decoration:none;margin:2px;font-size:10px}.pagination a.selected{background:#FFF;border:1px solid #C5C3C2;color:#3E3E3E;font-weight:700;padding:1px 7px 2px 6px}.pagination a:hover{background:#F3DEDD;color:#BE0700;border:1px solid #BE0700}.side-navi ul{list-style:none}.side-navi .item{border-radius:0 5px 5px 0;background:url(../images/bg-transparent.png);border:1px solid #999;float:left;margin-top:23px;padding:25px 15px 15px;width:250px;color:#EAE7E0}.side-navi .item dd{margin-bottom:25px}.side-navi .item dd li{list-style-type:none;border-bottom:1px solid #93908A;padding:4px 0 1px 6px;margin-left:0;overflow:hidden;text-overflow:ellipsis;-o-text-overflow:ellipsis;color:#EAE7E0;position:relative;line-height:21px}.side-navi .item dd li:hover{background:url(../images/bg-transparent.png);border-bottom:1px solid #BAB8B5}.side-navi .item dd li:hover a{color:#FFF}.side-navi .item dd li a{white-space:nowrap;color:#EAE7E0;text-decoration:none}.side-navi .item .navi-tags img{cursor:pointer;height:16px;left:3px;position:absolute;top:5px;width:16px}.side-navi .item dd .navi-tags a{padding-left:18px}#naviComments li a{white-space:normal}#naviComments li br{display:none}#naviComments li p{display:inline}#naviComments li a.author{color:#BE0700}#naviComments li:hover{background-image:none}#naviComments li a:hover{text-decoration:underline}#naviComments img{height:16px;width:16px}.side-navi .item h4{border-bottom:1px solid #93908A;color:#EAE7E0;padding:0 5px 8px;font-size:16px}.footer{background-image:url(../images/footer.png);color:#EAE7E0;height:411px;padding:21px 0 0 95px;width:605px;margin-top:40px;text-align:center}.footer a{text-decoration:none}.footer a:hover{text-decoration:underline}.side-tool{position:fixed;top:30px;left:0}.side-tool li{margin-left:0}.side-tool .page-icon{height:14px;width:14px}#blueBG,#brownBG,#greyBG{background-position:-103px 0;display:block;height:21px;margin:3px 0;width:21px;cursor:pointer}#brownBG{background-position:-103px -26px}#blueBG{background-position:-103px -52px}#greyBG.selected,#greyBG:hover{background-position:-126px 0}#brownBG.selected,#brownBG:hover{background-position:-126px -26px}#blueBG.selected,#blueBG:hover{background-position:-126px -52px}#goTop{background-position:-105px -119px;cursor:pointer;height:36px;margin-top:9px;display:block;width:22px}#goTop:hover{background-position:-105px -74px}.side-tool ul ul li a{background-position:right -159px;color:#EAE7E0;display:block;font-size:14px;font-weight:700;height:86px;margin:9px 0;padding:1px 8px 1px 9px;text-align:center;text-decoration:none;width:14px;text-transform:uppercase}.article-body{border-top:2px dashed #F1EEE9;margin-top:15px;overflow:hidden;padding:20px 0 25px;line-height:145%}.article-body p:first-child:first-letter,.article-body:first-letter{font-size:48px;float:left;font-weight:700;margin:0 3px 3px 0}.article-relative{margin:15px 0}.article-relative h4{font-family:'\5fae\8f6f\96c5\9ed1',Arial,Verdana;font-size:16px}#randomArticles,.relevantArticles{width:262px;overflow:hidden}#comments{position:relative}#comments,.comment-form{padding-bottom:30px}.comment-form{margin-right:15px;color:#606060}h2.comment-label{border-bottom:2px solid #3F3D36;font-size:24px;margin-bottom:15px;margin-top:30px;padding-bottom:7px;color:#363636}.comment-body{padding:20px 0}.comment-body:nth-child(2n){background-color:#F1EEE9}.comment-author{width:100px}.comment-info{margin-right:12px;width:423px}.comment-info>a{font-size:14px;font-weight:700}.comment-content{margin:10px 0}.comment-author img{width:64px;height:64px;border:6px solid #F1EEE9;margin-left:12px}.comment-form img{cursor:pointer}.comment-form input,.comment-form textarea{border-radius:5px;background-color:#EBE9E5;border:1px solid #BABAAE;font-family:\5fae\8f6f\96c5\9ed1;font-size:12px;margin:10px 0;padding:10px;width:400px;outline:0}.comment-form input:focus,.comment-form textarea:focus{background-color:#E3EBCF;border-color:#73B722}#commentValidate,#commentValidateReply{width:80px}.comment-form button{border-radius:5px;border:1px solid #80B53B;color:#355207;cursor:pointer;font-weight:700;height:34px;padding:5px 10px;width:140px}.comment-body-ref{background:url(../images/bg-transparent.png);padding:12px 0;position:absolute;width:537px;border:1px solid #999;border-radius:5px;z-index:10;left:180px}#tagsPanel{min-height:1px}#tagsPanel a{display:block;float:left;border:1px solid #D4D4D4}#tagsPanel a:hover{border:1px solid #BE0700} \ No newline at end of file diff --git a/Andrea/css/base.css b/Andrea/css/base.css new file mode 100644 index 0000000..a242d0d --- /dev/null +++ b/Andrea/css/base.css @@ -0,0 +1,18 @@ +/** + * Solo - A small and beautiful blogging system written in Java. + * Copyright (c) 2010-2019, b3log.org & hacpai.com + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +.content-reset{word-wrap:break-word;overflow:auto;line-height:1.65;font-size:16px;word-break:break-word}.content-reset ul,.content-reset ol{padding-left:2em;margin-top:0;margin-bottom:16px}.content-reset li{margin-top:0.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{padding-bottom:0.3em;font-size:1.7em;border-bottom:1px solid #eee}.content-reset h2{padding-bottom:0.3em;font-size:1.5em;border-bottom:1px solid #eee}.content-reset h3{font-size:1.25em}.content-reset h4{font-size:1em}.content-reset h5{font-size:0.875em}.content-reset h6{font-size:0.85em}.content-reset hr{height:0.15em;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:0.25em solid #ddd;margin-bottom:16px}.content-reset blockquote p{margin:0}.content-reset ins>iframe{border:0}.content-reset iframe{border:1px solid rgba(0,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:bold;text-align:center !important;background:rgba(158,188,226,0.2)}.content-reset tbody tr:nth-child(2n){background:rgba(158,188,226,0.12)}.content-reset tr:hover{background:#efefef}.content-reset code{padding:0.2em 0.4em;margin:0;font-size:85%;background-color:rgba(252,41,41,0.12);border-radius:3px;word-break:break-word}.content-reset pre{position:relative}.content-reset pre textarea{position:absolute;top:-100000px}.content-reset pre>code{padding:0.5em;background-color:rgba(0,0,0,0.04);background-size:20px 20px;border-radius:5px;display:block}.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:solid 1px rgba(0,0,0,0.38);border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.content-reset__task,.content-reset .task-list-item{list-style:none;margin-left:-1em}.img-preview{width:100%;height:100%;top:0;z-index:211;overflow:auto;cursor:zoom-out;transition:background-color .2s ease-in-out}.img-preview img{max-width:inherit;transition:transform .3s ease-in-out}.left{float:left}.right{float:right}.clear:before,.clear:after{display:table;content:""}.clear:after{clear:both}.none{display:none}body,dd,div,dl,h1,h2,h3,h4,h5,h6,html,img,li,ol,p,ul{padding:0;margin:0}body{background-image:url("../images/bg-grey.jpg");background-color:#000000;color:#363636;font-family:'\5fae\8f6f\96c5\9ed1, Arial,Verdana,sans-serif';font-size:12px;margin:0;padding:0}a,a:link,a:visited{color:#BE0700;text-decoration:underline}a:hover{text-decoration:none;color:rgba(190,7,0,0.75)}img{max-width:100%;vertical-align:middle;border:0;height:auto;-ms-interpolation-mode:bicubic;overflow:hidden;font-size:12px}.error-msg{color:#BE0700}.brush-icon,.article .month,.article .day,.pagination a,#greyBG,#brownBG,#blueBG,#goTop,.side-tool ul ul li a,.comment-form button{background-image:url("../images/icon.png")}.wrapper{width:910px;margin:0 auto;position:relative}.main{float:left;width:627px}.side-navi{float:left;width:282px}.header{background:url("../images/bgs.png") no-repeat;width:910px;height:185px;float:left}.header .left{width:566px}.header h1{margin:18px 0 0 37px}.header .left a,.sub-title{color:#FFFFFF;font-family:'\5fae\8f6f\96c5\9ed1',Arial,Verdana,sans-serif;font-size:46px;text-decoration:none}.sub-title{color:#000000;font-size:22px;margin-left:40px;margin-top:0;display:block}.header>.left>div{float:right;color:#C0BEBD}.header .right{width:343px}.header .right ul{list-style-type:none}.header .right li{float:left;margin:18px 30px 0 0;width:84px}.header .right li a{color:#FFFFFF;font-family:'sans-serif';font-size:26px;text-decoration:none;font-weight:bold}.header .right li a:hover{color:#DDDDDD;font-family:'sans-serif'}.main-content{padding:0 45px;background-color:#D4D4D4}.main-content>h2{color:#BE0700;font-size:20px;line-height:145%;margin-bottom:18px;font-family:'\5fae\8f6f\96c5\9ed1'}.main-footer{background:url("../images/bgs.png") 0 -185px;height:14px;width:627px}.brush{left:-52px;position:absolute;top:283px;width:100px}#brush{background:url("../images/paint.png") no-repeat fixed 98px -150px transparent;position:relative;top:-27px;width:82px}.brush-icon{background-position:0 -312px;height:240px;position:relative;width:92px;z-index:1}.brush-icon:hover{background-position:0 -69px}.article a.underline:hover{text-decoration:underline;color:#BE0700}.article .date{width:40px;float:left}.article .month{color:#FFFFFF;height:20px;text-align:center;width:36px}.article .day{border:1px solid #C4BFBA;border-top:0px;background-position:0px -20px;font-size:15px;height:23px;padding-top:4px;text-align:center;width:34px}.article h2{margin-bottom:3px;width:495px;*line-height:28px}.article h2 a{color:#363636;font-size:24px;line-height:24px;text-decoration:none}.article h2 a:hover{color:#BE0700;text-decoration:underline}.article h2 sup{color:#BE0700;font-size:10px;vertical-align:top}.article-abstract{border-top:2px dashed #F1EEE9;margin-top:15px;padding:20px 0 25px 0;overflow:hidden;line-height:145%}.article-abstract p:first-child:first-letter,.article-abstract:first-letter{font-size:38px;float:left;font-weight:bold;margin:0 3px 3px 0;line-height:38px}.pagination{line-height:21px}.pagination a{background-position:0px -47px;border:1px solid #C5C3C2;color:#8C8C8C;padding:1px 6px;text-decoration:none;margin:2px;font-size:10px}.pagination a.selected{background:none #FFFFFF;border:1px solid #C5C3C2;color:#3E3E3E;font-weight:bold;padding:1px 7px 2px 6px}.pagination a:hover{background:none #F3DEDD;color:#BE0700;border:1px solid #BE0700}.side-navi ul{list-style:none}.side-navi .item{border-radius:0 5px 5px 0;background:url("../images/bg-transparent.png") repeat scroll 0 0 transparent;border:1px solid #999999;float:left;margin-top:23px;padding:25px 15px 15px;width:250px;color:#EAE7E0}.side-navi .item dd{margin-bottom:25px}.side-navi .item dd li{list-style-type:none;border-bottom:1px solid #93908A;padding:4px 0px 1px 6px;margin-left:0px;overflow:hidden;text-overflow:ellipsis;-o-text-overflow:ellipsis;color:#EAE7E0;position:relative;line-height:21px}.side-navi .item dd li:hover{background:url("../images/bg-transparent.png") repeat scroll 0 0 transparent;border-bottom:1px solid #BAB8B5}.side-navi .item dd li:hover a{color:#FFFFFF}.side-navi .item dd li a{white-space:nowrap;color:#EAE7E0;text-decoration:none}.side-navi .item .navi-tags img{cursor:pointer;height:16px;left:3px;position:absolute;top:5px;width:16px}.side-navi .item dd .navi-tags a{padding-left:18px}#naviComments li a{white-space:normal}#naviComments li br{display:none}#naviComments li p{display:inline}#naviComments li a.author{color:#BE0700}#naviComments li:hover{background-image:none}#naviComments li a:hover{text-decoration:underline}#naviComments img{height:16px;width:16px}.side-navi .item h4{border-bottom:1px solid #93908A;color:#EAE7E0;padding:0 5px 8px;font-size:16px}.footer{background-image:url("../images/footer.png");color:#EAE7E0;height:411px;padding:21px 0 0 95px;width:605px;margin-top:40px;text-align:center}.footer a{text-decoration:none}.footer a:hover{text-decoration:underline}.side-tool{position:fixed;top:30px;left:0px}.side-tool li{margin-left:0px}.side-tool ul{list-style-type:none}.side-tool .page-icon{height:14px;width:14px}#greyBG,#brownBG,#blueBG{background-position:-103px 0;display:block;height:21px;margin:3px 0;width:21px;cursor:pointer}#brownBG{background-position:-103px -26px}#blueBG{background-position:-103px -52px}#greyBG:hover,#greyBG.selected{background-position:-126px 0px}#brownBG:hover,#brownBG.selected{background-position:-126px -26px}#blueBG:hover,#blueBG.selected{background-position:-126px -52px}#goTop{background-position:-105px -119px;cursor:pointer;height:36px;margin-top:9px;display:block;width:22px}#goTop:hover{background-position:-105px -74px}.side-tool ul ul li a{background-position:right -159px;color:#EAE7E0;display:block;font-size:14px;font-weight:bold;height:86px;margin:9px 0;overflow:hidden;padding:1px 8px 1px 9px;text-align:center;text-decoration:none;width:14px;word-wrap:break-word;text-transform:uppercase}.content-reset{border-top:2px dashed #F1EEE9;margin-top:15px;overflow:hidden;padding:20px 0 25px;line-height:145%}.content-reset p:first-child:first-letter,.content-reset:first-letter{font-size:48px;float:left;font-weight:bold;margin:0 3px 3px 0}.article-relative{margin:15px 0}.article-relative h4{font-family:'\5fae\8f6f\96c5\9ed1',Arial,Verdana;font-size:16px}.article-relative ul{list-style-type:none}#randomArticles,.relevantArticles{width:262px;overflow:hidden}#comments{position:relative}#comments,.comment-form{padding-bottom:30px}.comment-form{margin-right:15px;color:#606060}h2.comment-label{border-bottom:2px solid #3F3D36;font-size:24px;margin-bottom:15px;margin-top:30px;padding-bottom:7px;color:#363636}.comment-body{padding:20px 0}.comment-body:nth-child(2n){background-color:#F1EEE9}.comment-author{width:100px}.comment-info{margin-right:12px;word-wrap:break-word;overflow:hidden;width:423px}.comment-info>a{font-size:14px;font-weight:bold}.comment-content{margin:10px 0}.comment-author img{width:64px;height:64px;border:6px solid #F1EEE9;margin-left:12px}.comment-form img{cursor:pointer}.comment-form input,.comment-form textarea{border-radius:5px;background-color:#EBE9E5;border:1px solid #BABAAE;font-family:\5fae\8f6f\96c5\9ed1;font-size:12px;margin:10px 0;padding:10px;width:400px;outline:none}.comment-form input:focus,.comment-form textarea:focus{background-color:#E3EBCF;border-color:#73B722}#commentValidate,#commentValidateReply{width:80px}.comment-form button{border-radius:5px;border:1px solid #80B53B;color:#355207;cursor:pointer;font-weight:bold;height:34px;padding:5px 10px;width:140px}.comment-body-ref{background:url("../images/bg-transparent.png") repeat scroll 0 0 transparent;padding:12px 0;position:absolute;width:537px;border:1px solid #999999;border-radius:5px;z-index:10;left:180px}#tagsPanel{min-height:1px}#tagsPanel a{display:block;float:left;border:1px solid #D4D4D4}#tagsPanel a:hover{border:1px solid #BE0700} diff --git a/Andrea/css/Andrea.css b/Andrea/css/base.scss similarity index 96% rename from Andrea/css/Andrea.css rename to Andrea/css/base.scss index e188feb..e93c111 100644 --- a/Andrea/css/Andrea.css +++ b/Andrea/css/base.scss @@ -19,8 +19,33 @@ * skin andrea style * * @author Liyuan Li - * @version 1.2.0.0, Jun 4, 2018 + * @version 2.0.0.0, Feb 21, 2019 */ +@import "../../../scss/reset-content"; +.left { + float: left; +} + +.right { + float: right; +} + +.clear:before, +.clear:after { + display: table; + content: ""; +} + +.clear:after { + clear: both; +} +.none { + display: none; +} +body, dd, div, dl, h1, h2, h3, h4, h5, h6, html, img, li, ol, p, ul { + padding: 0; + margin: 0; +} body { background-image: url("../images/bg-grey.jpg"); background-color: #000000; @@ -477,7 +502,7 @@ img { } /* article */ -.article-body { +.content-reset { border-top: 2px dashed #F1EEE9; margin-top: 15px; overflow: hidden; @@ -485,7 +510,7 @@ img { line-height: 145%; } -.article-body p:first-child:first-letter, .article-body:first-letter{ +.content-reset p:first-child:first-letter, .content-reset:first-letter{ font-size: 48px; float: left; font-weight: bold; diff --git a/Andrea/footer.ftl b/Andrea/footer.ftl index a066145..8b73a18 100644 --- a/Andrea/footer.ftl +++ b/Andrea/footer.ftl @@ -34,22 +34,7 @@ "markedAvailable": ${markedAvailable?c}, "adminLabel": "${adminLabel}", "logoutLabel": "${logoutLabel}", - "skinDirName": "${skinDirName}", - "em00Label": "${em00Label}", - "em01Label": "${em01Label}", - "em02Label": "${em02Label}", - "em03Label": "${em03Label}", - "em04Label": "${em04Label}", - "em05Label": "${em05Label}", - "em06Label": "${em06Label}", - "em07Label": "${em07Label}", - "em08Label": "${em08Label}", - "em09Label": "${em09Label}", - "em10Label": "${em10Label}", - "em11Label": "${em11Label}", - "em12Label": "${em12Label}", - "em13Label": "${em13Label}", - "em14Label": "${em14Label}" + "skinDirName": "${skinDirName}" }; // init brush diff --git a/Andrea/lang/lang_zh_CN.properties b/Andrea/lang/lang_zh_CN.properties index 7d83afc..42c5f5f 100644 --- a/Andrea/lang/lang_zh_CN.properties +++ b/Andrea/lang/lang_zh_CN.properties @@ -188,7 +188,6 @@ permalink1Label=\u94FE\u63A5\uFF1A permalinkLabel=\u94FE\u63A5 welcomeToSoloLabel=\u6B22\u8FCE\u4F7F\u7528 Solo\uFF01 b3logLabel=B3LOG -killBrowserLabel=

\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01

\u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002

\u60A8\u53EF\u4EE5\u4E0B\u8F7D readmoreLabel=\u9605\u8BFB\u66F4\u591A\u00BB readmore2Label=\u9605\u8BFB\u66F4\u591A replyLabel=\u56DE\u590D\u00BB diff --git a/Andrea/macro-head.ftl b/Andrea/macro-head.ftl index 50b83dc..410c898 100644 --- a/Andrea/macro-head.ftl +++ b/Andrea/macro-head.ftl @@ -27,8 +27,7 @@ - - + diff --git a/Andrea/page.ftl b/Andrea/page.ftl index 2b1c398..d134f4a 100644 --- a/Andrea/page.ftl +++ b/Andrea/page.ftl @@ -37,7 +37,7 @@
-
+
${page.pageContent}
diff --git a/Bruce/article.ftl b/Bruce/article.ftl index f4cd9f6..b646f44 100644 --- a/Bruce/article.ftl +++ b/Bruce/article.ftl @@ -79,7 +79,7 @@
-
+
${article.articleContent} <#if "" != article.articleSign.signHTML?trim>

diff --git a/Bruce/common-comment.ftl b/Bruce/common-comment.ftl index c9e23ee..5fcc88d 100644 --- a/Bruce/common-comment.ftl +++ b/Bruce/common-comment.ftl @@ -38,6 +38,6 @@

-
${comment.commentContent}
+
${comment.commentContent}
\ No newline at end of file diff --git a/Bruce/css/Bruce.min.css b/Bruce/css/Bruce.min.css deleted file mode 100644 index 3507715..0000000 --- a/Bruce/css/Bruce.min.css +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Solo - A small and beautiful blogging system written in Java. - * Copyright (c) 2010-2019, b3log.org & hacpai.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -@charset "utf-8";.article-date,.article-tags,.article-title,.footer{text-align:center}.footer,.header{background-color:#f9f9f9}body,button,input,select,textarea{font:400 1em/1.8 Avenir,Microsoft Yahei,Hiragino Sans GB,Microsoft Sans Serif,WenQuanYi Micro Hei,sans-serif;letter-spacing:.01rem}.site{padding:0 2em;margin:0 auto;font-size:16px}h4,h5,h6{font-weight:700}.article{margin-bottom:90px}.article-tags{font-size:14px}.article-date{font-size:12px;margin-top:6px;margin-bottom:12px}.article-content{font-size:1.1em}.article-content .task-list-item{list-style:none;margin-left:-1em}.article-content img{max-width:100%}.header{border-bottom:1px solid #ddd;margin-bottom:20px}.nav-item{position:relative;display:inline-block;padding:10px;font-weight:500}.nav-item .page-icon{float:left;height:14px;width:14px;margin:2px 3px 0 0}.comment{margin-bottom:32px}.comment p{margin-bottom:0}#captcha,#captchaReply,#emotions span,#emotionsReply span,.form-control{margin-top:15px}.cmtFromSym{font-size:12px;color:#ccc;margin-bottom:1em}.cmtForm{margin-top:24px}.gray{color:#ccc}.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{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 1px}.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}.footer{padding:40px 0;margin-top:20px;color:#999;border-top:1px solid #e5e5e5}.right{float:right} \ No newline at end of file diff --git a/Bruce/css/base.css b/Bruce/css/base.css new file mode 100644 index 0000000..b08050f --- /dev/null +++ b/Bruce/css/base.css @@ -0,0 +1,18 @@ +/** + * Solo - A small and beautiful blogging system written in Java. + * Copyright (c) 2010-2019, b3log.org & hacpai.com + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +.content-reset{word-wrap:break-word;overflow:auto;line-height:1.65;font-size:16px;word-break:break-word}.content-reset ul,.content-reset ol{padding-left:2em;margin-top:0;margin-bottom:16px}.content-reset li{margin-top:0.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{padding-bottom:0.3em;font-size:1.7em;border-bottom:1px solid #eee}.content-reset h2{padding-bottom:0.3em;font-size:1.5em;border-bottom:1px solid #eee}.content-reset h3{font-size:1.25em}.content-reset h4{font-size:1em}.content-reset h5{font-size:0.875em}.content-reset h6{font-size:0.85em}.content-reset hr{height:0.15em;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:0.25em solid #ddd;margin-bottom:16px}.content-reset blockquote p{margin:0}.content-reset ins>iframe{border:0}.content-reset iframe{border:1px solid rgba(0,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:bold;text-align:center !important;background:rgba(158,188,226,0.2)}.content-reset tbody tr:nth-child(2n){background:rgba(158,188,226,0.12)}.content-reset tr:hover{background:#efefef}.content-reset code{padding:0.2em 0.4em;margin:0;font-size:85%;background-color:rgba(252,41,41,0.12);border-radius:3px;word-break:break-word}.content-reset pre{position:relative}.content-reset pre textarea{position:absolute;top:-100000px}.content-reset pre>code{padding:0.5em;background-color:rgba(0,0,0,0.04);background-size:20px 20px;border-radius:5px;display:block}.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:solid 1px rgba(0,0,0,0.38);border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.content-reset__task,.content-reset .task-list-item{list-style:none;margin-left:-1em}.img-preview{width:100%;height:100%;top:0;z-index:211;overflow:auto;cursor:zoom-out;transition:background-color .2s ease-in-out}.img-preview img{max-width:inherit;transition:transform .3s ease-in-out}body,button,input,select,textarea{font:400 1em/1.8 Avenir,Microsoft Yahei,Hiragino Sans GB,Microsoft Sans Serif,WenQuanYi Micro Hei,sans-serif;letter-spacing:0.01rem}.site{padding:0 2em 0;margin:0 auto;font-size:16px}h4,h5,h6{font-weight:bold}.article{margin-bottom:90px}.article-title{text-align:center}.article-tags{text-align:center;font-size:14px}.article-date{text-align:center;font-size:12px;margin-top:6px;margin-bottom:12px}.article-content{font-size:1.1em}.article-content .task-list-item{list-style:none;margin-left:-1em}.article-content img{max-width:100%}.header{border-bottom:1px solid #ddd;background-color:#f9f9f9;margin-bottom:20px}.nav-item{position:relative;display:inline-block;padding:10px;font-weight:500}.nav-item .page-icon{float:left;height:14px;width:14px;margin:2px 3px 0 0}.comment{margin-bottom:32px}.comment p{margin-bottom:0em}.form-control{margin-top:15px}.cmtFromSym{font-size:12px;color:#ccc;margin-bottom:1em}.cmtForm{margin-top:24px}.gray{color:#ccc}.footer{padding:40px 0;margin-top:20px;color:#999;text-align:center;background-color:#f9f9f9;border-top:1px solid #e5e5e5}.right{float:right} diff --git a/Bruce/css/Bruce.css b/Bruce/css/base.scss similarity index 64% rename from Bruce/css/Bruce.css rename to Bruce/css/base.scss index 32d6aa7..319f61a 100644 --- a/Bruce/css/Bruce.css +++ b/Bruce/css/base.scss @@ -21,9 +21,10 @@ * * @author Liang Ding * @author Liyuan Li - * @version 1.1.0.1, Jan 2, 2019 + * @version 2.0.0.0, Feb 21, 2019 */ +@import "../../../scss/reset-content"; body, button, input, select, textarea { font: 400 1em/1.8 Avenir,Microsoft Yahei,Hiragino Sans GB,Microsoft Sans Serif,WenQuanYi Micro Hei,sans-serif; letter-spacing: 0.01rem; @@ -100,11 +101,7 @@ h4, h5, h6 { margin-bottom: 0em; } -.form-control, -#captcha, -#captchaReply, -#emotions span, -#emotionsReply span { +.form-control { margin-top: 15px; } @@ -122,72 +119,6 @@ h4, h5, h6 { color: #ccc; } -.comment-panel { -} - -.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 { - 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 1px; -} -.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; -} - .footer { padding: 40px 0; margin-top: 20px; diff --git a/Bruce/css/bootstrap-theme.min.css b/Bruce/css/bootstrap-theme.min.css deleted file mode 100644 index c2e641d..0000000 --- a/Bruce/css/bootstrap-theme.min.css +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Solo - A small and beautiful blogging system written in Java. - * Copyright (c) 2010-2019, b3log.org & hacpai.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -.alert-danger,.alert-info,.alert-success,.btn-danger,.btn-default,.btn-info,.btn-primary,.btn-success,.btn-warning,.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover,.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover,.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover,.navbar-default,.navbar-default .navbar-nav>.active>a,.navbar-inverse,.navbar-inverse .navbar-nav>.active>a,.panel-danger>.panel-heading,.panel-default>.panel-heading,.panel-info>.panel-heading,.panel-primary>.panel-heading,.panel-success>.panel-heading,.panel-warning>.panel-heading,.progress,.progress-bar,.progress-bar-danger,.progress-bar-info,.progress-bar-success,.progress-bar-warning,.well{background-repeat:repeat-x}.btn-danger,.btn-default,.btn-info,.btn-primary,.btn-success,.btn-warning{text-shadow:0 -1px 0 rgba(0,0,0,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075)}.btn-danger.active,.btn-danger:active,.btn-default.active,.btn-default:active,.btn-info.active,.btn-info:active,.btn-primary.active,.btn-primary:active,.btn-success.active,.btn-success:active,.btn-warning.active,.btn-warning:active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.active,.btn:active{background-image:none}.btn-default{text-shadow:0 1px 0 #fff;background-image:-webkit-linear-gradient(top,#fff 0,#e0e0e0 100%);background-image:-o-linear-gradient(top,#fff 0,#e0e0e0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e0e0e0));background-image:linear-gradient(to bottom,#fff 0,#e0e0e0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);border-color:#ccc}.btn-default:focus,.btn-default:hover{background-color:#e0e0e0;background-position:0 -15px}.btn-default.active,.btn-default:active{background-color:#e0e0e0;border-color:#dbdbdb}.btn-default:disabled,.btn-default[disabled]{background-color:#e0e0e0;background-image:none}.btn-primary{background-image:-webkit-linear-gradient(top,#428bca 0,#2d6ca2 100%);background-image:-o-linear-gradient(top,#428bca 0,#2d6ca2 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#428bca),to(#2d6ca2));background-image:linear-gradient(to bottom,#428bca 0,#2d6ca2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff2d6ca2', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);border-color:#2b669a}.btn-primary:focus,.btn-primary:hover{background-color:#2d6ca2;background-position:0 -15px}.btn-primary.active,.btn-primary:active{background-color:#2d6ca2;border-color:#2b669a}.btn-primary:disabled,.btn-primary[disabled]{background-color:#2d6ca2;background-image:none}.btn-success{background-image:-webkit-linear-gradient(top,#5cb85c 0,#419641 100%);background-image:-o-linear-gradient(top,#5cb85c 0,#419641 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5cb85c),to(#419641));background-image:linear-gradient(to bottom,#5cb85c 0,#419641 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);border-color:#3e8f3e}.btn-success:focus,.btn-success:hover{background-color:#419641;background-position:0 -15px}.btn-success.active,.btn-success:active{background-color:#419641;border-color:#3e8f3e}.btn-success:disabled,.btn-success[disabled]{background-color:#419641;background-image:none}.btn-info{background-image:-webkit-linear-gradient(top,#5bc0de 0,#2aabd2 100%);background-image:-o-linear-gradient(top,#5bc0de 0,#2aabd2 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5bc0de),to(#2aabd2));background-image:linear-gradient(to bottom,#5bc0de 0,#2aabd2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);border-color:#28a4c9}.btn-info:focus,.btn-info:hover{background-color:#2aabd2;background-position:0 -15px}.btn-info.active,.btn-info:active{background-color:#2aabd2;border-color:#28a4c9}.btn-info:disabled,.btn-info[disabled]{background-color:#2aabd2;background-image:none}.btn-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0,#eb9316 100%);background-image:-o-linear-gradient(top,#f0ad4e 0,#eb9316 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f0ad4e),to(#eb9316));background-image:linear-gradient(to bottom,#f0ad4e 0,#eb9316 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);border-color:#e38d13}.btn-warning:focus,.btn-warning:hover{background-color:#eb9316;background-position:0 -15px}.btn-warning.active,.btn-warning:active{background-color:#eb9316;border-color:#e38d13}.btn-warning:disabled,.btn-warning[disabled]{background-color:#eb9316;background-image:none}.btn-danger{background-image:-webkit-linear-gradient(top,#d9534f 0,#c12e2a 100%);background-image:-o-linear-gradient(top,#d9534f 0,#c12e2a 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9534f),to(#c12e2a));background-image:linear-gradient(to bottom,#d9534f 0,#c12e2a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);border-color:#b92c28}.btn-danger:focus,.btn-danger:hover{background-color:#c12e2a;background-position:0 -15px}.btn-danger.active,.btn-danger:active{background-color:#c12e2a;border-color:#b92c28}.btn-danger:disabled,.btn-danger[disabled]{background-color:#c12e2a;background-image:none}.img-thumbnail,.thumbnail{-webkit-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075)}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{background-color:#e8e8e8;background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-o-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#e8e8e8));background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0)}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{background-color:#357ebd;background-image:-webkit-linear-gradient(top,#428bca 0,#357ebd 100%);background-image:-o-linear-gradient(top,#428bca 0,#357ebd 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#428bca),to(#357ebd));background-image:linear-gradient(to bottom,#428bca 0,#357ebd 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0)}.navbar-default{background-image:-webkit-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:-o-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#f8f8f8));background-image:linear-gradient(to bottom,#fff 0,#f8f8f8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 5px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 5px rgba(0,0,0,.075)}.navbar-default .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top,#ebebeb 0,#f3f3f3 100%);background-image:-o-linear-gradient(top,#ebebeb 0,#f3f3f3 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#f3f3f3));background-image:linear-gradient(to bottom,#ebebeb 0,#f3f3f3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff3f3f3', GradientType=0);-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,.075);box-shadow:inset 0 3px 9px rgba(0,0,0,.075)}.navbar-brand,.navbar-nav>li>a{text-shadow:0 1px 0 rgba(255,255,255,.25)}.navbar-inverse{background-image:-webkit-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:-o-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#3c3c3c),to(#222));background-image:linear-gradient(to bottom,#3c3c3c 0,#222 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.navbar-inverse .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top,#222 0,#282828 100%);background-image:-o-linear-gradient(top,#222 0,#282828 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#222),to(#282828));background-image:linear-gradient(to bottom,#222 0,#282828 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff282828', GradientType=0);-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,.25);box-shadow:inset 0 3px 9px rgba(0,0,0,.25)}.navbar-inverse .navbar-brand,.navbar-inverse .navbar-nav>li>a{text-shadow:0 -1px 0 rgba(0,0,0,.25)}.navbar-fixed-bottom,.navbar-fixed-top,.navbar-static-top{border-radius:0}.alert{text-shadow:0 1px 0 rgba(255,255,255,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 2px rgba(0,0,0,.05)}.alert-success{background-image:-webkit-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:-o-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#dff0d8),to(#c8e5bc));background-image:linear-gradient(to bottom,#dff0d8 0,#c8e5bc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);border-color:#b2dba1}.alert-info{background-image:-webkit-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:-o-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9edf7),to(#b9def0));background-image:linear-gradient(to bottom,#d9edf7 0,#b9def0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);border-color:#9acfea}.alert-warning{background-image:-webkit-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:-o-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fcf8e3),to(#f8efc0));background-image:linear-gradient(to bottom,#fcf8e3 0,#f8efc0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);background-repeat:repeat-x;border-color:#f5e79e}.alert-danger{background-image:-webkit-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:-o-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f2dede),to(#e7c3c3));background-image:linear-gradient(to bottom,#f2dede 0,#e7c3c3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);border-color:#dca7a7}.progress{background-image:-webkit-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:-o-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#f5f5f5));background-image:linear-gradient(to bottom,#ebebeb 0,#f5f5f5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0)}.progress-bar{background-image:-webkit-linear-gradient(top,#428bca 0,#3071a9 100%);background-image:-o-linear-gradient(top,#428bca 0,#3071a9 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#428bca),to(#3071a9));background-image:linear-gradient(to bottom,#428bca 0,#3071a9 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0)}.progress-bar-success{background-image:-webkit-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:-o-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5cb85c),to(#449d44));background-image:linear-gradient(to bottom,#5cb85c 0,#449d44 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0)}.progress-bar-info{background-image:-webkit-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:-o-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5bc0de),to(#31b0d5));background-image:linear-gradient(to bottom,#5bc0de 0,#31b0d5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0)}.progress-bar-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:-o-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f0ad4e),to(#ec971f));background-image:linear-gradient(to bottom,#f0ad4e 0,#ec971f 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0)}.progress-bar-danger{background-image:-webkit-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:-o-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9534f),to(#c9302c));background-image:linear-gradient(to bottom,#d9534f 0,#c9302c 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0)}.progress-bar-striped{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.list-group{border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075)}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{text-shadow:0 -1px 0 #3071a9;background-image:-webkit-linear-gradient(top,#428bca 0,#3278b3 100%);background-image:-o-linear-gradient(top,#428bca 0,#3278b3 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#428bca),to(#3278b3));background-image:linear-gradient(to bottom,#428bca 0,#3278b3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);border-color:#3278b3}.panel{-webkit-box-shadow:0 1px 2px rgba(0,0,0,.05);box-shadow:0 1px 2px rgba(0,0,0,.05)}.panel-default>.panel-heading{background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-o-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#e8e8e8));background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0)}.panel-primary>.panel-heading{background-image:-webkit-linear-gradient(top,#428bca 0,#357ebd 100%);background-image:-o-linear-gradient(top,#428bca 0,#357ebd 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#428bca),to(#357ebd));background-image:linear-gradient(to bottom,#428bca 0,#357ebd 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0)}.panel-success>.panel-heading{background-image:-webkit-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:-o-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#dff0d8),to(#d0e9c6));background-image:linear-gradient(to bottom,#dff0d8 0,#d0e9c6 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0)}.panel-info>.panel-heading{background-image:-webkit-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:-o-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9edf7),to(#c4e3f3));background-image:linear-gradient(to bottom,#d9edf7 0,#c4e3f3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0)}.panel-warning>.panel-heading{background-image:-webkit-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:-o-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fcf8e3),to(#faf2cc));background-image:linear-gradient(to bottom,#fcf8e3 0,#faf2cc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0)}.panel-danger>.panel-heading{background-image:-webkit-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:-o-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f2dede),to(#ebcccc));background-image:linear-gradient(to bottom,#f2dede 0,#ebcccc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0)}.well{background-image:-webkit-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:-o-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#e8e8e8),to(#f5f5f5));background-image:linear-gradient(to bottom,#e8e8e8 0,#f5f5f5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);border-color:#dcdcdc;-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,.05),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 3px rgba(0,0,0,.05),0 1px 0 rgba(255,255,255,.1)} \ No newline at end of file diff --git a/Bruce/css/bootstrap.min.css b/Bruce/css/bootstrap.min.css deleted file mode 100644 index 7b82cfd..0000000 --- a/Bruce/css/bootstrap.min.css +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Solo - A small and beautiful blogging system written in Java. - * Copyright (c) 2010-2019, b3log.org & hacpai.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -.btn,.btn-group,.btn-group-vertical,.caret,.checkbox-inline,.radio-inline,img{vertical-align:middle}hr,img{border:0}body,figure{margin:0}.img-thumbnail,.thumbnail{-o-transition:all .2s ease-in-out}.btn-group>.btn-group,.btn-toolbar .btn-group,.btn-toolbar .input-group,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.dropdown-menu{float:left}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.pre-scrollable{max-height:340px}.modal.in .modal-dialog,.navbar-fixed-bottom,.navbar-fixed-top{-webkit-transform:translate3d(0,0,0);-o-transform:translate3d(0,0,0)}html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:0 0}a:active,a:hover{outline:0}b,optgroup,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0}mark{color:#000;background:#ff0}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}svg:not(:root){overflow:hidden}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre,textarea{overflow:auto}code,kbd,pre,samp{font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}.glyphicon,address,cite{font-style:normal}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}@media print{blockquote,img,pre,tr{page-break-inside:avoid}*{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="#"]:after,a[href^="javascript:"]:after{content:""}blockquote,pre{border:1px solid #999}thead{display:table-header-group}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff!important}.navbar{display:none}.table td,.table th{background-color:#fff!important}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}.dropdown-menu,.modal-content{-webkit-background-clip:padding-box}.btn,.btn-danger.active,.btn-danger:active,.btn-default.active,.btn-default:active,.btn-info.active,.btn-info:active,.btn-primary.active,.btn-primary:active,.btn-warning.active,.btn-warning:active,.btn.active,.btn:active,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover,.form-control,.navbar-toggle,.open>.dropdown-toggle.btn-danger,.open>.dropdown-toggle.btn-default,.open>.dropdown-toggle.btn-info,.open>.dropdown-toggle.btn-primary,.open>.dropdown-toggle.btn-warning{background-image:none}.img-thumbnail,body{background-color:#fff}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}*,:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:transparent}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#428bca;text-decoration:none}a:focus,a:hover{color:#2a6496;text-decoration:underline}a:focus{outline:dotted thin;outline:-webkit-focus-ring-color auto 5px;outline-offset:-2px}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;width:100%\9;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;width:100%\9;max-width:100%;height:auto;padding:4px;line-height:1.42857143;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}dt,label{font-weight:700}address,blockquote .small,blockquote footer,blockquote small,dd,dt,pre{line-height:1.42857143}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.list-inline,.list-unstyled{padding-left:0;list-style:none}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#428bca}a.text-primary:hover{color:#3071a9}.text-success{color:#3c763d}a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#428bca}a.bg-primary:hover{background-color:#3071a9}.bg-success{background-color:#dff0d8}a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:hover{background-color:#e4b9b9}pre code,table{background-color:transparent}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}dl,ol,ul{margin-top:0}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child,ol ol,ol ul,ul ol,ul ul{margin-bottom:0}address,dl{margin-bottom:20px}ol,ul{margin-bottom:10px}.list-inline{margin-left:-5px}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}.container{width:750px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;color:#777}legend,pre{display:block;color:#333}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}code,kbd{padding:2px 4px;font-size:90%}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}blockquote:after,blockquote:before{content:""}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;-webkit-box-shadow:none;box-shadow:none}pre{padding:9.5px;margin:0 0 10px;font-size:13px;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}.container,.container-fluid{margin-right:auto;margin-left:auto}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;border-radius:0}.container,.container-fluid{padding-right:15px;padding-left:15px}.pre-scrollable{overflow-y:scroll}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered,.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-child(odd)>td,.table-striped>tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th,.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-x:auto;overflow-y:hidden;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset,legend{padding:0;border:0}fieldset{min-width:0;margin:0}legend{width:100%;margin-bottom:20px;font-size:21px;line-height:inherit;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-appearance:none}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}.form-control,output{font-size:14px;line-height:1.42857143;color:#555;display:block}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:dotted thin;outline:-webkit-focus-ring-color auto 5px;outline-offset:-2px}output{padding-top:7px}.form-control{width:100%;height:34px;padding:6px 12px;background-color:#fff;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#777;opacity:1}.form-control:-ms-input-placeholder{color:#777}.form-control::-webkit-input-placeholder{color:#777}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .form-control-feedback,.has-success .help-block,.has-success .radio,.has-success .radio-inline{color:#3c763d}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee;opacity:1}textarea.form-control{height:auto}input[type=date],input[type=time],input[type=datetime-local],input[type=month]{line-height:34px;line-height:1.42857143\9}input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;min-height:20px;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px\9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}.checkbox-inline.disabled,.checkbox.disabled label,.radio-inline.disabled,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio label,fieldset[disabled] .radio-inline,fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.form-control-static{padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.form-horizontal .form-group-sm .form-control,.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-horizontal .form-group-lg .form-control,.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:25px;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center}.collapsing,.dropdown{position:relative}.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .form-control-feedback,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .form-control-feedback,.has-error .help-block,.has-error .radio,.has-error .radio-inline{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .control-label,.form-inline .form-group{margin-bottom:0;vertical-align:middle}.form-inline .form-group{display:inline-block}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}.form-horizontal .has-feedback .form-control-feedback{top:0;right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:14.3px}.form-horizontal .form-group-sm .control-label{padding-top:6px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;border:1px solid transparent;border-radius:4px}.btn.active:focus,.btn:active:focus,.btn:focus{outline:dotted thin;outline:-webkit-focus-ring-color auto 5px;outline-offset:-2px}.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{pointer-events:none;cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.active,.btn-default:active,.btn-default:focus,.btn-default:hover,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.disabled,.btn-default.disabled.active,.btn-default.disabled:active,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled],.btn-default[disabled].active,.btn-default[disabled]:active,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default,fieldset[disabled] .btn-default.active,fieldset[disabled] .btn-default:active,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#428bca;border-color:#357ebd}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#3071a9;border-color:#285e8e}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#428bca;border-color:#357ebd}.btn-primary .badge{color:#428bca;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#428bca;cursor:pointer;border-radius:0}.btn-link,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#2a6496;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{height:0;overflow:hidden;-webkit-transition:height .35s ease;-o-transition:height .35s ease;transition:height .35s ease}.caret{display:inline-block;width:0;height:0;margin-left:2px;border-top:4px solid;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu-right,.dropdown-menu.pull-right{right:0;left:auto}.dropdown-header,.dropdown-menu>li>a{display:block;padding:3px 20px;line-height:1.42857143;white-space:nowrap}.btn-group-vertical>.btn:not(:first-child):not(:last-child),.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn,.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{clear:both;font-weight:400;color:#333}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#428bca;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-left{right:auto;left:0}.dropdown-header{font-size:12px;color:#777}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.nav-justified>.dropdown .dropdown-menu,.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px solid}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group-vertical>.btn:focus,.btn-group>.btn:focus{outline:0}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn .caret,.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group:first-child>.btn:last-child,.btn-group>.btn-group:first-child>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn-lg .caret{border-width:5px 5px 0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group,.input-group-btn>.btn+.btn{margin-left:-1px}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn>input[type=checkbox],[data-toggle=buttons]>.btn>input[type=radio]{position:absolute;z-index:-1;filter:alpha(opacity=0);opacity:0}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.nav>li,.nav>li>a{display:block;position:relative}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li>a{padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#428bca}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center;margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0;border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-justified>li,.nav-stacked>li{float:none}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#428bca}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar{border-radius:4px}.navbar-header{float:left}.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.embed-responsive,.modal,.modal-open,.progress{overflow:hidden}@media (max-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}.navbar-static-top{z-index:1000;border-width:0 0 1px}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030;transform:translate3d(0,0,0)}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}.navbar-fixed-bottom,.navbar-fixed-top,.navbar-static-top{border-radius:0}.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}.progress-bar-striped,.progress-striped .progress-bar,.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}@media (min-width:768px){.navbar-toggle{display:none}.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}.navbar-nav.navbar-right:last-child{margin-right:-15px}.navbar-left{float:left!important}.navbar-right{float:right!important}}.navbar-form{padding:10px 15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);margin:8px -15px}@media (min-width:768px){.navbar-form .control-label,.navbar-form .form-group{margin-bottom:0;vertical-align:middle}.navbar-form .form-group{display:inline-block}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-form.navbar-right:last-child{margin-right:-15px}}.breadcrumb>li,.pagination{display:inline-block}.btn .badge,.btn .label{top:-1px;position:relative}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}.navbar-text.navbar-right:last-child{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-nav>li>a,.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#777}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>li>a,.navbar-inverse .navbar-text{color:#777}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#777}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#777}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{padding-left:0;margin:20px 0;border-radius:4px}.pager li,.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#428bca;text-decoration:none;background-color:#fff;border:1px solid #ddd}.badge,.label{font-weight:700;line-height:1;white-space:nowrap;vertical-align:baseline;text-align:center}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{color:#2a6496;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:2;color:#fff;cursor:default;background-color:#428bca;border-color:#428bca}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;color:#fff;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#428bca}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#3071a9}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;color:#fff;background-color:#777;border-radius:10px}.badge:empty{display:none}.list-group-item,.media-object,.thumbnail{display:block}.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.nav-pills>.active>a>.badge,a.list-group-item.active>.badge{color:#428bca;background-color:#fff}.jumbotron,.jumbotron .h1,.jumbotron h1{color:inherit}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding:30px;margin-bottom:30px;background-color:#eee}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.alert,.thumbnail{margin-bottom:20px}.alert .alert-link,.close{font-weight:700}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron{border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#428bca}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.modal,.modal-backdrop{top:0;right:0;bottom:0;left:0}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#428bca;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.close,.list-group-item>.badge{float:right}.progress-bar-striped,.progress-striped .progress-bar{background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar[aria-valuenow="1"],.progress-bar[aria-valuenow="2"]{min-width:30px}.progress-bar[aria-valuenow="0"]{min-width:30px;color:#777;background-color:transparent;background-image:none;-webkit-box-shadow:none;box-shadow:none}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-striped .progress-bar-info,.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media,.media-body{overflow:hidden;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-heading{margin:0 0 5px}.media>.pull-left{margin-right:10px}.media>.pull-right{margin-left:10px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.list-group-item>.badge+.badge{margin-right:5px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#e1edf7}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.panel-heading>.dropdown .dropdown-toggle,.panel-title,.panel-title>a{color:inherit}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-title,.panel>.list-group,.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-title{margin-top:0;font-size:16px}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel-group .panel-heading,.panel>.list-group:last-child .list-group-item:last-child,.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.list-group:last-child .list-group-item:last-child,.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-left-radius:3px;border-bottom-right-radius:3px}.panel>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.list-group+.panel-footer,.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#428bca}.panel-primary>.panel-heading{color:#fff;background-color:#428bca;border-color:#428bca}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#428bca}.panel-primary>.panel-heading .badge{color:#428bca;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#428bca}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{font-size:21px;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.carousel-caption,.carousel-control{text-shadow:0 1px 2px rgba(0,0,0,.6)}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal{position:fixed;z-index:1050;display:none;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate3d(0,-25%,0);-o-transform:translate3d(0,-25%,0);transform:translate3d(0,-25%,0)}.modal.in .modal-dialog{transform:translate3d(0,0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:fixed;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{min-height:16.43px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-size:12px;line-height:1.4;visibility:visible;filter:alpha(opacity=0);opacity:0}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow,.tooltip.top-left .tooltip-arrow,.tooltip.top-right .tooltip-arrow{bottom:0;border-width:5px 5px 0;border-top-color:#000}.tooltip.top .tooltip-arrow{left:50%;margin-left:-5px}.tooltip.top-left .tooltip-arrow{left:5px}.tooltip.top-right .tooltip-arrow{right:5px}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow,.tooltip.bottom-left .tooltip-arrow,.tooltip.bottom-right .tooltip-arrow{border-width:0 5px 5px;border-bottom-color:#000;top:0}.tooltip.bottom .tooltip-arrow{left:50%;margin-left:-5px}.tooltip.bottom-left .tooltip-arrow{left:5px}.tooltip.bottom-right .tooltip-arrow{right:5px}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;text-align:left;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2)}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;font-weight:400;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.carousel,.carousel-inner{position:relative}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.left>.arrow:after,.popover.right>.arrow:after{bottom:-10px;content:" "}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{left:1px;border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;border-right-width:0;border-left-color:#fff}.carousel-inner{width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;margin-top:-10px;font-family:serif}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000\9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center}.carousel-caption .btn,.text-hide{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-15px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-15px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-15px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.hidden,.visible-lg,.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;background-color:transparent;border:0}.hidden{visibility:hidden!important}.affix{position:fixed;-webkit-transform:translate3d(0,0,0);-o-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}@-ms-viewport{width:device-width}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}.visible-xs-block{display:block!important}.visible-xs-inline{display:inline!important}.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}.visible-sm-block{display:block!important}.visible-sm-inline{display:inline!important}.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}.visible-md-block{display:block!important}.visible-md-inline{display:inline!important}.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}.visible-lg-block{display:block!important}.visible-lg-inline{display:inline!important}.visible-lg-inline-block{display:inline-block!important}.hidden-lg{display:none!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}.hidden-print{display:none!important}} \ No newline at end of file diff --git a/Bruce/footer.ftl b/Bruce/footer.ftl index 12cc636..f83a821 100644 --- a/Bruce/footer.ftl +++ b/Bruce/footer.ftl @@ -45,31 +45,13 @@ "abstractLabel": "${abstractLabel}", "adminLabel": "${adminLabel}", "logoutLabel": "${logoutLabel}", - "skinDirName": "${skinDirName}", - "em00Label": "${em00Label}", - "em01Label": "${em01Label}", - "em02Label": "${em02Label}", - "em03Label": "${em03Label}", - "em04Label": "${em04Label}", - "em05Label": "${em05Label}", - "em06Label": "${em06Label}", - "em07Label": "${em07Label}", - "em08Label": "${em08Label}", - "em09Label": "${em09Label}", - "em10Label": "${em10Label}", - "em11Label": "${em11Label}", - "em12Label": "${em12Label}", - "em13Label": "${em13Label}", - "em14Label": "${em14Label}" + "skinDirName": "${skinDirName}" }; ${plugins} diff --git a/Bruce/macro-head.ftl b/Bruce/macro-head.ftl index 025a02f..df21a08 100644 --- a/Bruce/macro-head.ftl +++ b/Bruce/macro-head.ftl @@ -29,7 +29,7 @@ - + diff --git a/Bruce/page.ftl b/Bruce/page.ftl index addaf14..86704f7 100644 --- a/Bruce/page.ftl +++ b/Bruce/page.ftl @@ -36,7 +36,7 @@
-
+
${page.pageContent}
diff --git a/Community/article-list.ftl b/Community/article-list.ftl index 2001c01..94bbcd5 100644 --- a/Community/article-list.ftl +++ b/Community/article-list.ftl @@ -67,7 +67,7 @@ -
+
${article.articleAbstract}
diff --git a/Community/article.ftl b/Community/article.ftl index 8381d8d..d19288f 100644 --- a/Community/article.ftl +++ b/Community/article.ftl @@ -103,7 +103,7 @@ -
+
${article.articleContent} <#if "" != article.articleSign.signHTML?trim>
diff --git a/Community/common-comment.ftl b/Community/common-comment.ftl index c90882f..053248d 100644 --- a/Community/common-comment.ftl +++ b/Community/common-comment.ftl @@ -35,7 +35,7 @@ ${comment.commentDate2?string("yyyy-MM-dd HH:mm:ss")}
-
+
${comment.commentContent}
diff --git a/Community/css/Community.min.css b/Community/css/Community.min.css deleted file mode 100644 index 6b2c5d2..0000000 --- a/Community/css/Community.min.css +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Solo - A small and beautiful blogging system written in Java. - * Copyright (c) 2010-2019, b3log.org & hacpai.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -@charset "utf-8";#comments .comment-panel .reply a,input[type=button]{box-shadow:0 1px 0 rgba(255,255,255,.3) inset,0 0 2px rgba(255,255,255,.3) inset,0 1px 2px rgba(0,0,0,.29)}.article-footer ul,.article-header ul,.footer-block ul,.header-navi-main .tabs{list-style:none}body{background-color:#EFEFEF;color:#555;min-width:960px}a,a:active,a:link,a:visited{color:#000;text-decoration:none}a:hover{text-decoration:underline}img{max-width:100%;vertical-align:middle;border:0;height:auto;-ms-interpolation-mode:bicubic;overflow:hidden;font-size:12px}.content{width:940px;margin:0 auto}.content>h2{margin:-20px 0 20px}.hr{background:url(../images/indentline-light.png) left top repeat-x;margin:20px 0 40px;clear:both;height:2px}.arrow-right{background:url(../images/icon.png) 0 -64px no-repeat;float:left;height:38px;width:14px}input[type=button]{border-radius:5px;background-color:#000;background-image:linear-gradient(top,#333,#000);background-image:-moz-linear-gradient(top,#333,#000);background-image:-ms-linear-gradient(top,#333,#000);background-image:-o-linear-gradient(top,#333,#000);background-image:-webkit-gradient(linear,left top,left bottom,from(#333),to(#000));filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#000000');border:1px solid #000;color:#fff;margin:15px 0 0 200px;padding:7px 13px;height:auto}input[type=button]:hover{background-color:#333;background-image:linear-gradient(top,#333,#212121);background-image:-moz-linear-gradient(top,#333,#212121);background-image:-ms-linear-gradient(top,#333,#212121);background-image:-o-linear-gradient(top,#333,#212121);background-image:-webkit-gradient(linear,left top,left bottom,from(#333),to(#212121));filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#212121')}.marginBottom40{margin-bottom:40px}.header-user{background-color:#DEDEDE;padding-top:1px}.header-navi{background:url(../images/icon.png) 0 -130px repeat-x #333;margin-bottom:50px}a.header-title{color:#FFF;text-decoration:none;line-height:49px;font:700 35px/53px 'ๅพฎ่ฝฏ้›…้ป‘,Arial,Helvetica'}.sub-title{color:#9BC4CE;margin-left:10px}.header-navi-main .tabs{height:57px}.header-navi-main .tab{float:left;font-size:16px;margin-left:1px;height:57px}.header-navi-main .tab:hover{background:url(../images/icon.png) 0 -130px repeat-x #9BC4CE}#header-pages{position:relative}.header-navi-main .tab a{color:#FFF;display:block;font-weight:700;line-height:22px;padding:19px 16px 16px;text-decoration:none}#header-pages:hover .sub-tabs{left:0;list-style:none;position:absolute;top:57px;display:block}.sub-tabs .page-icon{float:left;height:14px;width:14px;margin:15px 5px 0 0}.header-navi-main .sub-tab{background-color:#9BC4CE;border-bottom:1px solid #76A0AA;border-top:1px solid #B4D9E2;margin-left:0}.header-navi-main .sub-tab a{min-width:98px;padding:10px 16px;font-size:14px}.header-navi-main .sub-tab:hover{background-color:#76A0AA}.article-header{color:#9F9F9F;float:left;font-size:12px;padding-top:15px;width:180px}.article-header ul{background-color:#333;width:160px}.article-header ul li{background:url(../images/indentline.png) left bottom repeat-x;font-weight:700;padding:7px 15px 8px;margin-left:0}.article-header ul li a{color:#FFF;display:block}.article-main{background-color:#FFF;border-bottom:1px solid #E3E3E3;border-right:1px solid #E3E3E3;margin-right:20px;padding:20px 20px 0;width:499px;float:left;overflow:hidden}.article-body{line-height:145%}.article-body a{color:#075181}.article-body a:hover{color:#68ADD5}.article-main h2.title{font:700 30px Arial,Helvetica,sans-serif;margin:0 0 20px}.article-main h2.title sup,.read-more a{font-size:12px}.article-detail-footer>a,.pagination a.selected{font-weight:700}.read-more a{background-color:#F2F2F2;color:#333;padding:8px 18px 8px 12px;margin:20px 0;float:left}.article-footer{width:200px;float:left}.article-footer h3{background:url(../images/indentline-light.png) left bottom repeat-x;font-size:17px;padding:25px 0 10px}.article-footer li{margin-left:0;border-bottom:1px solid #E0E0E0;padding:8px 5px}#comments .comment-panel,.article-detail-footer,.pagination{border-bottom:1px solid #E3E3E3;border-right:1px solid #E3E3E3}.article-footer a{color:#888;margin-bottom:2px;display:block}.pagination{background-color:#FFF;margin:0 0 20px 181px;text-align:center;padding:12px 20px;width:499px}.pagination a{color:#555;padding:0 3px;text-decoration:none}.pagination a.selected,.pagination a:hover{text-decoration:underline}.article-detail-body{width:716px;margin-right:0}#replyForm,.article-detail-body .tags{margin:20px 0}.article-detail-footer{background-color:#FFF;margin:40px 0 40px 181px;padding:20px;width:716px}.article-relative{margin-top:20px;width:360px}.article-relative h4{font-size:14px;line-height:25px}.article-relative a{color:#555;line-height:145%}#comments{background:url(../images/indentline-light.png) left top repeat-x;padding-top:30px;position:relative}#comments>div{margin-top:10px}#comments>div>img{margin:1px 10px 10px 0}#comments .comment-panel{background:#FFF;padding:20px;width:798px;margin-bottom:10px;word-wrap:break-word;overflow:hidden}#comments .comment-top{margin-bottom:10px}#comments .comment-panel .reply{margin-top:20px}#comments .comment-panel .reply a{border-radius:5px;background-color:#EEE;border:1px solid #888;color:#555;padding:2px 10px}#comments .comment-panel .reply a:hover{background-color:#E6E6E6;text-decoration:none}.comment-body-ref{position:absolute;border:1px solid #E3E3E3;background-color:#FFF;padding:10px 0 0 10px;left:177px;opacity:.9}#comments .comment-body-ref .comment-panel{border-width:0;margin-bottom:0;width:620px;padding:10px}.comment-title{color:#333;font-size:30px;margin:20px 0 15px;font-family:\5fae\8f6f\96c5\9ed1}.comment{margin-bottom:40px}.comment th{padding:10px 0;text-align:left}.comment input[type=text],.comment textarea{outline:0;color:#666;padding:10px 7px;background-color:#FFF;font-family:Arial,Helvetica,sans-serif;width:723px;border:1px solid #DDD;font-size:12px;height:16px;line-height:16px}.comment textarea{margin:10px 0;padding:7px;height:auto}.comment #captchaReply{margin-left:10px}#commentValidate,#commentValidateReply{width:240px}.em00,.em01,.em02,.em03,.em04,.em05,.em06,.em07,.em08,.em09,.em10,.em11,.em12,.em13,.em14{background-image:url(../../../images/emotions/emotions.png);background-size:120px;margin:0 12px}.footer-secondary{background:url(../images/indentline-light.png) left top repeat-x #DEDEDE;padding:40px 0}.article-date,.comment th span.comment-label,.footer-secondary h4{background-color:#333;color:#FFF;float:left;font-size:17px;font-weight:700;height:37px;line-height:37px;padding-left:15px;width:145px}.most-view-count-articles,.notice,.recent-comments{float:left;width:700px;margin-left:65px;word-break:break-all;word-wrap:break-word}.most-view-count-articles a{font:18px ๅพฎ่ฝฏ้›…้ป‘;margin-right:20px;font-weight:700}.most-view-count-articles sup{font-size:12px;color:#555;font-weight:400;margin-right:3px}.recent-comments div{float:left;margin:0 25px 10px 0;text-align:center;width:91px}.recent-comments div a{display:block;line-height:22px}#comments>div>img,.recent-comments img{background-color:#FFF;border-bottom:1px solid #C2C2C2;border-right:1px solid #C2C2C2;padding:8px 7px 7px 8px;width:75px;height:75px}#comments>div>img:hover,.recent-comments img:hover{border-color:#5A5A5A}.footer-widgets{background:url(../images/indentline-light.png) left top repeat-x;padding:40px 0}.footer-block{margin-right:20px;width:220px}.footer-block h4{font:700 18px ๅพฎ่ฝฏ้›…้ป‘;color:#000;height:25px;padding:0 0 15px;background:url(../images/indentline.png) left bottom repeat-x}.footer-block li{margin-left:0;height:30px;padding-left:10px;background:url(../images/indentline-light.png) left bottom repeat-x}.footer-block li.mostUsedTags a{padding-left:20px}.footer-block li img{cursor:pointer;height:16px;left:0;position:relative;top:-20px;width:16px}.footer-block li a{color:#555;display:block;height:19px;line-height:19px;overflow:hidden;padding:6px 0 1px}.footer-block li sup{float:left;margin:5px 3px 0 0}.footer-block li:hover{background:url(../images/icon.png) 0 -34px repeat-x}.footer{background:url(../images/indentline-light.png) left top repeat-x #DEDEDE;text-align:left}.footer .content{line-height:22px}.footer a{color:#000}.error-msg,a.star-current-icon{color:#333}.footer .goTop{background:url(../images/icon.png) -12px -64px no-repeat;cursor:pointer;padding-left:15px;height:17px;line-height:17px}.error-msg{font-weight:700}.error-footer{bottom:0;position:fixed;width:100%}.error-panel{background-color:#FFF;border-bottom:1px solid #E3E3E3;border-right:1px solid #E3E3E3;margin-bottom:50px;padding:20px}.error-panel h2{font:700 30px/24px;margin:0 0 20px}.arrow-dowm-icon,.atom-icon,.down-icon,.read-more-icon,.tag-icon,.up-icon{background-image:url(../images/icon.png);background-repeat:no-repeat;float:left}.read-more-icon{background-position:0 -22px;height:12px;margin:2px 0 0 6px;width:12px}.arrow-dowm-icon{background-position:-13px -22px;height:13px;margin:8px 0 0 6px;width:13px;cursor:pointer}.tag-icon{background-position:0 -102px;margin-right:6px;height:16px;width:16px}.atom-icon{height:22px;margin-left:6px;width:22px}.down-icon,.up-icon{height:12px;margin:6px 0 0 10px;width:11px;cursor:pointer}.up-icon{background-position:-11px -118px}.down-icon{background-position:0 -118px}.moon-current-icon,.moon-icon,.star-current-icon,.star-icon{height:58px;width:64px;background-image:url(../images/author-header.png);float:right;white-space:normal;text-align:center;word-break:break-all;padding-top:6px;word-wrap:break-word;font-weight:700}.star-current-icon{background-position:0 -64px}.star-icon{background-position:0 -192px}a.star-icon{color:orange}.moon-icon{float:right;margin-top:4px}.moon-current-icon{float:right;background-position:0 -128px;margin:1px 0 3px}#tagsPanel a.tagPanel:hover{border:1px dashed}#tagsPanel a.tagPanel{border:1px solid;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;margin:3px;cursor:pointer;float:left} \ No newline at end of file diff --git a/Community/css/base.css b/Community/css/base.css new file mode 100644 index 0000000..38a688f --- /dev/null +++ b/Community/css/base.css @@ -0,0 +1,18 @@ +/** + * Solo - A small and beautiful blogging system written in Java. + * Copyright (c) 2010-2019, b3log.org & hacpai.com + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +๏ปฟ.content-reset{word-wrap:break-word;overflow:auto;line-height:1.65;font-size:16px;word-break:break-word}.content-reset ul,.content-reset ol{padding-left:2em;margin-top:0;margin-bottom:16px}.content-reset li{margin-top:0.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{padding-bottom:0.3em;font-size:1.7em;border-bottom:1px solid #eee}.content-reset h2{padding-bottom:0.3em;font-size:1.5em;border-bottom:1px solid #eee}.content-reset h3{font-size:1.25em}.content-reset h4{font-size:1em}.content-reset h5{font-size:0.875em}.content-reset h6{font-size:0.85em}.content-reset hr{height:0.15em;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:0.25em solid #ddd;margin-bottom:16px}.content-reset blockquote p{margin:0}.content-reset ins>iframe{border:0}.content-reset iframe{border:1px solid rgba(0,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:bold;text-align:center !important;background:rgba(158,188,226,0.2)}.content-reset tbody tr:nth-child(2n){background:rgba(158,188,226,0.12)}.content-reset tr:hover{background:#efefef}.content-reset code{padding:0.2em 0.4em;margin:0;font-size:85%;background-color:rgba(252,41,41,0.12);border-radius:3px;word-break:break-word}.content-reset pre{position:relative}.content-reset pre textarea{position:absolute;top:-100000px}.content-reset pre>code{padding:0.5em;background-color:rgba(0,0,0,0.04);background-size:20px 20px;border-radius:5px;display:block}.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:solid 1px rgba(0,0,0,0.38);border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.content-reset__task,.content-reset .task-list-item{list-style:none;margin-left:-1em}.img-preview{width:100%;height:100%;top:0;z-index:211;overflow:auto;cursor:zoom-out;transition:background-color .2s ease-in-out}.img-preview img{max-width:inherit;transition:transform .3s ease-in-out}html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;height:100%}body{margin:0;font-family:"Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif;font-size:14px;background-color:#fff;-webkit-font-smoothing:antialiased;-webkit-overflow-scrolling:touch}::-moz-selection{text-shadow:none;background:rgba(65,131,196,0.4)}::selection{text-shadow:none;background:rgba(66,133,244,0.4)}ul,ol{margin:0;padding:0}h1,h2,h3,h4,h5,h6,dl,dd,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{outline:0;text-decoration:none}a:hover{text-decoration:underline}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.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{margin:0;font-size:100%;vertical-align:middle;font-family:"Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif;outline:none}button,input{line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}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-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;resize:vertical}svg{fill:currentColor;display:inline-block;stroke-width:0;stroke:currentColor;width:14px;height:14px}blockquote{margin:0}.left{float:left}.right{float:right}.clear:before,.clear:after{display:table;content:""}.clear:after{clear:both}.none{display:none}body{background-color:#EFEFEF;color:#555555;min-width:960px}a,a:link{color:#000000;text-decoration:none}a:active,a:visited{color:#000000;text-decoration:none}a:hover{text-decoration:underline}img{max-width:100%;vertical-align:middle;border:0;height:auto;-ms-interpolation-mode:bicubic;overflow:hidden;font-size:12px}.content{width:940px;margin:0 auto}.content>h2{margin:-20px 0 20px 0}.hr{background:url("../images/indentline-light.png") repeat-x scroll left top transparent;margin:20px 0 40px;clear:both;height:2px}.arrow-right{background:url("../images/icon.png") 0px -64px no-repeat;float:left;height:38px;width:14px}input[type='button']{border-radius:5px;box-shadow:0 1px 0 rgba(255,255,255,0.3) inset,0 0 2px rgba(255,255,255,0.3) inset,0 1px 2px rgba(0,0,0,0.29);background-color:#000000;background-image:linear-gradient(top, #333, #000);background-image:-moz-linear-gradient(top, #333, #000);background-image:-ms-linear-gradient(top, #333, #000);background-image:-o-linear-gradient(top, #333, #000);background-image:-webkit-gradient(linear, left top, left bottom, from(#333), to(#000));filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#000000');border:1px solid #000000;color:white;margin:15px 0 0 200px;padding:7px 13px;height:auto}input[type='button']:hover{background-color:#333333;background-image:linear-gradient(top, #333, #212121);background-image:-moz-linear-gradient(top, #333, #212121);background-image:-ms-linear-gradient(top, #333, #212121);background-image:-o-linear-gradient(top, #333, #212121);background-image:-webkit-gradient(linear, left top, left bottom, from(#333), to(#212121));filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#212121')}.marginBottom40{margin-bottom:40px}.header-user{background-color:#DEDEDE;padding-top:1px}.header-navi{background:url("../images/icon.png") 0px -130px repeat-x #333;margin-bottom:50px}a.header-title{color:#FFFFFF;text-decoration:none;line-height:49px;font:bold 35px/53px 'ๅพฎ่ฝฏ้›…้ป‘,Arial,Helvetica'}.sub-title{color:#9BC4CE;margin-left:10px}.header-navi-main .tabs{list-style:none;height:57px}.header-navi-main .tab{float:left;font-size:16px;margin-left:1px;height:57px}.header-navi-main .tab:hover{background:url("../images/icon.png") repeat-x scroll 0 -130px #9BC4CE}#header-pages{position:relative}.header-navi-main .tab a{color:#FFFFFF;display:block;font-weight:bold;line-height:22px;padding:19px 16px 16px;text-decoration:none}#header-pages:hover .sub-tabs{left:0px;list-style:none;position:absolute;top:57px;display:block}.sub-tabs .page-icon{float:left;height:14px;width:14px;margin:4px 5px 0 0}.header-navi-main .sub-tab{background-color:#9BC4CE;border-bottom:1px solid #76A0AA;border-top:1px solid #B4D9E2;margin-left:0px}.header-navi-main .sub-tab a{min-width:98px;padding:10px 16px;font-size:14px}.header-navi-main .sub-tab:hover{background-color:#76A0AA}.article-header{color:#9F9F9F;float:left;font-size:12px;padding-top:15px;width:180px}.article-header ul{background-color:#333333;list-style:none;width:160px}.article-header ul li{background:url("../images/indentline.png") repeat-x scroll left bottom transparent;font-weight:bold;padding:7px 15px 8px;margin-left:0px}.article-header ul li a{color:#FFFFFF;display:block}.article-main{background-color:#FFFFFF;border-bottom:1px solid #E3E3E3;border-right:1px solid #E3E3E3;margin-right:20px;padding:20px 20px 0;width:499px;float:left;overflow:hidden}.content-reset{line-height:145%}.content-reset a{color:#075181}.content-reset a:hover{color:#68ADD5}.article-main h2.title{font:bold 30px Arial,Helvetica,sans-serif;margin:0 0 20px}.article-main h2.title sup{font-size:12px}.read-more a{background-color:#F2F2F2;color:#333333;font-size:12px;padding:8px 18px 8px 12px;margin:20px 0;float:left}.article-footer{width:200px;float:left}.article-footer h3{background:url("../images/indentline-light.png") repeat-x scroll left bottom transparent;font-size:17px;padding:25px 0 10px}.article-footer ul{list-style:none}.article-footer li{margin-left:0px;border-bottom:1px solid #E0E0E0;padding:8px 5px}.article-footer a{color:#888888;margin-bottom:2px;display:block}.pagination{background-color:#FFFFFF;border-right:1px solid #E3E3E3;border-bottom:1px solid #E3E3E3;margin:0 0 20px 181px;text-align:center;padding:12px 20px;width:499px}.pagination a{color:#555555;padding:0 3px;text-decoration:none}.pagination a.selected{font-weight:bold}.pagination a:hover,.pagination a.selected{text-decoration:underline}.article-detail-body{width:716px;margin-right:0px}.article-detail-body .tags,#replyForm{margin:20px 0}.article-detail-footer{background-color:#FFFFFF;border-bottom:1px solid #E3E3E3;border-right:1px solid #E3E3E3;margin:40px 0 40px 181px;padding:20px;width:716px}.article-detail-footer>a{font-weight:bold}.article-relative{margin-top:20px;width:360px}.article-relative h4{font-size:14px;line-height:25px}.article-relative a{color:#555555;line-height:145%}#comments{background:url("../images/indentline-light.png") repeat-x scroll left top transparent;padding-top:30px;position:relative}#comments>div{margin-top:10px}#comments>div>img{height:80px;width:80px;margin:1px 10px 10px 0}#comments .comment-panel{background:none repeat scroll 0 0 #FFFFFF;border-bottom:1px solid #E3E3E3;border-right:1px solid #E3E3E3;padding:20px;width:798px;margin-bottom:10px;word-wrap:break-word;overflow:hidden}#comments .comment-top{margin-bottom:10px}#comments .comment-panel .reply{margin-top:20px}#comments .comment-panel .reply a{border-radius:5px;box-shadow:0 1px 0 rgba(255,255,255,0.3) inset,0 0 2px rgba(255,255,255,0.3) inset,0 1px 2px rgba(0,0,0,0.29);background-color:#EEEEEE;border:1px solid #888888;color:#555555;padding:2px 10px}#comments .comment-panel .reply a:hover{background-color:#E6E6E6;text-decoration:none}.comment-body-ref{position:absolute;border:1px solid #E3E3E3;background-color:#FFFFFF;padding:10px 0 0 10px;left:177px;opacity:0.9}#comments .comment-body-ref .comment-panel{border-width:0px;margin-bottom:0;width:620px;padding:10px}.comment-title{color:#333333;font-size:30px;margin:20px 0 15px 0;font-family:\5fae\8f6f\96c5\9ed1}.comment{margin-bottom:40px}.comment th{padding:10px 0px 10px 0;text-align:left}.comment input[type="text"],.comment textarea{outline:none;color:#666666;padding:10px 7px;background-color:#FFFFFF;font-family:Arial,Helvetica,sans-serif;width:723px;border:1px solid #DDDDDD;font-size:12px;height:16px;line-height:16px}.comment textarea{margin:10px 0;padding:7px;height:auto}.comment #captchaReply{margin-left:10px}#commentValidate,#commentValidateReply{width:240px}.footer-secondary{background:url("../images/indentline-light.png") repeat-x scroll left top #DEDEDE;padding:40px 0}.footer-secondary h4,.article-date,.comment th span.comment-label{background-color:#333333;color:#FFFFFF;float:left;font-size:17px;font-weight:bold;height:37px;line-height:37px;padding-left:15px;width:145px}.most-view-count-articles,.recent-comments,.notice{float:left;width:700px;margin-left:65px;word-break:break-all;word-wrap:break-word}.most-view-count-articles a{font:18px ๅพฎ่ฝฏ้›…้ป‘;margin-right:20px;font-weight:bold}.most-view-count-articles sup{font-size:12px;color:#555555;font-weight:normal;margin-right:3px}.recent-comments div{float:left;margin:0 25px 10px 0px;text-align:center;width:91px}.recent-comments div a{display:block;line-height:22px}.recent-comments img,#comments>div>img{background-color:#FFFFFF;border-bottom:1px solid #C2C2C2;border-right:1px solid #C2C2C2;padding:8px 7px 7px 8px;width:75px;height:75px}.recent-comments img:hover,#comments>div>img:hover{border-color:#5A5A5A}.footer-widgets{background:url("../images/indentline-light.png") repeat-x scroll left top transparent;padding:40px 0}.footer-block{margin-right:20px;width:220px}.footer-block h4{font:bold 18px ๅพฎ่ฝฏ้›…้ป‘;color:#000000;height:25px;padding:0 0 15px;background:url("../images/indentline.png") repeat-x scroll left bottom transparent}.footer-block ul{list-style:none}.footer-block li{margin-left:0px;height:30px;padding-left:10px;background:url("../images/indentline-light.png") repeat-x scroll left bottom transparent}.footer-block li.mostUsedTags a{padding-left:20px}.footer-block li img{cursor:pointer;height:16px;left:0px;position:relative;top:-20px;width:16px}.footer-block li a{color:#555555;display:block;height:19px;line-height:19px;overflow:hidden;padding:6px 0 1px 0px}.footer-block li sup{float:left;margin:18px 3px 0 0}.footer-block li:hover{background:url("../images/icon.png") repeat-x 0px -34px}.footer{background:url("../images/indentline-light.png") repeat-x scroll left top #DEDEDE;text-align:left;padding:10px 0}.footer .content{line-height:22px}.footer a{color:#000000}.footer .goTop{background:url("../images/icon.png") no-repeat -12px -64px;cursor:pointer;padding-left:15px;height:17px;line-height:17px}.error-msg{color:#333333;font-weight:bold}.error-footer{bottom:0;position:fixed;width:100%}.error-panel{background-color:#FFFFFF;border-bottom:1px solid #E3E3E3;border-right:1px solid #E3E3E3;margin-bottom:50px;padding:20px}.error-panel h2{font:bold 30px/24px;margin:0 0 20px}.read-more-icon,.arrow-dowm-icon,.tag-icon,.atom-icon,.up-icon,.down-icon{background-image:url("../images/icon.png");background-repeat:no-repeat;float:left}.read-more-icon{background-position:0 -22px;height:12px;margin:2px 0 0 6px;width:12px}.arrow-dowm-icon{background-position:-13px -22px;height:13px;margin:8px 0 0 6px;width:13px;cursor:pointer}.tag-icon{background-position:0px -102px;margin-right:6px;height:16px;width:16px}.atom-icon{height:22px;margin-left:6px;width:22px}.up-icon{background-position:-11px -118px;height:12px;margin:6px 0 0 10px;width:11px;cursor:pointer}.down-icon{background-position:0 -118px;height:12px;margin:6px 0 0 10px;width:11px;cursor:pointer}.star-current-icon,.star-icon,.moon-icon,.moon-current-icon{height:58px;width:64px;background-image:url("../images/author-header.png");float:right;white-space:normal;text-align:center;word-break:break-all;padding-top:6px;word-wrap:break-word;font-weight:bold}.star-current-icon{background-position:0px -64px}a.star-current-icon{color:#333333}.star-icon{background-position:0 -192px}a.star-icon{color:orange}.moon-icon{float:right;margin-top:4px}.moon-current-icon{float:right;background-position:0 -128px;margin:1px 0 3px 0}#tagsPanel a.tagPanel:hover{border:1px dashed}#tagsPanel a.tagPanel{border:1px solid;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;margin:3px;cursor:pointer;float:left} diff --git a/Community/css/Community.css b/Community/css/base.scss similarity index 97% rename from Community/css/Community.css rename to Community/css/base.scss index 0dc6a5b..7c6f103 100644 --- a/Community/css/Community.css +++ b/Community/css/base.scss @@ -20,8 +20,32 @@ * skin community style * * @author Liyuan Li - * @version 1.2.0.0, Jun 4, 2018 -*/ + * @version 2.0.0.0, Feb 21, 2019 + */ + +@import "../../../scss/reset-content"; +@import "../../../scss/reset"; +.left { + float: left; +} + +.right { + float: right; +} + +.clear:before, +.clear:after { + display: table; + content: ""; +} + +.clear:after { + clear: both; +} + +.none { + display: none; +} body { background-color: #EFEFEF; color: #555555; @@ -168,7 +192,7 @@ a.header-title { float: left; height: 14px; width: 14px; - margin: 15px 5px 0 0; + margin: 4px 5px 0 0; } .header-navi-main .sub-tab { @@ -226,15 +250,15 @@ a.header-title { overflow: hidden; } -.article-body { +.content-reset { line-height: 145%; } -.article-body a { +.content-reset a { color: #075181; } -.article-body a:hover { +.content-reset a:hover { color: #68ADD5; } @@ -450,12 +474,6 @@ a.header-title { #commentValidate, #commentValidateReply { width: 240px; } - -.em00, .em01, .em02, .em03, .em04, .em05, .em06, .em07, .em08, .em09, .em10, .em11, .em12, .em13, .em14 { - background-image: url("../../../images/emotions/emotions.png"); - background-size: 120px; - margin: 0 12px; -} /* footer secondary */ .footer-secondary { background: url("../images/indentline-light.png") repeat-x scroll left top #DEDEDE; @@ -574,7 +592,7 @@ a.header-title { .footer-block li sup { float: left; - margin: 5px 3px 0 0; + margin: 18px 3px 0 0; } .footer-block li:hover { @@ -585,6 +603,7 @@ a.header-title { .footer { background: url("../images/indentline-light.png") repeat-x scroll left top #DEDEDE; text-align: left; + padding: 10px 0; } .footer .content { diff --git a/Community/footer.ftl b/Community/footer.ftl index a2857a5..8e93a29 100644 --- a/Community/footer.ftl +++ b/Community/footer.ftl @@ -61,22 +61,7 @@ "markedAvailable": ${markedAvailable?c}, "adminLabel": "${adminLabel}", "logoutLabel": "${logoutLabel}", - "skinDirName": "${skinDirName}", - "em00Label": "${em00Label}", - "em01Label": "${em01Label}", - "em02Label": "${em02Label}", - "em03Label": "${em03Label}", - "em04Label": "${em04Label}", - "em05Label": "${em05Label}", - "em06Label": "${em06Label}", - "em07Label": "${em07Label}", - "em08Label": "${em08Label}", - "em09Label": "${em09Label}", - "em10Label": "${em10Label}", - "em11Label": "${em11Label}", - "em12Label": "${em12Label}", - "em13Label": "${em13Label}", - "em14Label": "${em14Label}" + "skinDirName": "${skinDirName}" }, maxLength = parseInt("${mostCommentArticles?size}"); diff --git a/Community/lang/lang_zh_CN.properties b/Community/lang/lang_zh_CN.properties index 7d83afc..42c5f5f 100644 --- a/Community/lang/lang_zh_CN.properties +++ b/Community/lang/lang_zh_CN.properties @@ -188,7 +188,6 @@ permalink1Label=\u94FE\u63A5\uFF1A permalinkLabel=\u94FE\u63A5 welcomeToSoloLabel=\u6B22\u8FCE\u4F7F\u7528 Solo\uFF01 b3logLabel=B3LOG -killBrowserLabel=

\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01

\u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002

\u60A8\u53EF\u4EE5\u4E0B\u8F7D readmoreLabel=\u9605\u8BFB\u66F4\u591A\u00BB readmore2Label=\u9605\u8BFB\u66F4\u591A replyLabel=\u56DE\u590D\u00BB diff --git a/Community/macro-head.ftl b/Community/macro-head.ftl index 50b83dc..410c898 100644 --- a/Community/macro-head.ftl +++ b/Community/macro-head.ftl @@ -27,8 +27,7 @@ - - + diff --git a/Community/page.ftl b/Community/page.ftl index 40734dc..3a059e1 100644 --- a/Community/page.ftl +++ b/Community/page.ftl @@ -34,7 +34,7 @@ <#include "header.ftl">
-
+
${page.pageContent}
<@comments commentList=pageComments article=page> diff --git a/Finding/article.ftl b/Finding/article.ftl index bfa99a1..a6e2285 100644 --- a/Finding/article.ftl +++ b/Finding/article.ftl @@ -84,7 +84,7 @@ -
+
${article.articleContent} <#if "" != article.articleSign.signHTML?trim>
diff --git a/Finding/common-comment.ftl b/Finding/common-comment.ftl index fd67447..199fed2 100644 --- a/Finding/common-comment.ftl +++ b/Finding/common-comment.ftl @@ -42,7 +42,7 @@ ${replyLabel}
-
+
${comment.commentContent}
diff --git a/Finding/css/Finding.min.css b/Finding/css/Finding.min.css deleted file mode 100644 index ff0bde3..0000000 --- a/Finding/css/Finding.min.css +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Solo - A small and beautiful blogging system written in Java. - * Copyright (c) 2010-2019, b3log.org & hacpai.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -@charset "utf-8";body,html{height:100%;max-height:100%}body,dl,h1,h2,h3,h4,h5,h6,ol,p,ul{text-rendering:geometricPrecision}.nav li a,dl dt{text-overflow:ellipsis}dl dd,dl dt{margin-bottom:1em}body,li li{margin:0}blockquote cite,dl dt{font-weight:700}dl,ol,p,pre,ul{margin:0 0 1.75em}#tags li,.nav ul,ul.comments{list-style:none}.fn-left,dl dt{float:left}html{font-size:62.5%;-webkit-tap-highlight-color:transparent}body{font-family:Merriweather,"Microsoft Yahei",Helvetica;letter-spacing:.01rem;font-size:1.8rem;line-height:1.75em;color:#3A4145;-webkit-font-feature-settings:'kern' 1;-moz-font-feature-settings:'kern' 1;-o-font-feature-settings:'kern' 1}::-moz-selection{background:#D6EDFF}::selection{background:#D6EDFF}a{color:#4A4A4A;transition:color .3s ease}a:hover{color:#111}h1,h2,h3,h4,h5,h6{-webkit-font-feature-settings:'dlig' 1,'liga' 1,'lnum' 1,'kern' 1;-moz-font-feature-settings:'dlig' 1,'liga' 1,'lnum' 1,'kern' 1;-o-font-feature-settings:'dlig' 1,'liga' 1,'lnum' 1,'kern' 1;color:#2E2E2E;line-height:1.15em;font-family:"Open Sans","Microsoft Yahei",Helvetica}code,pre,tt{font-family:Inconsolata,monospace,"Microsoft Yahei",Helvetica;background:#F7FAFB}h1{font-size:5rem;letter-spacing:-2px;text-indent:-3px}.page-title a,h2{letter-spacing:-1px}h2{font-size:3.6rem}h3{font-size:3rem}h4{font-size:2.5rem}h5,h6{font-size:2rem}img{max-width:100%;height:auto}dl,ol,p,ul{-webkit-font-feature-settings:'liga' 1,'onum' 1,'kern' 1;-moz-font-feature-settings:'liga' 1,'onum' 1,'kern' 1;-o-font-feature-settings:'liga' 1,'onum' 1,'kern' 1}ol,ul{padding-left:3rem}ol ol,ol ul,ul ol,ul ul{padding-left:2em;margin-bottom:0}dl dt{width:180px;overflow:hidden;clear:left;text-align:right;white-space:nowrap}dl dd{margin-left:200px}hr{display:block;height:1px;border:0;border-top:#EFEFEF 1px solid;margin:3.2em 0;padding:0}blockquote{-moz-box-sizing:border-box;box-sizing:border-box;margin:1.75em 0;padding:0 0 0 1.75em;border-left:#4A4A4A .4em solid}blockquote p{margin:.8em 0;font-style:italic}blockquote small{display:inline-block;margin:.8em 0 .8em 1.5em;font-size:.9em;color:#CCC}blockquote small:before{content:"\2014 \00A0"}blockquote cite a{font-weight:400}mark{background-color:#fdffb6}code,tt{padding:1px 3px;font-size:.85em;white-space:pre-wrap;border:1px solid #E3EDF3;border-radius:2px}pre{-moz-box-sizing:border-box;box-sizing:border-box;border:1px solid #E3EDF3;width:100%;padding:10px;font-size:.9em;white-space:pre;overflow:auto;border-radius:3px}pre code,pre tt{font-size:inherit;white-space:pre-wrap;background:0 0;border:none;padding:0}.article-body h1,.article-body h2{padding-bottom:.3em;border-bottom:1px solid #eee}.article-body{word-wrap:break-word;overflow:auto;line-height:1.65;font-size:16px;word-break:break-word}.article-body ol,.article-body ul{padding-left:2em;margin-top:0;margin-bottom:16px}.article-body li{margin-top:.25em}.article-body img{cursor:zoom-in}.article-body img.emoji{cursor:auto;max-width:18px}.article-body h1,.article-body h2,.article-body h3,.article-body h4,.article-body h5,.article-body h6{margin-top:24px;margin-bottom:16px;font-weight:600;line-height:1.25}.article-body h1{font-size:1.7em}.article-body h2{font-size:1.5em}.article-body h3{font-size:1.25em}.article-body h4{font-size:1em}.article-body h5{font-size:.875em}.article-body h6{font-size:.85em}.article-body hr{height:.15em;padding:0;margin:24px 0;background-color:#e7e7e7;border:0}.article-body p{margin-top:0;margin-bottom:16px}.article-body blockquote{padding:0 1em;color:#777;border-left:.25em solid #ddd;margin-bottom:16px}.article-body blockquote p{margin:0}.article-body ins>iframe{border:0}.article-body iframe{border:1px solid rgba(0,0,0,.38)}.article-body table{width:100%;border:1px solid #dedede;margin:15px auto;border-collapse:collapse;empty-cells:show}.article-body thead{text-align:center}.article-body td,.article-body th{height:35px;border:1px solid #dedede;padding:0 10px}.article-body th{font-weight:700;text-align:center!important;background:rgba(158,188,226,.2)}.article-body tbody tr:nth-child(2n){background:rgba(158,188,226,.12)}.article-body tr:hover{background:#efefef}.article-body 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}.article-body .task-list-item,.article-body__task{list-style:none;margin-left:-1em}.fn-clear:after,.fn-clear:before{display:table;content:""}.fn-clear:after{clear:both}.fn-right{float:right}.fn-none{display:none}.fn-vertical{display:table-cell;vertical-align:middle}.fn-wrap{width:80%;max-width:768px;margin:0 auto}@-webkit-keyframes fade-in-down{0%{opacity:0;-webkit-transform:translateY(-10px);transform:translateY(-10px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes fade-in-down{0%{opacity:0;-webkit-transform:translateY(-10px);transform:translateY(-10px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@-webkit-keyframes bounce{0%,10%,25%,40%,50%{-webkit-transform:translateY(0);transform:translateY(0)}20%{-webkit-transform:translateY(-10px);transform:translateY(-10px)}30%{-webkit-transform:translateY(-5px);transform:translateY(-5px)}}@keyframes bounce{0%,100%,20%,50%,80%{-webkit-transform:translateY(0);transform:translateY(0)}40%{-webkit-transform:translateY(-10px);transform:translateY(-10px)}60%{-webkit-transform:translateY(-5px);transform:translateY(-5px)}}@-webkit-keyframes upbounce{0%,10%,25%,40%,50%{-webkit-transform:translateY(0);transform:translateY(0)}20%{-webkit-transform:translateY(-10px);transform:translateY(-10px)}30%{-webkit-transform:translateY(-5px);transform:translateY(-5px)}}@keyframes upbounce{0%,100%,20%,50%,80%{-webkit-transform:translateY(0);transform:translateY(0)}40%{-webkit-transform:translateY(-10px);transform:translateY(-10px)}60%{-webkit-transform:translateY(-5px);transform:translateY(-5px)}}@font-face{font-family:icomoon;src:url(fonts/icomoon.eot?v=1);src:url(fonts/icomoon.eot?v=1#iefix) format("embedded-opentype"),url(fonts/icomoon.woff?v=1) format("woff"),url(fonts/icomoon.ttf?v=1) format("truetype"),url(fonts/icomoon.svg?v=1#icons) format("svg");font-weight:400;font-style:normal}[class*=" icon-"]:before,[class^=icon-]:before{font-size:2rem;font-family:icomoon,"Open Sans","Microsoft Yahei",Helvetica;speak:none;font-style:normal;font-weight:400;font-variant:normal;text-transform:none;line-height:1;text-decoration:none!important;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.menu-button,.nav a,.page-title a,.post-meta a,.post-title a,.scroll-down{text-decoration:none}.icon-sitemap:before{content:"\e900"}.icon-list:before{content:"\e901"}.icon-arrow-left:before{content:"\f605";font-size:3.5rem}.icon-menu:before{content:"\f609"}.main-header .icon-menu:before{vertical-align:-4px}.icon-login:before{content:"\e611"}.icon-logout:before{content:"\e601"}.icon-setting:before{content:"\e602"}.icon-register:before{content:"\e600"}.avatar{border-radius:100%;float:left;height:24px;margin-right:9px;width:24px}.avatar-warp{width:10%;padding-right:10px;box-sizing:border-box}.avatar-48{box-shadow:0 0 2px #ddd;height:auto;width:48px;margin-right:10px;border-radius:24px}.form{width:100%;margin-top:50px}.form button,.form input,.form textarea{border:1px solid #CCC;background-color:#FAFAFA;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.075) inset;padding:7px 8px;width:100%;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;font-family:"Microsoft Yahei",Helvetica;outline:0}.form button{width:auto;vertical-align:bottom}.form input:focus,.form textarea:focus{background-color:#FFF;box-shadow:0 1px 2px rgba(0,0,0,.075) inset,0 0 5px rgba(81,167,232,.5);border:1px solid #51A7E8}.error-msg{font-size:1.5rem;color:#9EABB3}.cmtFromSym{font-size:1rem;color:#9EABB3}.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{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}.main-header{position:relative;display:table;width:100%;height:100vh;margin-bottom:5rem;text-align:center;background:url(../images/header-bg.jpg) center center no-repeat #222;background-size:cover;overflow:hidden;min-height:50vh}.site-wrapper{position:relative;z-index:10;min-height:100%;background:#fff;-webkit-transition:-webkit-transform .5s ease;transition:transform .5s ease}.nav-opened .site-wrapper{overflow-x:hidden;-webkit-transform:translate3D(-240px,0,0);-ms-transform:translate3D(-240px,0,0);transform:translate3D(-240px,0,0);-webkit-transition:-webkit-transform .3s ease;transition:transform .3s ease}.page-title a{-webkit-animation:fade-in-down .6s;animation:fade-in-down .6s;-webkit-animation-delay:.2s;animation-delay:.2s;margin:10px 0;font-size:5rem;font-weight:700;font-family:"Open Sans","Microsoft Yahei",Helvetica;color:#fff;text-shadow:0 0 3px rgba(0,0,0,.9)}.page-description,.page-description a{-webkit-animation:fade-in-down .9s;animation:fade-in-down .9s;-webkit-animation-delay:.1s;animation-delay:.1s;margin:0;font-size:2rem;line-height:1.5em;font-weight:400;letter-spacing:.01rem;color:rgba(255,255,255,.8)}.scroll-down{display:block;position:absolute;z-index:100;bottom:45px;left:50%;margin-left:-16px;width:34px;height:34px;font-size:34px;text-align:center;color:rgba(255,255,255,.7);-webkit-animation:bounce 4s 2s infinite;animation:bounce 4s 2s infinite}.scroll-down:hover{color:#fff;-webkit-animation:none;animation:none}.menu-button{position:fixed;box-sizing:border-box;display:inline-block;float:right;height:38px;padding:0 15px;opacity:1;font-size:12px;text-transform:uppercase;line-height:46px;border-radius:3px;transition:all .5s ease;right:20px;top:40px;font-family:'Open Sans',"Microsoft Yahei",Helvetica;z-index:30;overflow:hidden;background-color:#111;border:1px solid #111;color:#fff;cursor:pointer}.pagination,.post-meta,.read-next-story .post:before,.site-footer{font-family:"Open Sans","Microsoft Yahei",Helvetica}.menu-button:hover{background:#fff}.menu-button:focus{outline:0}.nav-closed .menu-button:hover{color:#222}.nav-opened .menu-button{padding:0 12px;background:#111;border-color:#111;color:#fff;-webkit-transform:translate3D(50px,0,0);-ms-transform:translate3D(50px,0,0);transform:translate3D(50px,0,0);transition:all .3s ease;right:287px;z-index:10;width:46px;border-radius:3px 0 0 3px}.menu-button .word{float:right;margin:-4px 0 0 10px}.nav{position:fixed;top:0;right:0;bottom:0;z-index:5;width:220px;padding:10px 10px 0;opacity:0;background:#111;margin-bottom:0;text-align:left;overflow-y:auto;color:#FFF;-webkit-transition:-webkit-transform .5s ease,opacity .3s ease .7s;transition:transform .5s ease,opacity .3s ease .7s;overflow-x:hidden}.nav ul{margin:0;padding:0 0 5%;counter-reset:item}.nav li{height:30px;line-height:1.4rem}.nav li:before{display:block;float:right;padding-right:4%;padding-left:5px;text-align:right;font-size:1.2rem;vertical-align:bottom;color:#B8B8B8;content:counter(item,lower-roman);counter-increment:item;line-height:2.5rem}.nav a{color:#989898;line-height:1.4;font-size:1.4rem}.nav a.current,.nav a:hover{color:#FFF}.nav li a{display:block;padding:.6rem 4%;overflow:hidden;white-space:nowrap}.nav li a:after{display:inline-block;content:" .......................................................";color:rgba(255,255,255,.2);margin-left:5px}.nav .count{position:absolute;bottom:10px;font-size:1rem;width:100%;word-wrap:normal;word-break:break-all;white-space:nowrap}.nav .b3-solo-list li.current a{color:#fff}.nav .page-icon{float:left;height:14px;width:14px;margin:3px 4px 0 0}body.nav-closed .nav{-webkit-transform:translate3D(97px,0,0);-ms-transform:translate3D(97px,0,0);transform:translate3D(97px,0,0)}body.nav-opened .nav{opacity:1;-webkit-transition:-webkit-transform .3s ease,opacity 0s ease 0s;transition:transform .3s ease,opacity 0s ease 0s;-webkit-transform:translate3D(0,0,0);-ms-transform:translate3D(0,0,0);transform:translate3D(0,0,0)}article.post{position:relative;margin:4rem auto;padding-bottom:4rem;border-bottom:#EBF2F6 1px solid;word-wrap:break-word;width:80%}article.post:after{display:block;content:"";width:7px;height:7px;border:1px solid #E7EEF2;position:absolute;bottom:-5px;left:50%;margin-left:-5px;background:#FFF;border-radius:100%;box-shadow:#FFF 0 0 0 5px}.post-meta time,.post-tip{display:inline-block;white-space:nowrap;text-transform:uppercase}.post-tip{font-size:1.3rem;color:#9EABB3}.post-excerpt p{margin:0;font-size:.9em;line-height:1.7em}.post-meta{color:#9eabb3;font-size:1.5rem;line-height:2.2rem;margin:1.75rem 0 0}.post-meta a{color:#9EABB3}.post-meta a:hover{text-decoration:underline}#tags li a,.dynamic a,.icon-gotop,.pagination a,.read-next-story,.site-footer a{text-decoration:none}.post-meta time{border-left:1px solid #d5dbde;font-size:1.3rem;margin-left:8px;padding-left:12px}.post-author{box-sizing:border-box;display:block;position:absolute;bottom:-57px;left:50%;margin-left:-40px;width:80px;height:80px;border-radius:100%;overflow:hidden;padding:6px;background:#fff;z-index:2;box-shadow:#E7EEF2 0 0 0 1px}.post-author a{background-size:cover;background-position:center center;width:68px;height:68px;display:block;border-radius:35px}.share .icon{cursor:pointer;transition:all .2s ease-out 0s;display:inline-block;font-size:16px;margin-top:15px}.share .icon:hover{transform:rotate(360deg);color:#9EABB3}.icon-weibo:before{content:"\e605"}.icon-twitter:before{content:"\e60b"}.icon-tencent:before{content:"\e60d"}.icon-google:before{content:"\e603"}.icon-gotop:before{content:"\E60A";font-weight:700}.icon-gotop{cursor:pointer;position:fixed;bottom:30px;right:30px;-webkit-animation:upbounce 4s 2s infinite;animation:upbounce 4s 2s infinite;z-index:10}.icon-gotop:hover{color:#B8B8B8;-webkit-animation:none;animation:none}.pagination{font-size:1.3rem;color:#9eabb3;text-align:center}.pagination a{color:#9EABB3;transition:all .2s ease;padding:0 15px;border:1px solid #bfc8cd;display:inline-block;border-radius:4px}.pagination a:hover{border-color:#98a0a4;color:#889093}ul.comments{padding:0;margin-top:100px;position:relative}.comments li{padding:10px;white-space:normal;word-wrap:break-word;position:relative;border-bottom:#EBF2F6 1px solid}.comments li:hover{background-color:#F7F7F7}.comments li img{vertical-align:sub}.comments .comment-content{margin:8px 0 0}.comments li.comment-body-ref{position:absolute;z-index:10;background-color:#EBF2F6;border:1px solid #d5dbde;width:86%;left:69px}.comments .post-meta{margin-top:0}#captcha,#captchaReply{height:27px;display:inline-block;vertical-align:inherit}.read-next{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:stretch;-webkit-align-items:stretch;-ms-flex-align:stretch;align-items:stretch;margin-top:10rem}.read-next-story{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;min-width:50%;position:relative;text-align:center;color:#fff;background:center center no-repeat #222;background-size:cover;overflow:hidden}.read-next-story a{color:#BBB}.read-next-story a:hover{color:#FFF}.read-next-story:hover:before{background:rgba(0,0,0,.8);transition:all .2s ease}.read-next-story:hover .post:before{color:#222;background:#fff;transition:all .2s ease}.read-next-story:before{content:"";display:block;position:absolute;top:0;right:0;bottom:0;left:0;background:rgba(0,0,0,.7);transition:all .5s ease}.read-next-story .post{padding-top:6rem;padding-bottom:6rem;width:80%;position:relative;margin:0 auto}.read-next-story .post:before{content:"Read This Next";padding:4px 10px 5px;text-transform:uppercase;font-size:1.1rem;color:rgba(255,255,255,.8);border:1px solid rgba(255,255,255,.5);border-radius:4px;transition:all .5s ease}.read-next-story.prev .post:before{content:"Read This Before"}.read-next-story h2{margin-top:1rem;color:#fff}.read-next-story p{margin:0;color:rgba(255,255,255,.8)}.read-next+.site-footer{position:absolute;bottom:0;left:0;right:0;margin:0}#tags{padding:0}#tags li{float:left}#tags li a{border:1px solid #4A4A4A;display:inline-block;padding:10px;margin:1rem;border-radius:5px}#tags li a:hover{border:1px solid #FFF;color:#FFF;background-color:#4A4A4A}.dynamic .read-next-story>div{position:relative;width:60%;margin:50px auto;text-align:left}.dynamic a{margin:0;color:rgba(255,255,255,.8)}.dynamic a:hover{color:rgba(255,255,255,.5)}.site-footer{position:relative;margin:8rem 0 0;padding:1rem 15px;font-size:1rem;line-height:1.75em;color:#BBC7CC}.site-footer a{color:#BBC7CC;font-weight:700}.site-footer a:hover{text-decoration:underline}@media only screen and (max-width:900px){blockquote{margin-left:0}.main-header{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;min-height:240px;height:60vh;padding:15% 0}.scroll-down{display:none}.page-title,.page-title a{font-size:4rem;letter-spacing:-1px}.page-description,.page-description a{font-size:1.8rem;line-height:1.5em}.post{font-size:.95em}hr{margin:2.4em 0}ol,ul{padding-left:2em}h1{font-size:4.5rem;text-indent:-2px}h2{font-size:3.6rem}h3{font-size:3.1rem}h4{font-size:2.5rem}h5{font-size:2.2rem}h6{font-size:1.8rem}.read-next{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;margin-top:4rem}}@media only screen and (max-width:500px){.main-header{margin-bottom:15px;height:40vh}.pagination{width:auto;margin:2rem auto}.post{width:auto;padding-bottom:2rem;line-height:1.65em;margin:2rem 16px}hr{margin:1.75em 0}dl,ol,p,ul{font-size:.95em;margin:0 0 2.5rem}.page-title,.page-title a{font-size:3rem}.post-excerpt p{font-size:.85em}.page-description,.page-description a{font-size:1.6rem}h1,h2,h3,h4,h5,h6{margin:0 0 .3em}h1{font-size:2.8rem;letter-spacing:-1px}h2{font-size:2.4rem;letter-spacing:0}h3{font-size:2.1rem}h4{font-size:1.9rem}h5,h6{font-size:1.8rem}.post-content img{padding:0;width:calc(100% + 32px);min-width:0;max-width:112%}.post-meta{font-size:1.3rem;margin-top:1rem}.site-footer{margin-top:3rem}.read-next{margin-top:2rem;margin-bottom:-37px}.read-next .post{width:100%}.menu-button{border:0;top:0;right:0}.nav-closed .menu-button:hover{color:#FFF;background-color:transparent}.post-author{width:40px;height:40px;bottom:-37px;padding:3px;margin-left:-20px}.post-author a{width:34px;height:34px;display:block;border-radius:17px}.nav .count{line-height:1.5rem}#tags li a{padding:0 5px}} \ No newline at end of file diff --git a/Finding/css/base.css b/Finding/css/base.css new file mode 100644 index 0000000..2574941 --- /dev/null +++ b/Finding/css/base.css @@ -0,0 +1,18 @@ +/** + * Solo - A small and beautiful blogging system written in Java. + * Copyright (c) 2010-2019, b3log.org & hacpai.com + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +.content-reset{word-wrap:break-word;overflow:auto;line-height:1.65;font-size:16px;word-break:break-word}.content-reset ul,.content-reset ol{padding-left:2em;margin-top:0;margin-bottom:16px}.content-reset li{margin-top:0.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{padding-bottom:0.3em;font-size:1.7em;border-bottom:1px solid #eee}.content-reset h2{padding-bottom:0.3em;font-size:1.5em;border-bottom:1px solid #eee}.content-reset h3{font-size:1.25em}.content-reset h4{font-size:1em}.content-reset h5{font-size:0.875em}.content-reset h6{font-size:0.85em}.content-reset hr{height:0.15em;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:0.25em solid #ddd;margin-bottom:16px}.content-reset blockquote p{margin:0}.content-reset ins>iframe{border:0}.content-reset iframe{border:1px solid rgba(0,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:bold;text-align:center !important;background:rgba(158,188,226,0.2)}.content-reset tbody tr:nth-child(2n){background:rgba(158,188,226,0.12)}.content-reset tr:hover{background:#efefef}.content-reset code{padding:0.2em 0.4em;margin:0;font-size:85%;background-color:rgba(252,41,41,0.12);border-radius:3px;word-break:break-word}.content-reset pre{position:relative}.content-reset pre textarea{position:absolute;top:-100000px}.content-reset pre>code{padding:0.5em;background-color:rgba(0,0,0,0.04);background-size:20px 20px;border-radius:5px;display:block}.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:solid 1px rgba(0,0,0,0.38);border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.content-reset__task,.content-reset .task-list-item{list-style:none;margin-left:-1em}.img-preview{width:100%;height:100%;top:0;z-index:211;overflow:auto;cursor:zoom-out;transition:background-color .2s ease-in-out}.img-preview img{max-width:inherit;transition:transform .3s ease-in-out}html{height:100%;max-height:100%;font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{height:100%;max-height:100%;font-family:"Merriweather", "Microsoft Yahei", 'Helvetica';letter-spacing:0.01rem;font-size:1.8rem;line-height:1.75em;color:#3A4145;-webkit-font-feature-settings:'kern' 1;-moz-font-feature-settings:'kern' 1;-o-font-feature-settings:'kern' 1;text-rendering:geometricPrecision;margin:0}::-moz-selection{background:#D6EDFF}::selection{background:#D6EDFF}a{color:#4A4A4A;transition:color 0.3s ease}a:hover{color:#111}h1,h2,h3,h4,h5,h6{-webkit-font-feature-settings:'dlig' 1, 'liga' 1, 'lnum' 1, 'kern' 1;-moz-font-feature-settings:'dlig' 1, 'liga' 1, 'lnum' 1, 'kern' 1;-o-font-feature-settings:'dlig' 1, 'liga' 1, 'lnum' 1, 'kern' 1;color:#2E2E2E;line-height:1.15em;font-family:"Open Sans", "Microsoft Yahei", 'Helvetica';text-rendering:geometricPrecision}h1{font-size:5rem;letter-spacing:-2px;text-indent:-3px}h2{font-size:3.6rem;letter-spacing:-1px}h3{font-size:3rem}h4{font-size:2.5rem}h5{font-size:2rem}h6{font-size:2rem}img{max-width:100%;height:auto}p,ul,ol,dl{-webkit-font-feature-settings:'liga' 1, 'onum' 1, 'kern' 1;-moz-font-feature-settings:'liga' 1, 'onum' 1, 'kern' 1;-o-font-feature-settings:'liga' 1, 'onum' 1, 'kern' 1;margin:0 0 1.75em 0;text-rendering:geometricPrecision}ol,ul{padding-left:3rem}ol ol,ul ul,ul ol,ol ul{padding-left:2em;margin-bottom:0}dl dt{float:left;width:180px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap;font-weight:700;margin-bottom:1em}dl dd{margin-left:200px;margin-bottom:1em}li li{margin:0}hr{display:block;height:1px;border:0;border-top:#EFEFEF 1px solid;margin:3.2em 0;padding:0}blockquote{-moz-box-sizing:border-box;box-sizing:border-box;margin:1.75em 0 1.75em 0;padding:0 0 0 1.75em;border-left:#4A4A4A 0.4em solid}blockquote p{margin:0.8em 0;font-style:italic}blockquote small{display:inline-block;margin:0.8em 0 0.8em 1.5em;font-size:0.9em;color:#CCC}blockquote small:before{content:"\2014 \00A0"}blockquote cite{font-weight:700}blockquote cite a{font-weight:normal}mark{background-color:#fdffb6}code,tt{padding:1px 3px;font-family:Inconsolata, monospace, "Microsoft Yahei", 'Helvetica';font-size:0.85em;white-space:pre-wrap;border:#E3EDF3 1px solid;background:#F7FAFB;border-radius:2px}pre{-moz-box-sizing:border-box;box-sizing:border-box;margin:0 0 1.75em 0;border:#E3EDF3 1px solid;width:100%;padding:10px;font-family:Inconsolata, monospace, "Microsoft Yahei", 'Helvetica';font-size:0.9em;white-space:pre;overflow:auto;background:#F7FAFB;border-radius:3px}pre code,pre tt{font-size:inherit;white-space:pre-wrap;background:transparent;border:none;padding:0}.fn-clear:before,.fn-clear:after{display:table;content:""}.fn-clear:after{clear:both}.fn-left{float:left}.fn-right{float:right}.fn-none{display:none}.fn-vertical{display:table-cell;vertical-align:middle}.fn-wrap{width:80%;max-width:768px;margin:0 auto}@-webkit-keyframes fade-in-down{0%{opacity:0;-webkit-transform:translateY(-10px);transform:translateY(-10px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes fade-in-down{0%{opacity:0;-webkit-transform:translateY(-10px);transform:translateY(-10px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@-webkit-keyframes bounce{0%,10%,25%,40%,50%{-webkit-transform:translateY(0);transform:translateY(0)}20%{-webkit-transform:translateY(-10px);transform:translateY(-10px)}30%{-webkit-transform:translateY(-5px);transform:translateY(-5px)}}@keyframes bounce{0%,20%,50%,80%,100%{-webkit-transform:translateY(0);transform:translateY(0)}40%{-webkit-transform:translateY(-10px);transform:translateY(-10px)}60%{-webkit-transform:translateY(-5px);transform:translateY(-5px)}}@-webkit-keyframes upbounce{0%,10%,25%,40%,50%{-webkit-transform:translateY(0);transform:translateY(0)}20%{-webkit-transform:translateY(-10px);transform:translateY(-10px)}30%{-webkit-transform:translateY(-5px);transform:translateY(-5px)}}@keyframes upbounce{0%,20%,50%,80%,100%{-webkit-transform:translateY(0);transform:translateY(0)}40%{-webkit-transform:translateY(-10px);transform:translateY(-10px)}60%{-webkit-transform:translateY(-5px);transform:translateY(-5px)}}@font-face{font-family:"icomoon";src:url("fonts/icomoon.eot?v=1");src:url("fonts/icomoon.eot?v=1#iefix") format("embedded-opentype"),url("fonts/icomoon.woff?v=1") format("woff"),url("fonts/icomoon.ttf?v=1") format("truetype"),url("fonts/icomoon.svg?v=1#icons") format("svg");font-weight:normal;font-style:normal}[class^="icon-"]:before,[class*=" icon-"]:before{font-size:2rem;font-family:"icomoon", "Open Sans", "Microsoft Yahei", 'Helvetica';speak:none;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none;line-height:1;text-decoration:none !important;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon-sitemap:before{content:"\e900"}.icon-list:before{content:"\e901"}.icon-arrow-left:before{content:"\f605";font-size:3.5rem}.icon-menu:before{content:"\f609"}.main-header .icon-menu:before{vertical-align:-4px}.icon-login:before{content:"\e611"}.icon-logout:before{content:"\e601"}.icon-setting:before{content:"\e602"}.icon-register:before{content:"\e600"}.avatar{border-radius:100%;float:left;height:24px;margin-right:9px;width:24px}.avatar-warp{width:10%;padding-right:10px;box-sizing:border-box}.avatar-48{box-shadow:0 0 2px #ddd;height:auto;width:48px;margin-right:10px;border-radius:24px}.form{width:100%;margin-top:50px}.form input,.form textarea,.form button{border:1px solid #CCCCCC;background-color:#FAFAFA;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,0.075) inset;padding:7px 8px;width:100%;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;font-family:"Microsoft Yahei", 'Helvetica';outline:none}.form button{width:auto;vertical-align:bottom}.form input:focus,.form textarea:focus{background-color:#FFF;box-shadow:0 1px 2px rgba(0,0,0,0.075) inset,0 0 5px rgba(81,167,232,0.5);border:1px solid #51A7E8}.error-msg{font-size:1.5rem;color:#9EABB3}.cmtFromSym{font-size:1rem;color:#9EABB3}.main-header{position:relative;display:table;width:100%;height:100vh;margin-bottom:5rem;text-align:center;background:#222 no-repeat center center;background-size:cover;overflow:hidden;background-image:url("../images/header-bg.jpg");min-height:50vh}.site-wrapper{position:relative;z-index:10;min-height:100%;background:#fff;-webkit-transition:-webkit-transform 0.5s ease;transition:transform 0.5s ease}.nav-opened .site-wrapper{overflow-x:hidden;margin-right:240px;transition:margin 0.3s ease}.page-title a{-webkit-animation:fade-in-down 0.6s;animation:fade-in-down 0.6s;-webkit-animation-delay:0.2s;animation-delay:0.2s;margin:10px 0 10px 0;font-size:5rem;letter-spacing:-1px;font-weight:700;font-family:"Open Sans", "Microsoft Yahei", 'Helvetica';color:#fff;text-shadow:0px 0px 3px rgba(0,0,0,0.9);text-decoration:none}.page-description,.page-description a{-webkit-animation:fade-in-down 0.9s;animation:fade-in-down 0.9s;-webkit-animation-delay:0.1s;animation-delay:0.1s;margin:0;font-size:2rem;line-height:1.5em;font-weight:400;letter-spacing:0.01rem;color:rgba(255,255,255,0.8)}.scroll-down{display:block;position:absolute;z-index:100;bottom:45px;left:50%;margin-left:-16px;width:34px;height:34px;font-size:34px;text-align:center;text-decoration:none;color:rgba(255,255,255,0.7);-webkit-animation:bounce 4s 2s infinite;animation:bounce 4s 2s infinite}.scroll-down:hover{color:#fff;-webkit-animation:none;animation:none}.menu-button{position:fixed;box-sizing:border-box;display:inline-block;float:right;height:38px;padding:0 15px;opacity:1;font-size:12px;text-transform:uppercase;line-height:46px;border-radius:3px;transition:all 0.5s ease;right:20px;top:40px;text-decoration:none;font-family:'Open Sans', "Microsoft Yahei", 'Helvetica';z-index:30;overflow:hidden;background-color:#111;border:1px solid #111;color:#fff;cursor:pointer}.menu-button:hover{background:#fff}.menu-button:focus{outline:0}.nav-closed .menu-button:hover{color:#222}.nav-opened .menu-button{padding:0 12px;background:#111;border-color:#111;color:#fff;-webkit-transform:translate3D(50px, 0, 0);-ms-transform:translate3D(50px, 0, 0);transform:translate3D(50px, 0, 0);transition:all 0.3s ease;right:287px;z-index:10;width:46px;border-radius:3px 0 0 3px}.menu-button .word{float:right;margin:-4px 0 0 10px}.nav{position:fixed;top:0;right:0;bottom:0;z-index:5;width:220px;padding:10px 10px 0 10px;opacity:0;background:#111;margin-bottom:0;text-align:left;overflow-y:auto;color:#FFF;-webkit-transition:-webkit-transform 0.5s ease, opacity 0.3s ease 0.7s;transition:transform 0.5s ease, opacity 0.3s ease 0.7s;overflow-x:hidden}.nav ul{margin:0;padding:0px 0 5%;list-style:none;counter-reset:item}.nav li{height:30px;line-height:1.4rem}.nav li:before{display:block;float:right;padding-right:4%;padding-left:5px;text-align:right;font-size:1.2rem;vertical-align:bottom;color:#B8B8B8;content:counter(item, lower-roman);counter-increment:item;line-height:2.5rem}.nav a{color:#989898;text-decoration:none;line-height:1.4;font-size:1.4rem}.nav a:hover,.nav a.current{color:#FFF}.nav li a{display:block;padding:0.6rem 4%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.nav li a:after{display:inline-block;content:" .......................................................";color:rgba(255,255,255,0.2);margin-left:5px}.nav .count{position:absolute;bottom:10px;font-size:1rem;width:100%;word-wrap:normal;word-break:break-all;white-space:nowrap}.nav .b3-solo-list li.current a{color:#fff}.nav .page-icon{float:left;height:14px;width:14px;margin:3px 4px 0 0}body.nav-closed .nav{-webkit-transform:translate3D(97px, 0, 0);-ms-transform:translate3D(97px, 0, 0);transform:translate3D(97px, 0, 0)}body.nav-opened .nav{opacity:1;-webkit-transition:-webkit-transform 0.3s ease, opacity 0s ease 0s;transition:transform 0.3s ease, opacity 0s ease 0s;-webkit-transform:translate3D(0, 0, 0);-ms-transform:translate3D(0, 0, 0);transform:translate3D(0, 0, 0)}article.post{position:relative;margin:4rem auto;padding-bottom:4rem;border-bottom:#EBF2F6 1px solid;word-wrap:break-word;width:80%}article.post:after{display:block;content:"";width:7px;height:7px;border:#E7EEF2 1px solid;position:absolute;bottom:-5px;left:50%;margin-left:-5px;background:#FFF;border-radius:100%;box-shadow:#FFF 0 0 0 5px}.post-title a{text-decoration:none}.post-tip{display:inline-block;text-transform:uppercase;font-size:1.3rem;white-space:nowrap;color:#9EABB3}.post-excerpt p{margin:0;font-size:0.9em;line-height:1.7em}.post-meta{color:#9eabb3;font-family:"Open Sans", "Microsoft Yahei", 'Helvetica';font-size:1.5rem;line-height:2.2rem;margin:1.75rem 0 0 0}.post-meta a{color:#9EABB3;text-decoration:none}.post-meta a:hover{text-decoration:underline}.post-meta time{border-left:1px solid #d5dbde;display:inline-block;font-size:1.3rem;margin-left:8px;padding-left:12px;text-transform:uppercase;white-space:nowrap}.post-author{box-sizing:border-box;display:block;position:absolute;bottom:-57px;left:50%;margin-left:-40px;width:80px;height:80px;border-radius:100%;overflow:hidden;padding:6px;background:#fff;z-index:2;box-shadow:#E7EEF2 0 0 0 1px}.post-author a{background-size:cover;background-position:center center;width:68px;height:68px;display:block;border-radius:35px}.share .icon{cursor:pointer;transition:all 0.2s ease-out 0s;display:inline-block;font-size:16px;margin-top:15px}.share .icon:hover{transform:rotate(360deg);color:#9EABB3}.icon-weibo:before{content:"\e605"}.icon-twitter:before{content:"\e60b"}.icon-tencent:before{content:"\e60d"}.icon-google:before{content:"\e603"}.icon-gotop:before{content:"\E60A";font-weight:bold}.icon-gotop{cursor:pointer;position:fixed;bottom:30px;right:30px;-webkit-animation:upbounce 4s 2s infinite;animation:upbounce 4s 2s infinite;text-decoration:none;z-index:10}.icon-gotop:hover{color:#B8B8B8;-webkit-animation:none;animation:none}.pagination{font-family:"Open Sans", "Microsoft Yahei", 'Helvetica';font-size:1.3rem;color:#9eabb3;text-align:center}.pagination a{color:#9EABB3;transition:all 0.2s ease;padding:0 15px;border:#bfc8cd 1px solid;text-decoration:none;display:inline-block;border-radius:4px}.pagination a:hover{border-color:#98a0a4;color:#889093}ul.comments{padding:0;list-style:none;margin-top:100px;position:relative}.comments li{padding:10px;white-space:normal;word-wrap:break-word;position:relative;border-bottom:#EBF2F6 1px solid}.comments li:hover{background-color:#F7F7F7}.comments li img{vertical-align:sub}.comments .comment-content{margin:8px 0 0}.comments li.comment-body-ref{position:absolute;z-index:10;background-color:#EBF2F6;border:#d5dbde 1px solid;width:86%;left:69px}.comments .post-meta{margin-top:0}#captcha,#captchaReply{height:27px;display:inline-block;vertical-align:inherit}.read-next{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:stretch;-webkit-align-items:stretch;-ms-flex-align:stretch;align-items:stretch;margin-top:10rem}.read-next-story{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;min-width:50%;text-decoration:none;position:relative;text-align:center;color:#fff;background:#222 no-repeat center center;background-size:cover;overflow:hidden}.read-next-story a{color:#BBB}.read-next-story a:hover{color:#FFF}.read-next-story:hover:before{background:rgba(0,0,0,0.8);transition:all 0.2s ease}.read-next-story:hover .post:before{color:#222;background:#fff;transition:all 0.2s ease}.read-next-story:before{content:"";display:block;position:absolute;top:0;right:0;bottom:0;left:0;background:rgba(0,0,0,0.7);transition:all 0.5s ease}.read-next-story .post{padding-top:6rem;padding-bottom:6rem;width:80%;position:relative;margin:0 auto}.read-next-story .post:before{content:"Read This Next";padding:4px 10px 5px;text-transform:uppercase;font-size:1.1rem;font-family:"Open Sans", "Microsoft Yahei", 'Helvetica';color:rgba(255,255,255,0.8);border:1px solid rgba(255,255,255,0.5);border-radius:4px;transition:all 0.5s ease}.read-next-story.prev .post:before{content:"Read This Before"}.read-next-story h2{margin-top:1rem;color:#fff}.read-next-story p{margin:0;color:rgba(255,255,255,0.8)}.read-next+.site-footer{position:absolute;bottom:0;left:0;right:0;margin:0}#tags{padding:0}#tags li{list-style:none;float:left}#tags li a{border:1px solid #4A4A4A;display:inline-block;padding:10px;margin:1rem;border-radius:5px;text-decoration:none}#tags li a:hover{border:1px solid #FFF;color:#FFF;background-color:#4A4A4A}.dynamic .read-next-story>div{position:relative;width:60%;margin:50px auto;text-align:left}.dynamic a{text-decoration:none;margin:0;color:rgba(255,255,255,0.8)}.dynamic a:hover{color:rgba(255,255,255,0.5)}.site-footer{position:relative;margin:8rem 0 0 0;padding:1rem 15px;font-family:"Open Sans", "Microsoft Yahei", 'Helvetica';font-size:1rem;line-height:1.75em;color:#BBC7CC}.site-footer a{color:#BBC7CC;font-weight:bold;text-decoration:none}.site-footer a:hover{text-decoration:underline}@media only screen and (max-width: 900px){blockquote{margin-left:0}.main-header{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;height:auto;min-height:240px;height:60vh;padding:15% 0}.scroll-down{display:none}.page-title,.page-title a{font-size:4rem;letter-spacing:-1px}.page-description,.page-description a{font-size:1.8rem;line-height:1.5em}.post{font-size:0.95em}hr{margin:2.4em 0}ol,ul{padding-left:2em}h1{font-size:4.5rem;text-indent:-2px}h2{font-size:3.6rem}h3{font-size:3.1rem}h4{font-size:2.5rem}h5{font-size:2.2rem}h6{font-size:1.8rem}.read-next{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;margin-top:4rem}}@media only screen and (max-width: 500px){.main-header{margin-bottom:15px;height:40vh}.pagination{width:auto;margin:2rem auto}.post{width:auto;margin-top:2rem;margin-bottom:2rem;margin-left:16px;margin-right:16px;padding-bottom:2rem;line-height:1.65em}hr{margin:1.75em 0}p,ul,ol,dl{font-size:0.95em;margin:0 0 2.5rem 0}.page-title,.page-title a{font-size:3rem}.post-excerpt p{font-size:0.85em}.page-description,.page-description a{font-size:1.6rem}h1,h2,h3,h4,h5,h6{margin:0 0 0.3em 0}h1{font-size:2.8rem;letter-spacing:-1px}h2{font-size:2.4rem;letter-spacing:0}h3{font-size:2.1rem}h4{font-size:1.9rem}h5{font-size:1.8rem}h6{font-size:1.8rem}.post-content img{padding:0;width:calc(100% + 32px);min-width:0;max-width:112%}.post-meta{font-size:1.3rem;margin-top:1rem}.site-footer{margin-top:3rem}.read-next{margin-top:2rem;margin-bottom:-37px}.read-next .post{width:100%}.menu-button{border:0;top:0;right:0}.nav-closed .menu-button:hover{color:#FFF;background-color:transparent}.post-author{width:40px;height:40px;bottom:-37px;padding:3px;margin-left:-20px}.post-author a{width:34px;height:34px;display:block;border-radius:17px}.nav .count{line-height:1.5rem}#tags li a{padding:0 5px}} diff --git a/Finding/css/Finding.css b/Finding/css/base.scss similarity index 85% rename from Finding/css/Finding.css rename to Finding/css/base.scss index 9646c37..98243a2 100644 --- a/Finding/css/Finding.css +++ b/Finding/css/base.scss @@ -21,8 +21,10 @@ * * @author Liyuan Li * @author Liang Ding - * @version 1.3.0.0, Jan 2, 2019 -*/ + * @version 2.0.0.0, Feb 21, 2019 + */ + +@import "../../../scss/reset-content"; /* start reset */ html { height: 100%; @@ -220,161 +222,6 @@ pre code, pre tt { } /* end reset */ -/* start article-body */ -.article-body { - word-wrap: break-word; - overflow: auto; - line-height: 1.65; - font-size: 16px; - word-break: break-word; -} - -.article-body ul, -.article-body ol { - padding-left: 2em; - margin-top: 0; - margin-bottom: 16px; -} - -.article-body li { - margin-top: 0.25em; -} - -.article-body img { - cursor: zoom-in; -} - -.article-body img.emoji { - cursor: auto; - max-width: 18px; -} - -.article-body h1, -.article-body h2, -.article-body h3, -.article-body h4, -.article-body h5, -.article-body h6 { - margin-top: 24px; - margin-bottom: 16px; - font-weight: 600; - line-height: 1.25; -} - -.article-body h1 { - padding-bottom: 0.3em; - font-size: 1.7em; - border-bottom: 1px solid #eee; -} - -.article-body h2 { - padding-bottom: 0.3em; - font-size: 1.5em; - border-bottom: 1px solid #eee; -} - -.article-body h3 { - font-size: 1.25em; -} - -.article-body h4 { - font-size: 1em; -} - -.article-body h5 { - font-size: 0.875em; -} - -.article-body h6 { - font-size: 0.85em; -} - -.article-body hr { - height: 0.15em; - padding: 0; - margin: 24px 0; - background-color: #e7e7e7; - border: 0; -} - -.article-body p { - margin-top: 0; - margin-bottom: 16px; -} - -.article-body blockquote { - padding: 0 1em; - color: #777; - border-left: 0.25em solid #ddd; - margin-bottom: 16px; -} - -.article-body blockquote p { - margin: 0; -} - -.article-body ins > iframe { - border: 0; -} - -.article-body iframe { - border: 1px solid rgba(0, 0, 0, 0.38); -} - -.article-body table { - width: 100%; - border: 1px solid #dedede; - margin: 15px auto; - border-collapse: collapse; - empty-cells: show; -} - -.article-body thead { - text-align: center; -} - -.article-body td, -.article-body th { - height: 35px; - border: 1px solid #dedede; - padding: 0 10px; -} - -.article-body th { - font-weight: bold; - text-align: center !important; - background: rgba(158, 188, 226, 0.2); -} - -.article-body tbody tr:nth-child(2n) { - background: rgba(158, 188, 226, 0.12); -} - -.article-body tr:hover { - background: #efefef; -} - -.article-body 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: solid 1px rgba(0, 0, 0, 0.38); - border-bottom-color: #bbb; - border-radius: 3px; - box-shadow: inset 0 -1px 0 #bbb; -} - -.article-body__task, -.article-body .task-list-item { - list-style: none; - margin-left: -1em; -} -/* end article-body */ - /* start function */ .fn-clear:before, .fn-clear:after { @@ -624,83 +471,6 @@ pre code, pre tt { } /* end common */ -/* start emotions */ -.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 { - 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: 0px -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; -} -/* end emotions */ - /* start framework */ .main-header { position: relative; @@ -727,11 +497,8 @@ pre code, pre tt { .nav-opened .site-wrapper { overflow-x: hidden; - -webkit-transform: translate3D(-240px, 0, 0); - -ms-transform: translate3D(-240px, 0, 0); - transform: translate3D(-240px, 0, 0); - -webkit-transition: -webkit-transform 0.3s ease; - transition: transform 0.3s ease; + margin-right: 240px; + transition: margin 0.3s ease; } /* end framework */ diff --git a/Finding/dynamic.ftl b/Finding/dynamic.ftl index 418d943..a1544a2 100644 --- a/Finding/dynamic.ftl +++ b/Finding/dynamic.ftl @@ -54,7 +54,7 @@ ${viewLabel}ยป
-
+
${comment.commentContent}
diff --git a/Finding/footer.ftl b/Finding/footer.ftl index d60e066..9e43759 100644 --- a/Finding/footer.ftl +++ b/Finding/footer.ftl @@ -40,25 +40,10 @@ var Label = { "markedAvailable": ${markedAvailable?c}, - "skinDirName": "${skinDirName}", - "em00Label": "${em00Label}", - "em01Label": "${em01Label}", - "em02Label": "${em02Label}", - "em03Label": "${em03Label}", - "em04Label": "${em04Label}", - "em05Label": "${em05Label}", - "em06Label": "${em06Label}", - "em07Label": "${em07Label}", - "em08Label": "${em08Label}", - "em09Label": "${em09Label}", - "em10Label": "${em10Label}", - "em11Label": "${em11Label}", - "em12Label": "${em12Label}", - "em13Label": "${em13Label}", - "em14Label": "${em14Label}" + "skinDirName": "${skinDirName}" }; Util.initSW(); - Util.parseMarkdown('post-content'); + Util.parseMarkdown(); Util.killIE(8) ${plugins} diff --git a/Finding/js/Finding.js b/Finding/js/Finding.js index 9789cc2..25af630 100644 --- a/Finding/js/Finding.js +++ b/Finding/js/Finding.js @@ -78,7 +78,7 @@ var Finding = { $('.nav .icon-list').show(); Finding.tabNav('toc') - var $articleTocs = $('.article-body [id^=b3_solo_h]'), + var $articleTocs = $('.content-reset [id^=b3_solo_h]'), $articleToc = $('.b3-solo-list'); $(window).scroll(function (event) { diff --git a/Finding/js/Finding.min.js b/Finding/js/Finding.min.js index efb2f2f..44273aa 100644 --- a/Finding/js/Finding.min.js +++ b/Finding/js/Finding.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 Finding={init:function(){Util.killIE(),this._initToc(),$(".scroll-down").click(function(t){t.preventDefault();var n=$(this),o=$("html, body"),i=!!n.attr("data-offset")&&n.attr("data-offset"),e=parseInt(i);o.stop(!0,!1).animate({scrollTop:$(this.hash).offset().top+e},500)}),$("body").append('Menu'),$(".menu-button").click(function(t){t.stopPropagation(),$("body").toggleClass("nav-opened nav-closed")}),$(window).scroll(function(){$(window).scrollTop()>$(".main-header").height()?$(".icon-gotop").show():$(".icon-gotop").hide()})},_initToc:function(){if(0===$(".b3-solo-list li").length)return $(".nav .icon-list").hide(),void $(".nav .icon-sitemap").click();$(".nav ul:first").after($(".b3-solo-list")),$("body").toggleClass("nav-opened nav-closed"),$(".nav .icon-list").show(),Finding.tabNav("toc");var a=$(".article-body [id^=b3_solo_h]"),l=$(".b3-solo-list");$(window).scroll(function(t){if(0===$(".b3-solo-list li").length)return!1;var n=[];a.each(function(t){n.push({id:this.id,offsetTop:this.offsetTop})});for(var o=$(window).scrollTop(),i=0,e=n.length;i=n[n.length-1].offsetTop+280&&(l.find("li").removeClass("current"),l.find("li:last").addClass("current"))}),$(window).scroll()},tabNav:function(t){$(".nav .current").removeClass("current"),"toc"===t?($(".nav ul:first, .nav .count").hide(),$(".nav ul:last").show(),$(".icon-list").addClass("current")):($(".nav ul:first, .nav .count").show(),$(".nav ul:last").hide(),$(".icon-sitemap").addClass("current"))},share:function(){$(".share span").click(function(){var t=$(this).data("type"),n=encodeURIComponent($("title").text()),o=$(".post-title a").attr("href")?$(".post-title a").attr("href"):location,i=$(".post-content img:eq(0)").attr("src"),e={};e.tencent="http://share.v.t.qq.com/index.php?c=share&a=index&title="+n+"&url="+o+"&pic="+i,e.weibo="http://v.t.sina.com.cn/share/share.php?title="+n+"&url="+o+"&pic="+i,e.google="https://plus.google.com/share?url="+o,e.twitter="https://twitter.com/intent/tweet?status="+n+" "+o,window.open(e[t],"_blank","top=100,left=200,width=648,height=618")})}};Finding.init(); \ No newline at end of file +var Finding={init:function(){Util.killIE(),this._initToc(),$(".scroll-down").click(function(t){t.preventDefault();var n=$(this),o=$("html, body"),i=!!n.attr("data-offset")&&n.attr("data-offset"),e=parseInt(i);o.stop(!0,!1).animate({scrollTop:$(this.hash).offset().top+e},500)}),$("body").append('Menu'),$(".menu-button").click(function(t){t.stopPropagation(),$("body").toggleClass("nav-opened nav-closed")}),$(window).scroll(function(){$(window).scrollTop()>$(".main-header").height()?$(".icon-gotop").show():$(".icon-gotop").hide()})},_initToc:function(){if(0===$(".b3-solo-list li").length)return $(".nav .icon-list").hide(),void $(".nav .icon-sitemap").click();$(".nav ul:first").after($(".b3-solo-list")),$("body").toggleClass("nav-opened nav-closed"),$(".nav .icon-list").show(),Finding.tabNav("toc");var a=$(".content-reset [id^=b3_solo_h]"),l=$(".b3-solo-list");$(window).scroll(function(t){if(0===$(".b3-solo-list li").length)return!1;var n=[];a.each(function(t){n.push({id:this.id,offsetTop:this.offsetTop})});for(var o=$(window).scrollTop(),i=0,e=n.length;i=n[n.length-1].offsetTop+280&&(l.find("li").removeClass("current"),l.find("li:last").addClass("current"))}),$(window).scroll()},tabNav:function(t){$(".nav .current").removeClass("current"),"toc"===t?($(".nav ul:first, .nav .count").hide(),$(".nav ul:last").show(),$(".icon-list").addClass("current")):($(".nav ul:first, .nav .count").show(),$(".nav ul:last").hide(),$(".icon-sitemap").addClass("current"))},share:function(){$(".share span").click(function(){var t=$(this).data("type"),n=encodeURIComponent($("title").text()),o=$(".post-title a").attr("href")?$(".post-title a").attr("href"):location,i=$(".post-content img:eq(0)").attr("src"),e={};e.tencent="http://share.v.t.qq.com/index.php?c=share&a=index&title="+n+"&url="+o+"&pic="+i,e.weibo="http://v.t.sina.com.cn/share/share.php?title="+n+"&url="+o+"&pic="+i,e.google="https://plus.google.com/share?url="+o,e.twitter="https://twitter.com/intent/tweet?status="+n+" "+o,window.open(e[t],"_blank","top=100,left=200,width=648,height=618")})}};Finding.init(); \ No newline at end of file diff --git a/Finding/lang/lang_zh_CN.properties b/Finding/lang/lang_zh_CN.properties index a7a421a..08a71e4 100644 --- a/Finding/lang/lang_zh_CN.properties +++ b/Finding/lang/lang_zh_CN.properties @@ -190,7 +190,6 @@ goTopLabel=\u9876\u90E8 permalink1Label=\u94FE\u63A5\uFF1A permalinkLabel=\u94FE\u63A5 b3logLabel=B3LOG -killBrowserLabel=

\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01

\u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002

\u60A8\u53EF\u4EE5\u4E0B\u8F7D readmoreLabel=\u9605\u8BFB\u66F4\u591A\u00BB readmore2Label=\u9605\u8BFB\u66F4\u591A replyLabel=\u56DE\u590D\u00BB diff --git a/Finding/macro-head.ftl b/Finding/macro-head.ftl index 2eb751c..fdb623e 100644 --- a/Finding/macro-head.ftl +++ b/Finding/macro-head.ftl @@ -28,7 +28,7 @@ - + diff --git a/Finding/page.ftl b/Finding/page.ftl index 50f791e..62d941d 100644 --- a/Finding/page.ftl +++ b/Finding/page.ftl @@ -36,7 +36,7 @@ <#include "header.ftl">
-
+
${page.pageContent}
-
+
${article.articleAbstract}
diff --git a/NeoEase/article.ftl b/NeoEase/article.ftl index 31b097f..163b5a7 100644 --- a/NeoEase/article.ftl +++ b/NeoEase/article.ftl @@ -93,7 +93,7 @@
-
+
${article.articleContent} <#if "" != article.articleSign.signHTML?trim>
diff --git a/NeoEase/common-comment.ftl b/NeoEase/common-comment.ftl index 63d50de..e290856 100644 --- a/NeoEase/common-comment.ftl +++ b/NeoEase/common-comment.ftl @@ -41,7 +41,7 @@
-
${comment.commentContent}
+
${comment.commentContent}
\ No newline at end of file diff --git a/NeoEase/css/NeoEase.min.css b/NeoEase/css/NeoEase.min.css deleted file mode 100644 index deb16aa..0000000 --- a/NeoEase/css/NeoEase.min.css +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Solo - A small and beautiful blogging system written in Java. - * Copyright (c) 2010-2019, b3log.org & hacpai.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -a:active,body{color:#333}.nav ul,.side ul{list-style:none}.recent-comments-content,.side .side-li li{text-overflow:ellipsis;-o-text-overflow:ellipsis;overflow:hidden}.article-body,.clear,.main,.side,.side .side-li li{overflow:hidden}.article-body kbd,img{vertical-align:middle}a:link,input,textarea{outline:0}#tagsSide li a,.form th,.side .side-li a{white-space:nowrap}body,div,h1,h2,h3,h4,h5,h6,html,li,ul{margin:0;padding:0}::selection{background-color:#ccc;color:#fff}::-moz-selection{background-color:#ccc;color:#fff}body{font-family:"Lucida Grande",Verdana,"\5fae\8f6f\96c5\9ed1";font-size:12px;background-color:#F9F9F9}a:link{color:#21759B;text-decoration:none}a:visited{color:#555777}a:hover{color:#D54E21}img{max-width:100%;border:0;height:auto;-ms-interpolation-mode:bicubic}.left{float:left}.right{float:right}.clear{background-color:transparent;border:0;clear:both;display:block;font-size:0;height:0;line-height:0}.em-br,.em-span{line-height:24px}.none{display:none}.logo{padding:0 5px;text-shadow:0 0 1px #EEE}.tip{color:#D54E21;font-size:11px}.em00,.em01,.em02,.em03,.em04,.em05,.em06,.em07,.em08,.em09,.em10,.em11,.em12,.em13,.em14{background-image:url(../../../images/emotions/emotions.png);background-size:120px;float:left;height:24px;margin-right:5px;width:24px}.collapse-ico,.date-ico,.expand-ico,.tag-ico,.translate-ico,.user-ico{background-repeat:no-repeat;height:16px}.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}.em-span{float:left}#search,.collapse-ico,.date-ico,.expand-ico,.feed-ico,.tag-ico,.translate-ico,.user-ico{background-image:url(../images/icons.png)}.feed-ico{background-position:right -146px;background-repeat:no-repeat;color:#333;padding-right:24px}.translate-ico{background-position:1px -125px;border:1px solid #999;border-radius:3px;cursor:pointer;float:right;margin:6px 0 0 18px;padding:1px;width:16px}.translate-ico:hover{border-color:#D54E21;box-shadow:0 0 1px #999;background-color:#F2F2F2}.collapse-ico,.expand-ico{background-position:54px -84px;cursor:pointer}.collapse-ico{background-position:54px -69px}.date-ico,.tag-ico,.user-ico{display:block;padding-left:20px}.tag-ico{margin:6px 6px 0 0}.date-ico{float:left;background-position:0 -16px}.user-ico{background-position:0 -32px;float:left;margin-left:12px}.wrapper{margin:0 auto;width:960px}.body{border-top:2px solid #DDD}.main{float:left;margin:16px 0 50px;width:667px}.header{background:url(../images/icons.png) 0 -220px repeat-x #F2F2F2;padding:20px 0}.header .title{border-bottom:1px solid #242424;color:#000;font-size:26px;font-weight:400}.header .sub-title{color:#242424;font-size:11px}#search,.nav a{font-size:14px}.nav .page-icon{float:left;height:14px;width:14px;margin:8px 3px 0 0}#search{background-position:7px -99px;background-repeat:no-repeat;background-color:#FFF;border:1px solid #DDD;border-radius:2px;box-shadow:0 1px 1px rgba(0,0,0,.1) inset;color:#888;float:right;height:20px;line-height:145%;padding:3px 10px 3px 28px;width:24px;-moz-transition:width .4s ease,background .4s ease;-webkit-transition:width .4s ease,background .4s ease;transition:width .4s ease,background .4s ease}.nav a,.nav li,.nav ul{float:left}#search:focus{background-color:#F9F9F9;width:196px}.nav{background-color:#E9E9E9;border-bottom:1px solid #CCC}.nav a{color:#666;display:block;height:30px;line-height:30px;padding:0 15px;text-shadow:0 1px 0 #EEE}#goTop,.footer{font-size:11px}.nav a:hover{color:#D54E21;background-color:#DDD}.nav .current{background-color:#DDD;margin:-1px 0;padding-right:2px}.nav .current a{background-color:#F9F9F9;border-color:#CCC #CCC #F9F9F9;border-style:solid;border-width:1px 1px 3px;font-weight:700;height:33px;line-height:33px;margin:-2px 0 -3px;color:#333;text-shadow:1px 1px 1px #C6D9E9}.nav img{margin-left:3px}.nav .right{line-height:29px}.footer{background-color:#E9E9E9;border-top:3px solid #DDD;color:#999;padding:12px 0}.footer a{color:#787878}.footer a:hover{color:#D54E21}#goTop{background:url(../images/icons.png) 5px -51px no-repeat #DDD;border-radius:2px 2px 0 0;cursor:pointer;height:21px;line-height:21px;padding:0 10px 0 23px;position:absolute;right:56px;display:none}#goTop:hover{background-color:#EAEAEA}.side{float:right;width:278px;margin-bottom:50px}.side>div{border-bottom:1px solid #DEDEDE;padding:10px 5px 15px}.side h4{font-size:14px;line-height:32px}#archiveSide{list-style:square;margin-left:18px}#archiveSide .archive-year{color:#D54E21;font-weight:700;height:18px;line-height:18px;list-style:none}.side a{line-height:18px;color:#21759B}.side a:hover{text-decoration:underline}.article-element a,.pagination a,.recent-comments-content a:hover{text-decoration:none}.side sup{color:#333}.side .side-li li{width:268px}.recent-comments li>img{background-color:#FFF;border:1px solid #999;padding:1px;width:32px;height:32px;margin-top:1px}.recent-comments-main{float:left;margin:0 0 9px 3px;width:229px}.recent-comments-main .collapse-ico,.recent-comments-main .expand-ico{background-position:0 -86px;float:right;width:16px;-moz-transition:opacity .4s ease;-webkit-transition:opacity .4s ease;transition:opacity .4s ease;opacity:0;filter:alpha(opacity=0)}.recent-comments li:hover .collapse-ico,.recent-comments li:hover .expand-ico{opacity:1;filter:alpha(opacity=100)}.recent-comments-main .collapse-ico{background-position:0 -70px}.recent-comments-content{height:18px}.recent-comments-content img{width:16px}.recent-comments-content a{color:#555777}.recent-comments-content p{margin:0}.article{border-bottom:1px solid #CCC;padding:0 5px 10px;margin-top:20px}.article-element{font-size:11px;line-height:16px;margin:12px 0}.article-element a{border-bottom:1px solid #DFDFDF;color:#555;padding-bottom:1px}.article-element a:hover{color:#D54E21;border-bottom-color:#D54E21}.article-title{color:#21759B;font-size:20px;font-weight:400}.article-title:hover{color:#D54E21}.article .collapse-ico,.article .expand-ico{float:right;margin-top:9px;padding-right:6px;width:15px;background-position:0 -86px}.article .collapse-ico{background-position:0 -70px}.article-body{word-break:break-word;line-height:145%;word-wrap:break-word}.article-body a{border-bottom:1px solid #DFDFDF}.article-body a:hover{color:#D54E21;border-bottom:1px solid #D54E21}.article-body p{line-height:18px}.article-body ol,.article-body ul{margin-top:0;margin-bottom:16px;margin-left:40px}.article-body li{margin-top:.25em}.article-body img{cursor:zoom-in}.article-body img.emoji{cursor:auto;max-width:18px}.article-body h1,.article-body h2,.article-body h3,.article-body h4,.article-body h5,.article-body h6{margin-top:24px;margin-bottom:16px;font-weight:600;line-height:1.25}.article-body h1{font-size:2em;margin:.67em 0}.article-body h2{font-size:1.5em;margin:.75em 0}.article-body h3{font-size:1.17em;margin:.83em 0}.article-body h4{font-size:.83em;margin:1.5em 0}.article-body h6{font-size:.75em;margin:1.67em 0}.article-body hr{height:.15em;padding:0;margin:24px 0;background-color:#e7e7e7;border:0}.article-body p{margin-top:0;margin-bottom:16px}.article-body blockquote{padding:0 1em;color:#777;border-left:.25em solid #ddd;margin-bottom:16px}.article-body blockquote p{margin:0}.article-body ins>iframe{border:0}.article-body iframe{border:1px solid rgba(0,0,0,.38)}.article-body table{width:100%;border:1px solid #dedede;margin:15px auto;border-collapse:collapse;empty-cells:show}.article-body thead{text-align:center}.article-body td,.article-body th{height:35px;border:1px solid #dedede;padding:0 10px}.article-body th{font-weight:700;text-align:center!important;background:rgba(158,188,226,.2)}.article-body tbody tr:nth-child(2n){background:rgba(158,188,226,.12)}.article-body tr:hover{background:#efefef}.article-body code{padding:.2em .4em;margin:0;font-size:85%;background-color:rgba(252,41,41,.12);border-radius:3px;word-break:break-word}.article-body pre{position:relative}.article-body pre textarea{position:absolute;top:-100000px}.article-body pre>code{padding:.5em;background-color:rgba(0,0,0,.04);background-size:20px 20px;border-radius:5px;display:block}.article-body kbd{display:inline-block;padding:3px 5px;font:11px Consolas,"Liberation Mono",Menlo,Courier,monospace;line-height:10px;color:#555;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}.article-body .task-list-item,.article-body__task{list-style:none;margin-left:-1em}.pagination{margin-top:30px;line-height:21px}.pagination a{border:1px solid #C5C3C2;font-size:10px;margin:2px;padding:1px 5px;background-color:#F2F2F2}.pagination a.current{background-color:#FFF;font-weight:700;padding:2px 6px;color:#000}.pagination a:hover{background-color:#F3DEDD;color:#D54E21;border:1px solid #D54E21}#comments>div,.share{border-bottom:1px solid #DEDEDE}.page{margin-top:20px;padding:0 5px 5px}.article-panel1{background-color:#F2F2F2;padding:5px 10px}.article-panel2{background-color:#FFF;margin-top:12px;padding:5px 10px}.article-panel2 ul{line-height:18px;list-style:square;margin-left:18px}.share{margin-top:15px}.share-comment{background-color:#DDD;border-radius:2px 2px 0 0;float:right;font-size:11px;height:21px;line-height:21px;margin-right:16px;padding:0 10px}.share-comment:hover{background-color:#EAEAEA}#comments{position:relative}#comments>div{padding:10px;width:647px;background-color:#F5F5F5}#comments>div:nth-child(2n){background-color:#F8F8F8}#comments .comment-panel>.right{-moz-transition:opacity .4s ease;-webkit-transition:opacity .4s ease;transition:opacity .4s ease;opacity:0;filter:alpha(opacity=0)}#comments>div:hover .comment-panel>.right{opacity:1;filter:alpha(opacity=100)}.comment-header{height:50px;width:50px;float:left;background-color:#FFF;border:1px solid #DEDEDE;padding:1px}.comment-panel{float:left;margin:0 10px;width:573px;line-height:16px}.comment-panel .article-body{margin-top:5px}#comments .comment-body-ref{border-bottom:0;background-color:#FFF;border-radius:5px;left:73px;position:absolute;box-shadow:1px 0 3px #DEDEDE;width:560px}.comment-body-ref .comment-panel{width:486px}.comment-body-ref .arrow{border-color:#F5F5F5 #FFF #F5F5F5 #F5F5F5;border-style:solid;border-width:6px 8px 10px 0;display:block;left:-8px;position:absolute;top:5px}.form{margin:10px}.form img{cursor:pointer}.form h4{margin:10px 0 5px 5px}.form th{text-align:right}.form input[type=text],.form input[type=password],.form textarea{border-color:silver #D9D9D9 #D9D9D9;border-style:solid;border-width:1px;font-family:"Lucida Grande",Verdana,'ๅพฎ่ฝฏ้›…้ป‘';font-size:12px;outline:0;padding:0 3px}.form input:focus,.form textarea:focus{box-shadow:0 1px 2px rgba(0,0,0,.3) inset}.form textarea{overflow:auto;resize:vertical;padding:3px;width:634px}.form input{height:24px;line-height:16px;width:260px}.form button{background-color:#B4D666;border-color:#B4D666 #81B840 #81B840 #B4D666;border-style:solid;border-width:1px;color:#2970A6;height:28px;line-height:28px;padding:0 12px}.form button:hover{background-color:#98C64C;border-color:#76B33A #98C64C #98C64C #76B33A;color:#074A7E}#tags li{float:left;list-style:none;height:38px}#tags a:hover{text-shadow:0 0 2px}#tags a{border-radius:3px;box-shadow:1px 1px 3px #333;float:left;margin:3px 6px;padding:3px 12px}#tagsSide li a{float:left;line-height:145%;margin-right:7px}.tags1{font-size:12px;color:#A1A1A1}.tags2{font-size:14px;color:#687F95}.tags3{font-size:16px;color:#4C6E90}.tags4{font-size:18px;color:#258}.tags5{font-size:20px}#tagsSide .tags2{font-size:14px}#tagsSide .tags3{font-size:16px}#tagsSide .tags4{font-size:18px}#tagsSide .tags5{font-size:20px}.main>h2{margin-top:16px}.error{background-image:url(../images/404.png);float:left;height:536px;margin:50px 80px;position:relative;width:363px}.error h2{left:-68px;position:absolute;top:-20px}.error a{background-color:#9CD941;border:265px;bottom:12px;color:#333555;float:left;padding:10px 15px;position:absolute;right:-106px}.error a:hover{background-color:#ADEb51} \ No newline at end of file diff --git a/NeoEase/css/base.css b/NeoEase/css/base.css new file mode 100644 index 0000000..9d4098a --- /dev/null +++ b/NeoEase/css/base.css @@ -0,0 +1,18 @@ +/** + * Solo - A small and beautiful blogging system written in Java. + * Copyright (c) 2010-2019, b3log.org & hacpai.com + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +๏ปฟ.content-reset{word-wrap:break-word;overflow:auto;line-height:1.65;font-size:16px;word-break:break-word}.content-reset ul,.content-reset ol{padding-left:2em;margin-top:0;margin-bottom:16px}.content-reset li{margin-top:0.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{padding-bottom:0.3em;font-size:1.7em;border-bottom:1px solid #eee}.content-reset h2{padding-bottom:0.3em;font-size:1.5em;border-bottom:1px solid #eee}.content-reset h3{font-size:1.25em}.content-reset h4{font-size:1em}.content-reset h5{font-size:0.875em}.content-reset h6{font-size:0.85em}.content-reset hr{height:0.15em;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:0.25em solid #ddd;margin-bottom:16px}.content-reset blockquote p{margin:0}.content-reset ins>iframe{border:0}.content-reset iframe{border:1px solid rgba(0,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:bold;text-align:center !important;background:rgba(158,188,226,0.2)}.content-reset tbody tr:nth-child(2n){background:rgba(158,188,226,0.12)}.content-reset tr:hover{background:#efefef}.content-reset code{padding:0.2em 0.4em;margin:0;font-size:85%;background-color:rgba(252,41,41,0.12);border-radius:3px;word-break:break-word}.content-reset pre{position:relative}.content-reset pre textarea{position:absolute;top:-100000px}.content-reset pre>code{padding:0.5em;background-color:rgba(0,0,0,0.04);background-size:20px 20px;border-radius:5px;display:block}.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:solid 1px rgba(0,0,0,0.38);border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.content-reset__task,.content-reset .task-list-item{list-style:none;margin-left:-1em}.img-preview{width:100%;height:100%;top:0;z-index:211;overflow:auto;cursor:zoom-out;transition:background-color .2s ease-in-out}.img-preview img{max-width:inherit;transition:transform .3s ease-in-out}html,body,div,ul,li,h1,h2,h3,h4,h5,h6{margin:0;padding:0}::selection{background-color:#ccc;color:#fff}::-moz-selection{background-color:#ccc;color:#fff}body{font-family:"Lucida Grande","Verdana","\5fae\8f6f\96c5\9ed1";font-size:12px;background-color:#F9F9F9;color:#333}a:link{outline:none;color:#21759B;text-decoration:none}a:visited{color:#555777}a:hover{color:#D54E21}a:active{color:#333}img{max-width:100%;vertical-align:middle;border:0;height:auto;-ms-interpolation-mode:bicubic}textarea,input{outline:none}.left{float:left}.right{float:right}.clear{background-color:transparent;border:0;clear:both;display:block;font-size:0;height:0;line-height:0;overflow:hidden}.none{display:none}.logo{padding:0 5px;text-shadow:0 0 1px #EEE}.tip{color:#D54E21;font-size:11px}.em-span{line-height:24px;float:left}.em-br{line-height:24px}.date-ico,.tag-ico,.user-ico,.expand-ico,.collapse-ico,#search,.translate-ico,.feed-ico{background-image:url("../../NeoEase/images/icons.png")}.feed-ico{background-position:right -146px;background-repeat:no-repeat;color:#333;padding-right:24px}.translate-ico{background-position:1px -125px;background-repeat:no-repeat;border:1px solid #999;border-radius:3px 3px 3px 3px;cursor:pointer;float:right;height:16px;margin:6px 0 0 18px;padding:1px;width:16px}.translate-ico:hover{border-color:#D54E21;box-shadow:0 0 1px #999;background-color:#F2F2F2}.expand-ico,.collapse-ico{background-position:54px -84px;cursor:pointer;height:16px;background-repeat:no-repeat}.collapse-ico{background-position:54px -69px}.date-ico,.tag-ico,.user-ico{background-repeat:no-repeat;height:16px;display:block;padding-left:20px}.tag-ico{margin:6px 6px 0 0}.date-ico{float:left;background-position:0 -16px}.user-ico{background-position:0 -32px;float:left;margin-left:12px}.wrapper{margin:0 auto;width:960px}.body{border-top:2px solid #DDD}.main{float:left;margin:16px 0 50px;overflow:hidden;width:667px}.header{background:url("../../NeoEase/images/icons.png") repeat-x scroll 0 -220px #F2F2F2;padding:20px 0}.header .title{border-bottom:1px solid #242424;color:#000;font-size:26px;font-weight:normal}.header .sub-title{color:#242424;font-size:11px}.nav .page-icon{float:left;height:14px;width:14px;margin:8px 3px 0 0}#search{background-position:7px -99px;background-repeat:no-repeat;background-color:#FFF;border:1px solid #DDD;border-radius:2px 2px 2px 2px;box-shadow:0 1px 1px rgba(0,0,0,0.1) inset;color:#888;float:right;font-size:14px;height:20px;line-height:145%;padding:3px 10px 3px 28px;width:24px;-moz-transition:width 0.4s ease, background 0.4s ease;-webkit-transition:width 0.4s ease, background 0.4s ease;transition:width 0.4s ease, background 0.4s ease}#search:focus{background-color:#F9F9F9;width:196px}.nav{background-color:#E9E9E9;border-bottom:1px solid #CCCCCC}.nav ul{list-style:none;float:left}.nav li{float:left}.nav a{color:#666666;display:block;float:left;font-size:14px;height:30px;line-height:30px;padding:0 15px;text-shadow:0 1px 0 #EEE}.nav a:hover{color:#D54E21;background-color:#DDD}.nav .current{background-color:#DDD;margin:-1px 0;padding-right:2px}.nav .current a{background-color:#F9F9F9;border-color:#CCCCCC #CCCCCC #F9F9F9;border-style:solid;border-width:1px 1px 3px;font-weight:700;height:33px;line-height:33px;margin:-2px 0 -3px;color:#333;text-shadow:1px 1px 1px #C6D9E9}.nav img{margin-left:3px}.nav .right{line-height:29px}.footer{background-color:#E9E9E9;border-top:3px solid #DDD;color:#999;font-size:11px;padding:12px 0}.footer a{color:#787878}.footer a:hover{color:#D54E21}#goTop{background:url("../../NeoEase/images/icons.png") no-repeat scroll 5px -51px #DDD;border-radius:2px 2px 0 0;cursor:pointer;font-size:11px;height:21px;line-height:21px;padding:0 10px 0 23px;position:absolute;right:56px;display:none}#goTop:hover{background-color:#EAEAEA}.side{float:right;overflow:hidden;width:278px;margin-bottom:50px}.side>div{border-bottom:1px solid #DEDEDE;padding:10px 5px 15px}.side h4{font-size:14px;line-height:32px}.side ul{list-style:none}#archiveSide{list-style:square outside none;margin-left:18px}#archiveSide .archive-year{color:#D54E21;font-weight:bold;height:18px;line-height:18px;list-style:none}.side a{line-height:18px;color:#21759B}.side a:hover{text-decoration:underline}.side sup{color:#333}.side .side-li li{overflow:hidden;text-overflow:ellipsis;-o-text-overflow:ellipsis;width:268px}.side .side-li a{white-space:nowrap}.recent-comments li>img{background-color:#FFF;border:1px solid #999;padding:1px;width:32px;height:32px;margin-top:1px}.recent-comments-main{float:left;margin:0 0 9px 3px;width:229px}.recent-comments-main .expand-ico,.recent-comments-main .collapse-ico{background-position:0 -86px;float:right;width:16px;-moz-transition:opacity 400ms ease;-webkit-transition:opacity 400ms ease;transition:opacity 400ms ease;opacity:0;filter:alpha(opacity=0)}.recent-comments li:hover .expand-ico,.recent-comments li:hover .collapse-ico{opacity:1;filter:alpha(opacity=100)}.recent-comments-main .collapse-ico{background-position:0 -70px}.recent-comments-content{height:18px;overflow:hidden;text-overflow:ellipsis;-o-text-overflow:ellipsis}.recent-comments-content img{width:16px}.recent-comments-content a{color:#555777}.recent-comments-content a:hover{text-decoration:none}.recent-comments-content p{margin:0}.article{border-bottom:1px solid #CCC;padding:0 5px 10px;margin-top:20px}.article-element{font-size:11px;line-height:16px;margin:12px 0}.article-element a{border-bottom:1px solid #DFDFDF;color:#555;text-decoration:none;padding-bottom:1px}.article-element a:hover{color:#D54E21;border-bottom-color:#D54E21}.article-title{color:#21759B;font-size:20px;font-weight:normal}.article-title:hover{color:#D54E21}.article .expand-ico,.article .collapse-ico{float:right;margin-top:9px;padding-right:6px;width:15px;background-position:0 -86px}.article .collapse-ico{background-position:0 -70px}.pagination{margin-top:30px;line-height:21px}.pagination a{border:1px solid #C5C3C2;font-size:10px;margin:2px;padding:1px 5px;text-decoration:none;background-color:#F2F2F2}.pagination a.current{background-color:#FFF;font-weight:bold;padding:2px 6px;color:#000}.pagination a:hover{background-color:#F3DEDD;color:#D54E21;border:1px solid #D54E21}.page{margin-top:20px;padding:0 5px 5px}.article-panel1{background-color:#F2F2F2;padding:5px 10px}.article-panel2{background-color:#FFF;margin-top:12px;padding:5px 10px}.article-panel2 ul{line-height:18px;list-style:square outside none;margin-left:18px}.share{border-bottom:1px solid #DEDEDE;margin-top:15px}.share-comment{background-color:#DDD;border-radius:2px 2px 0 0;float:right;font-size:11px;height:21px;line-height:21px;margin-right:16px;padding:0 10px}.share-comment:hover{background-color:#EAEAEA}#comments{position:relative}#comments>div{border-bottom:1px solid #DEDEDE;padding:10px;width:647px;background-color:#F5F5F5}#comments>div:nth-child(2n){background-color:#F8F8F8}#comments .comment-panel>.right{-moz-transition:opacity 400ms ease;-webkit-transition:opacity 400ms ease;transition:opacity 400ms ease;opacity:0;filter:alpha(opacity=0)}#comments>div:hover .comment-panel>.right{opacity:1;filter:alpha(opacity=100)}.comment-header{height:50px;width:50px;float:left;background-color:#FFF;border:1px solid #DEDEDE;padding:1px}.comment-panel{float:left;margin:0 10px;width:573px;line-height:16px}.comment-panel .content-reset{margin-top:5px}#comments .comment-body-ref{border-bottom:0;background-color:#FFF;border-radius:5px 5px 5px 5px;left:73px;position:absolute;box-shadow:1px 0 3px #DEDEDE;width:560px}.comment-body-ref .comment-panel{width:486px}.comment-body-ref .arrow{border-color:#F5F5F5 #FFF #F5F5F5 #F5F5F5;border-style:solid;border-width:6px 8px 10px 0;display:block;left:-8px;position:absolute;top:5px}.form{margin:10px}.form img{cursor:pointer}.form h4{margin:10px 0 5px 5px}.form th{text-align:right;white-space:nowrap}.form input[type="text"],.form input[type="password"],.form textarea{border-color:silver #D9D9D9 #D9D9D9;border-style:solid;border-width:1px;font-family:"Lucida Grande",Verdana,'ๅพฎ่ฝฏ้›…้ป‘';font-size:12px;outline:medium none;padding:0 3px}.form input:focus,.form textarea:focus{box-shadow:0 1px 2px rgba(0,0,0,0.3) inset}.form textarea{overflow:auto;resize:vertical;padding:3px;width:634px}.form input{height:24px;line-height:16px;width:260px}.form button{background-color:#B4D666;border-color:#B4D666 #81B840 #81B840 #B4D666;border-style:solid;border-width:1px;color:#2970A6;height:28px;line-height:28px;padding:0 12px}.form button:hover{background-color:#98C64C;border-color:#76B33A #98C64C #98C64C #76B33A;color:#074A7E}#tags li{float:left;list-style:none;height:38px}#tags a:hover{text-shadow:0 0 2px}#tags a{border-radius:3px 3px 3px 3px;box-shadow:1px 1px 3px #333;float:left;margin:3px 6px;padding:3px 12px}#tagsSide li a{float:left;line-height:145%;margin-right:7px;white-space:nowrap}.tags1{font-size:12px;color:#A1A1A1}.tags2{font-size:14px;color:#687F95}.tags3{font-size:16px;color:#4C6E90}.tags4{font-size:18px;color:#258}.tags5{font-size:20px}#tagsSide .tags2{font-size:14px}#tagsSide .tags3{font-size:16px}#tagsSide .tags4{font-size:18px}#tagsSide .tags5{font-size:20px}.main>h2{margin-top:16px}.error{background-image:url("../../NeoEase/images/404.png");float:left;height:536px;margin:50px 80px;position:relative;width:363px}.error h2{left:-68px;position:absolute;top:-20px}.error a{background-color:#9CD941;border:265px none;bottom:12px;color:#333555;float:left;padding:10px 15px;position:absolute;right:-106px}.error a:hover{background-color:#ADEb51} diff --git a/NeoEase/css/NeoEase.css b/NeoEase/css/base.scss similarity index 76% rename from NeoEase/css/NeoEase.css rename to NeoEase/css/base.scss index 047221f..f3a84a2 100644 --- a/NeoEase/css/NeoEase.css +++ b/NeoEase/css/base.scss @@ -19,8 +19,10 @@ * skin neoease style * * @author Liyuan Li - * @version 1.2.1.0, Jan 4, 2019 -*/ + * @version 2.0.0.0, Feb 21, 2019 + */ + +@import "../../../scss/reset-content"; /* start base */ html, body, div, ul, li, h1, h2, h3, h4, h5, h6 { margin: 0; @@ -107,58 +109,6 @@ textarea, input { font-size: 11px; } -.em00, .em01, .em02, .em03, .em04, .em05, .em06, .em07, .em08, .em09, -.em10, .em11, .em12, .em13, .em14 { - background-image: url("../../../images/emotions/emotions.png"); - background-size: 120px; - float: left; - height: 24px; - margin-right: 5px; - width: 24px; -} - -.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; -} .em-span { line-height: 24px; float: left; @@ -560,201 +510,6 @@ textarea, input { background-position: 0 -70px; } -/* start article-body */ -.article-body { - word-break: break-word; - line-height: 145%; - overflow: hidden; - word-wrap: break-word; -} - -.article-body a { - border-bottom: 1px solid #DFDFDF; -} - -.article-body a:hover { - color: #D54E21; - border-bottom: 1px solid #D54E21; -} - -.article-body p { - line-height: 18px; -} - -.article-body ul, -.article-body ol { - margin-top: 0; - margin-bottom: 16px; - margin-left: 40px; -} - -.article-body li { - margin-top: 0.25em; -} - -.article-body img { - cursor: zoom-in; -} - -.article-body img.emoji { - cursor: auto; - max-width: 18px; -} - -.article-body h1, -.article-body h2, -.article-body h3, -.article-body h4, -.article-body h5, -.article-body h6 { - margin-top: 24px; - margin-bottom: 16px; - font-weight: 600; - line-height: 1.25; -} - - -.article-body h1 { - font-size: 2em; - margin: .67em 0; -} - -.article-body h2 { - font-size: 1.5em; - margin: .75em 0; -} - -.article-body h3 { - font-size: 1.17em; - margin: .83em 0; -} - -.article-body h4 { - margin: 1.12em 0; -} - -.article-body h4 { - font-size: .83em; - margin: 1.5em 0; -} - -.article-body h6 { - font-size: .75em; - margin: 1.67em 0; -} - -.article-body hr { - height: 0.15em; - padding: 0; - margin: 24px 0; - background-color: #e7e7e7; - border: 0; -} - -.article-body p { - margin-top: 0; - margin-bottom: 16px; -} - -.article-body blockquote { - padding: 0 1em; - color: #777; - border-left: 0.25em solid #ddd; - margin-bottom: 16px; -} - -.article-body blockquote p { - margin: 0; -} - -.article-body ins > iframe { - border: 0; -} - -.article-body iframe { - border: 1px solid rgba(0, 0, 0, 0.38); -} - -.article-body table { - width: 100%; - border: 1px solid #dedede; - margin: 15px auto; - border-collapse: collapse; - empty-cells: show; -} - -.article-body thead { - text-align: center; -} - -.article-body td, -.article-body th { - height: 35px; - border: 1px solid #dedede; - padding: 0 10px; -} - -.article-body th { - font-weight: bold; - text-align: center !important; - background: rgba(158, 188, 226, 0.2); -} - -.article-body tbody tr:nth-child(2n) { - background: rgba(158, 188, 226, 0.12); -} - -.article-body tr:hover { - background: #efefef; -} - -.article-body code { - padding: 0.2em 0.4em; - margin: 0; - font-size: 85%; - background-color: rgba(252, 41, 41, 0.12); - border-radius: 3px; - word-break: break-word; -} - -.article-body pre { - position: relative; -} - -.article-body pre textarea { - position: absolute; - top: -100000px; -} - -.article-body pre > code { - padding: 0.5em; - background-color: rgba(0, 0, 0, 0.04); - background-size: 20px 20px; - border-radius: 5px; - display: block; -} - -.article-body 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: solid 1px rgba(0, 0, 0, 0.38); - border-bottom-color: #bbb; - border-radius: 3px; - box-shadow: inset 0 -1px 0 #bbb; -} - -.article-body__task, -.article-body .task-list-item { - list-style: none; - margin-left: -1em; -} -/* end article-body */ - .pagination { margin-top: 30px; line-height: 21px; @@ -870,7 +625,7 @@ textarea, input { line-height: 16px; } -.comment-panel .article-body { +.comment-panel .content-reset { margin-top: 5px; } diff --git a/NeoEase/footer.ftl b/NeoEase/footer.ftl index b5a7a37..66c4345 100644 --- a/NeoEase/footer.ftl +++ b/NeoEase/footer.ftl @@ -40,22 +40,7 @@ "markedAvailable": ${markedAvailable?c}, "adminLabel": "${adminLabel}", "logoutLabel": "${logoutLabel}", - "skinDirName": "${skinDirName}", - "em00Label": "${em00Label}", - "em01Label": "${em01Label}", - "em02Label": "${em02Label}", - "em03Label": "${em03Label}", - "em04Label": "${em04Label}", - "em05Label": "${em05Label}", - "em06Label": "${em06Label}", - "em07Label": "${em07Label}", - "em08Label": "${em08Label}", - "em09Label": "${em09Label}", - "em10Label": "${em10Label}", - "em11Label": "${em11Label}", - "em12Label": "${em12Label}", - "em13Label": "${em13Label}", - "em14Label": "${em14Label}" + "skinDirName": "${skinDirName}" }; diff --git a/NeoEase/lang/lang_zh_CN.properties b/NeoEase/lang/lang_zh_CN.properties index 8ddafbf..d324996 100644 --- a/NeoEase/lang/lang_zh_CN.properties +++ b/NeoEase/lang/lang_zh_CN.properties @@ -76,4 +76,3 @@ randomArticlesLabel=\u968F\u673A\u9605\u8BFB externalRelevantArticlesLabel=\u7AD9\u5916\u76F8\u5173\u9605\u8BFB captchaErrorLabel=\u9A8C\u8BC1\u7801\u9519\u8BEF b3logLabel=B3LOG -killBrowserLabel=

\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01

\u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002

\u60A8\u53EF\u4EE5\u4E0B\u8F7D diff --git a/NeoEase/macro-head.ftl b/NeoEase/macro-head.ftl index 1591276..410c898 100644 --- a/NeoEase/macro-head.ftl +++ b/NeoEase/macro-head.ftl @@ -27,7 +27,7 @@ - + diff --git a/NeoEase/page.ftl b/NeoEase/page.ftl index 052b226..3972396 100644 --- a/NeoEase/page.ftl +++ b/NeoEase/page.ftl @@ -34,7 +34,7 @@
-
+
${page.pageContent}
<@comments commentList=pageComments article=page> diff --git a/classic/article-list.ftl b/classic/article-list.ftl index b15bb72..2fcfb74 100644 --- a/classic/article-list.ftl +++ b/classic/article-list.ftl @@ -59,7 +59,7 @@
-
+
${article.articleAbstract}
diff --git a/classic/article.ftl b/classic/article.ftl index 9201d0e..9a46ef9 100644 --- a/classic/article.ftl +++ b/classic/article.ftl @@ -97,7 +97,7 @@
-
+
${article.articleContent} <#if "" != article.articleSign.signHTML?trim>
diff --git a/classic/common-comment.ftl b/classic/common-comment.ftl index 7332121..bad6c9f 100644 --- a/classic/common-comment.ftl +++ b/classic/common-comment.ftl @@ -45,7 +45,7 @@
${comment.commentName}
-
+
${comment.commentContent}
diff --git a/classic/css/base.css b/classic/css/base.css new file mode 100644 index 0000000..f610077 --- /dev/null +++ b/classic/css/base.css @@ -0,0 +1,18 @@ +/** + * Solo - A small and beautiful blogging system written in Java. + * Copyright (c) 2010-2019, b3log.org & hacpai.com + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +.content-reset{word-wrap:break-word;overflow:auto;line-height:1.65;font-size:16px;word-break:break-word}.content-reset ul,.content-reset ol{padding-left:2em;margin-top:0;margin-bottom:16px}.content-reset li{margin-top:0.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{padding-bottom:0.3em;font-size:1.7em;border-bottom:1px solid #eee}.content-reset h2{padding-bottom:0.3em;font-size:1.5em;border-bottom:1px solid #eee}.content-reset h3{font-size:1.25em}.content-reset h4{font-size:1em}.content-reset h5{font-size:0.875em}.content-reset h6{font-size:0.85em}.content-reset hr{height:0.15em;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:0.25em solid #ddd;margin-bottom:16px}.content-reset blockquote p{margin:0}.content-reset ins>iframe{border:0}.content-reset iframe{border:1px solid rgba(0,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:bold;text-align:center !important;background:rgba(158,188,226,0.2)}.content-reset tbody tr:nth-child(2n){background:rgba(158,188,226,0.12)}.content-reset tr:hover{background:#efefef}.content-reset code{padding:0.2em 0.4em;margin:0;font-size:85%;background-color:rgba(252,41,41,0.12);border-radius:3px;word-break:break-word}.content-reset pre{position:relative}.content-reset pre textarea{position:absolute;top:-100000px}.content-reset pre>code{padding:0.5em;background-color:rgba(0,0,0,0.04);background-size:20px 20px;border-radius:5px;display:block}.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:solid 1px rgba(0,0,0,0.38);border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.content-reset__task,.content-reset .task-list-item{list-style:none;margin-left:-1em}.img-preview{width:100%;height:100%;top:0;z-index:211;overflow:auto;cursor:zoom-out;transition:background-color .2s ease-in-out}.img-preview img{max-width:inherit;transition:transform .3s ease-in-out}.left{float:left}.right{float:right}.clear:before,.clear:after{display:table;content:""}.clear:after{clear:both}.none{display:none}a,a:link{color:#0000CC}a:active{color:red}a:visited{color:#551A8B}h5{font-size:12px}.content{margin:0 auto;max-width:1250px;padding:0 12px}.header{height:108px;margin-bottom:10px}.header .page-icon{height:14px;width:14px;margin:-1px 3px 0 0}.sub-title{font-size:14px;font-weight:normal}.side{border-left:2px solid #E5ECF9;padding-left:12px;width:280px}.main{margin-right:-294px;width:100%}.main>div{min-width:280px;padding-right:318px}#logoTitle{font-family:"Microsoft YaHei";font-size:32px;line-height:64px;text-decoration:none}#statistic span{font-size:11px}.article,.comments{padding-bottom:24px}.article-title{background-color:#E3E3FF;border-top:1px solid #3366CC;margin-left:91px;padding:3px 0 6px 12px}.article-title sup{font-size:12px}.article-date{background-color:#E3E3FF;border:1px solid #BBCCFF;float:left;margin:0 12px 12px 0;border-radius:5px;padding:7px 3px;width:70px;text-align:center;word-break:break-all}.article-abstract{word-wrap:break-word}.content-reset{margin-left:12px;line-height:145%}.article-footer{margin-right:12px}.article-footer a,.article-details-footer a{text-decoration:none}.article-details-footer{margin:36px 12px 0 0}.article-relative{line-height:22px;margin-top:24px}.comments{position:relative}.comment-title{background-color:#E3E3FF;border-top:1px solid #3366CC;padding:3px 12px 3px 12px}.comment-body-ref{background-color:#FFFFFF;border:1px solid #E3E3FF;filter:alpha(opacity=90);left:88px;opacity:0.9;position:absolute;top:27px;width:87%;z-index:10}.comment-body-ref .comment-title{border-top:0px}.comment-body{padding:9px 12px 12px;word-wrap:break-word;overflow:hidden}.comment-picture{margin-right:12px}.comment-picture img{height:60px;width:60px}.comment-reply{margin:0 auto 24px auto}.comment-content{float:left;width:88%}#commentURL:focus,#commentURLReply:focus{box-shadow:-3px 1px 2px rgba(0,0,0,0.3) inset}.error-msg{color:#3366CC}.error-footer{bottom:0px;position:fixed;width:82%}#sideNavi a.selected{color:#000000;text-decoration:none}.side-navi ul{list-style:none}#sideNavi li{line-height:22px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;-o-text-overflow:ellipsis}#sideNavi li.aboutMe,#sideNavi li.side-navi-notice{white-space:normal}#sideNavi sup{margin-right:3px;color:green}.side-comment{text-decoration:none}#recentComments p{display:inline}#recentComments div,#recentComments br{display:none}.line{border-top:thin dotted #BBBBBB;margin-top:12px;padding-top:12px}.pagination{margin:16px;text-align:center}.pagination a,.pagination a:visited{color:#4272DB;padding:0 3px;text-decoration:none}.pagination a.selected{color:#000000;font-weight:bold}#tagsPanel .tagPanel{border:2px solid;cursor:pointer;float:left;margin:3px;border-radius:6px}#tagsPanel .tagPanel:hover{background-color:#EEEEEE;border:2px dashed}#tagsPanel .tagPanel{text-decoration:none}.error-title{border-top:1px solid #3366CC;background-color:#E5ECF9;margin-left:12px;padding:6px 12px}.error-panel{margin-left:12px;padding:24px}.commentIcon,.browserIcon{background-image:url("../../../images/icon.png");cursor:pointer;height:16px;margin-right:3px;width:16px}.commentIcon{background-position:-32px -16px}.browserIcon{background-position:-128px -16px}.goTopIcon{background-position:-128px -32px}.goBottomIcon{background-position:-144px -32px}.footer{text-align:center;margin:30px 0 30px 0}.has-toc>ul>li{list-style:none;float:left;width:50%;text-align:center;margin:15px 0;cursor:pointer}.has-toc>ul>li.current{color:#3366CC} diff --git a/classic/css/classic.css b/classic/css/base.scss similarity index 64% rename from classic/css/classic.css rename to classic/css/base.scss index 0afd9f5..6b6ee8a 100644 --- a/classic/css/classic.css +++ b/classic/css/base.scss @@ -21,8 +21,29 @@ * * @author Liyuan Li * @author Liang Ding - * @version 1.4.0.0, Jan 4, 2019 + * @version 2.0.0.0, Feb 21, 2019 */ +@import "../../../scss/reset-content"; +.left { + float: left; +} + +.right { + float: right; +} + +.clear:before, +.clear:after { + display: table; + content: ""; +} + +.clear:after { + clear: both; +} +.none { + display: none; +} a, a:link { color: #0000CC; } @@ -42,6 +63,7 @@ h5 { } .header { height: 108px; + margin-bottom: 10px; } .header .page-icon { @@ -102,7 +124,7 @@ h5 { .article-abstract { word-wrap: break-word; } -.article-body { +.content-reset { margin-left: 12px; line-height: 145%; } @@ -269,151 +291,6 @@ h5 { margin: 30px 0 30px 0; } -.content-reset { - font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif; - word-wrap: break-word; - overflow: auto; - line-height: 1.5; - font-size: 16px; - word-break: break-all -} -.content-reset a { - color: #ff4d3a; -} -.content-reset ul, -.content-reset ol { - padding-left: 2em; - margin-top: 0; - margin-bottom: 16px -} -.content-reset li { - margin-top: 0.25em -} -.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 { - padding-bottom: 0.3em; - font-size: 2em; - border-bottom: 1px solid #eee -} -.content-reset h2 { - padding-bottom: 0.3em; - font-size: 1.5em; - border-bottom: 1px solid #eee -} -.content-reset h3 { - font-size: 1.25em -} -.content-reset h4 { - font-size: 1em -} -.content-reset h5 { - font-size: 0.875em -} -.content-reset h6 { - font-size: 0.85em -} -.content-reset hr { - height: 0.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: 0.25em solid #ddd; - margin-bottom: 16px -} -.content-reset blockquote p { - margin: 0 -} -.content-reset iframe { - border: 1px solid #ccc -} -.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: bold; - text-align: center !important; - background: rgba(158, 188, 226, 0.2) -} -.content-reset tbody tr:nth-child(2n) { - background: rgba(158, 188, 226, 0.12) -} -.content-reset tr:hover { - background: #efefef -} -.content-reset code { - padding: 0.2em 0.4em; - margin: 0; - font-size: 85%; - background-color: rgba(252, 41, 41, 0.12); - border-radius: 3px; - color: #d23f31; - font-family: mononoki, Consolas, "Liberation Mono", Menlo, Courier, monospace -} -.content-reset pre>code { - padding: 0.5em; - color: #333; - background-color: rgba(0, 0, 0, 0.04); - background-image: url(../images/code-bg.png); - background-size: 20px 20px; - border-radius: 5px; - display: block; -} -.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: solid 1px #ccc; - border-bottom-color: #bbb; - border-radius: 3px; - box-shadow: inset 0 -1px 0 #bbb -} - -.content-reset img { - max-width: 100%; - vertical-align: middle; - border: 0; - height: auto; - -ms-interpolation-mode: bicubic; - overflow: hidden; - font-size: 12px; -} - .has-toc > ul > li { list-style: none; float: left; diff --git a/classic/css/classic.min.css b/classic/css/classic.min.css deleted file mode 100644 index 4b88729..0000000 --- a/classic/css/classic.min.css +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Solo - A small and beautiful blogging system written in Java. - * Copyright (c) 2010-2019, b3log.org & hacpai.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -@charset "utf-8";.article-date,.article-title,.comment-title{background-color:#E3E3FF}#logoTitle,#sideNavi a.selected,#tagsPanel .tagPanel,.article-details-footer a,.article-footer a,.side-comment{text-decoration:none}.article-abstract,.comment-body,.content-reset{word-wrap:break-word}.article-date,.content-reset thead,.footer,.pagination{text-align:center}.has-toc>ul>li,.side-navi ul{list-style:none}a,a:link{color:#00C}a:active{color:red}a:visited{color:#551A8B}h5{font-size:12px}.content{margin:0 auto;max-width:1250px;padding:0 12px}.header{height:108px}.header .page-icon{height:14px;width:14px;margin:-1px 3px 0 0}.sub-title{font-size:14px;font-weight:400}.side{border-left:2px solid #E5ECF9;padding-left:12px;width:280px}.main{margin-right:-294px;width:100%}.main>div{min-width:280px;padding-right:318px}#logoTitle{font-family:"Microsoft YaHei";font-size:32px;line-height:64px}#statistic span{font-size:11px}.article,.comments{padding-bottom:24px}.article-title{border-top:1px solid #36C;margin-left:91px;padding:3px 0 6px 12px}.article-title sup{font-size:12px}.article-date{border:1px solid #BCF;float:left;margin:0 12px 12px 0;border-radius:5px;padding:7px 3px;width:70px;word-break:break-all}.article-body{margin-left:12px;line-height:145%}.article-footer{margin-right:12px}.article-details-footer{margin:36px 12px 0 0}.article-relative{line-height:22px;margin-top:24px}.comments{position:relative}.comment-title{border-top:1px solid #36C;padding:3px 12px}.comment-body-ref{background-color:#FFF;border:1px solid #E3E3FF;filter:alpha(opacity=90);left:88px;opacity:.9;position:absolute;top:27px;width:87%;z-index:10}.comment-body-ref .comment-title{border-top:0}.comment-body{padding:9px 12px 12px;overflow:hidden}.comment-picture{margin-right:12px}.comment-picture img{height:60px;width:60px}.comment-reply{margin:0 auto 24px}.comment-content{float:left;width:88%}#commentURL:focus,#commentURLReply:focus{box-shadow:-3px 1px 2px rgba(0,0,0,.3) inset}.error-msg{color:#36C}.error-footer{bottom:0;position:fixed;width:82%}#sideNavi a.selected{color:#000}#sideNavi li{line-height:22px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;-o-text-overflow:ellipsis}#sideNavi li.aboutMe,#sideNavi li.side-navi-notice{white-space:normal}#sideNavi sup{margin-right:3px;color:green}#recentComments p{display:inline}#recentComments br,#recentComments div{display:none}.line{border-top:thin dotted #BBB;margin-top:12px;padding-top:12px}.pagination{margin:16px}.pagination a,.pagination a:visited{color:#4272DB;padding:0 3px;text-decoration:none}.pagination a.selected{color:#000;font-weight:700}#tagsPanel .tagPanel{border:2px solid;cursor:pointer;float:left;margin:3px;border-radius:6px}#tagsPanel .tagPanel:hover{background-color:#EEE;border:2px dashed}.error-title{border-top:1px solid #36C;background-color:#E5ECF9;margin-left:12px;padding:6px 12px}.error-panel{margin-left:12px;padding:24px}.content-reset h1,.content-reset h2{padding-bottom:.3em;border-bottom:1px solid #eee}.browserIcon,.commentIcon{background-image:url(../../../images/icon.png);cursor:pointer;height:16px;margin-right:3px;width:16px}.commentIcon{background-position:-32px -16px}.browserIcon{background-position:-128px -16px}.goTopIcon{background-position:-128px -32px}.goBottomIcon{background-position:-144px -32px}.footer{margin:30px 0}.content-reset{font-family:"Helvetica Neue","Luxi Sans","DejaVu Sans",Tahoma,"Hiragino Sans GB","Microsoft Yahei",sans-serif;overflow:auto;line-height:1.5;font-size:16px;word-break:break-all}.content-reset a{color:#ff4d3a}.content-reset ol,.content-reset ul{padding-left:2em;margin-top:0;margin-bottom:16px}.content-reset li{margin-top:.25em}.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:2em}.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 #ccc}.content-reset table{width:100%;border:1px solid #dedede;margin:15px auto;border-collapse:collapse;empty-cells:show}.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;color:#d23f31;font-family:mononoki,Consolas,"Liberation Mono",Menlo,Courier,monospace}.content-reset pre>code{padding:.5em;color:#333;background-color:rgba(0,0,0,.04);background-image:url(../images/code-bg.png);background-size:20px 20px;border-radius:5px;display:block}.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 #ccc;border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.content-reset img{max-width:100%;vertical-align:middle;border:0;height:auto;-ms-interpolation-mode:bicubic;overflow:hidden;font-size:12px}.has-toc>ul>li{float:left;width:50%;text-align:center;margin:15px 0;cursor:pointer}.has-toc>ul>li.current{color:#36C} \ No newline at end of file diff --git a/classic/footer.ftl b/classic/footer.ftl index c358a28..88f84be 100644 --- a/classic/footer.ftl +++ b/classic/footer.ftl @@ -35,22 +35,7 @@ by Vanessa. var Label = { "markedAvailable": ${markedAvailable?c}, - "skinDirName": "${skinDirName}", - "em00Label": "${em00Label}", - "em01Label": "${em01Label}", - "em02Label": "${em02Label}", - "em03Label": "${em03Label}", - "em04Label": "${em04Label}", - "em05Label": "${em05Label}", - "em06Label": "${em06Label}", - "em07Label": "${em07Label}", - "em08Label": "${em08Label}", - "em09Label": "${em09Label}", - "em10Label": "${em10Label}", - "em11Label": "${em11Label}", - "em12Label": "${em12Label}", - "em13Label": "${em13Label}", - "em14Label": "${em14Label}" + "skinDirName": "${skinDirName}" }; var collapseArchive = function (it, year) { diff --git a/classic/lang/lang_zh_CN.properties b/classic/lang/lang_zh_CN.properties index cba89cd..9991244 100644 --- a/classic/lang/lang_zh_CN.properties +++ b/classic/lang/lang_zh_CN.properties @@ -190,7 +190,6 @@ goTopLabel=\u9876\u90E8 permalink1Label=\u94FE\u63A5\uFF1A permalinkLabel=\u94FE\u63A5 b3logLabel=B3LOG -killBrowserLabel=

\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01

\u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002

\u60A8\u53EF\u4EE5\u4E0B\u8F7D readmoreLabel=\u9605\u8BFB\u66F4\u591A\u00BB readmore2Label=\u9605\u8BFB\u66F4\u591A replyLabel=\u56DE\u590D\u00BB diff --git a/classic/macro-head.ftl b/classic/macro-head.ftl index 50b83dc..410c898 100644 --- a/classic/macro-head.ftl +++ b/classic/macro-head.ftl @@ -27,8 +27,7 @@ - - + diff --git a/classic/page.ftl b/classic/page.ftl index aea5a0f..b552a5b 100644 --- a/classic/page.ftl +++ b/classic/page.ftl @@ -38,7 +38,7 @@
-
+
${page.pageContent}
diff --git a/ease/article-list.ftl b/ease/article-list.ftl index e044fa7..5458ab6 100644 --- a/ease/article-list.ftl +++ b/ease/article-list.ftl @@ -46,7 +46,7 @@
-
+
${article.articleAbstract}
diff --git a/ease/article.ftl b/ease/article.ftl index 27d513b..a346983 100644 --- a/ease/article.ftl +++ b/ease/article.ftl @@ -82,7 +82,7 @@
-
+
${article.articleContent} <#if "" != article.articleSign.signHTML?trim>

diff --git a/ease/common-comment.ftl b/ease/common-comment.ftl index 619e6b1..f68f95b 100644 --- a/ease/common-comment.ftl +++ b/ease/common-comment.ftl @@ -40,7 +40,7 @@

-
${comment.commentContent}
+
${comment.commentContent}
\ No newline at end of file diff --git a/ease/css/base.css b/ease/css/base.css new file mode 100644 index 0000000..243000d --- /dev/null +++ b/ease/css/base.css @@ -0,0 +1,18 @@ +/** + * Solo - A small and beautiful blogging system written in Java. + * Copyright (c) 2010-2019, b3log.org & hacpai.com + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +.content-reset{word-wrap:break-word;overflow:auto;line-height:1.65;font-size:16px;word-break:break-word}.content-reset ul,.content-reset ol{padding-left:2em;margin-top:0;margin-bottom:16px}.content-reset li{margin-top:0.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{padding-bottom:0.3em;font-size:1.7em;border-bottom:1px solid #eee}.content-reset h2{padding-bottom:0.3em;font-size:1.5em;border-bottom:1px solid #eee}.content-reset h3{font-size:1.25em}.content-reset h4{font-size:1em}.content-reset h5{font-size:0.875em}.content-reset h6{font-size:0.85em}.content-reset hr{height:0.15em;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:0.25em solid #ddd;margin-bottom:16px}.content-reset blockquote p{margin:0}.content-reset ins>iframe{border:0}.content-reset iframe{border:1px solid rgba(0,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:bold;text-align:center !important;background:rgba(158,188,226,0.2)}.content-reset tbody tr:nth-child(2n){background:rgba(158,188,226,0.12)}.content-reset tr:hover{background:#efefef}.content-reset code{padding:0.2em 0.4em;margin:0;font-size:85%;background-color:rgba(252,41,41,0.12);border-radius:3px;word-break:break-word}.content-reset pre{position:relative}.content-reset pre textarea{position:absolute;top:-100000px}.content-reset pre>code{padding:0.5em;background-color:rgba(0,0,0,0.04);background-size:20px 20px;border-radius:5px;display:block}.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:solid 1px rgba(0,0,0,0.38);border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.content-reset__task,.content-reset .task-list-item{list-style:none;margin-left:-1em}.img-preview{width:100%;height:100%;top:0;z-index:211;overflow:auto;cursor:zoom-out;transition:background-color .2s ease-in-out}.img-preview img{max-width:inherit;transition:transform .3s ease-in-out}html,body,div,ul,li{margin:0;padding:0}body{font-family:Verdana,arial,'\5fae\8f6f\96c5\9ed1';font-size:12px;background-color:#FCFCFC}::selection{background-color:#D5D5D5;color:#FCFCFC}::-moz-selection{background-color:#D5D5D5;color:#FCFCFC}a{outline:none;color:#009EB8;text-decoration:none}a:visited{color:#00b4d2}a:hover{text-decoration:underline}a:active{color:#00889f}img{vertical-align:middle;border:0;max-width:100%;height:auto;-ms-interpolation-mode:bicubic;overflow:hidden;font-size:12px}textarea,input{outline:none}sup{font-size:10px;font-weight:normal;-webkit-text-size-adjust:none}.left{float:left}.right{float:right}.clear{background-color:transparent;border:0;clear:both;display:block;font-size:0;height:0;line-height:0;overflow:hidden}.none{display:none}.ft-gray{color:#808080}.ft-gray:visited{color:#9a9a9a}.ft-gray:hover{color:#676767;text-decoration:none}.fn-mgtb10{margin:10px 0}.logo{padding:0 5px;text-shadow:0 0 1px #D5D5D5}#search,.translate-ico{background-image:url("/skins/ease/images/icons.png")}.translate-ico{background-position:1px -125px;background-repeat:no-repeat;border:1px solid #D5D5D5;border-radius:3px;cursor:pointer;float:right;height:16px;margin:-3px 0 0 15px;padding:1px;width:16px}.translate-ico:hover{border-color:#9a9a9a;box-shadow:0 0 1px #808080;background-color:#FCFCFC}.wrapper{margin:0 auto;width:990px}.main{background-color:#FFF;padding-bottom:50px}.header{width:100%;z-index:1}.header .title{border-bottom:1px solid #808080;font-size:26px;font-weight:normal}.header .sub-title{font-size:11px}#search{background-position:7px -99px;background-repeat:no-repeat;background-color:#FFF;border:1px solid #D5D5D5;border-radius:2px 2px 2px 2px;box-shadow:0 1px 1px rgba(0,0,0,0.1) inset;color:#808080;float:right;font-size:14px;height:19px;line-height:145%;padding:4px 10px 4px 28px;width:24px;-moz-transition:width 0.4s ease, background 0.4s ease;-webkit-transition:width 0.4s ease, background 0.4s ease;transition:width 0.4s ease, background 0.4s ease}#search:focus{width:150px}.banner{margin-bottom:20px}.banner .notice{float:left;margin:20px 0 0 50px}.nav{background-color:#2C2C2C;box-shadow:0 2px 2px #D5D5D5, 0 3px 3px -3px #D5D5D5 inset;border-top:1px solid #e2e2e2;border-bottom:1px solid #e2e2e2;height:29px;top:0;width:100%;z-index:1}.nav ul{list-style:none;float:left}.nav li{float:left}.nav a{color:#C9C9C9;display:block;float:left;font-size:14px;font-weight:700;line-height:29px;margin-right:20px;padding:0 10px;text-decoration:none;transition:color .4s ease, background-color .8s ease;-webkit-transition:color .4s ease, background-color .8s ease;-moz-transition:color .4s ease, background-color .8s ease}.nav a:hover{color:#FFF;background-color:#535353}.nav a.current{background-color:#FFF;box-shadow:0 -1px 1px rgba(0,0,0,0.1) inset,0 1px 1px rgba(0,0,0,0.1) inset;color:#808080}.nav img{margin-left:3px}.nav .page-icon{float:left;height:14px;width:14px;margin:8px 5px 0 0}.footer{border-top:1px solid #D5D5D5;box-shadow:0 -1px 1px #D5D5D5;font-size:11px;padding:12px 0;-webkit-text-size-adjust:none}#goTop{background:url("/skins/ease/images/icons.png") no-repeat scroll 5px -51px #D5D5D5;border-radius:2px 2px 0 0;box-shadow:0 0 3px #D5D5D5;cursor:pointer;font-size:11px;height:21px;line-height:21px;padding:0 10px 0 23px;position:absolute;right:50px;display:none}#goTop:hover{background-color:#c8c8c8;box-shadow:0 0 3px #c8c8c8}.wrapper>ul{list-style:none}.main>.wrapper>h2{margin:0;padding:14px 0}.article{border-bottom:1px solid #f6f6f6;padding:30px 50px}.article:hover{border-bottom-color:#ddd;box-shadow:0 0 1px #f6f6f6 inset;background-color:#FCFCFC}.content-reset a{color:#808080;text-decoration:underline}.content-reset a:vidited{color:#9a9a9a}.content-reset a:hover{color:#676767}.content-reset>div{min-height:32px}.article-title h2{display:inline}.article-title span{cursor:pointer}.article-last:hover{border-bottom:1px solid #f6f6f6}.article-next{border:1px solid #eee;background-color:#F9F9F9;cursor:pointer;font-size:14px;line-height:36px;text-align:center}.article-next:hover{background-color:#FCFCFC}.article-relative{background-color:#FCFCFC;box-shadow:0 0 2px #D5D5D5;float:left;margin:10px 0;padding:0 20px 10px;width:382px}.article-relative:hover{background-color:#fff;box-shadow:0 0 4px #D5D5D5}.article-relative ul{list-style:none}#relevantArticles{margin-right:40px}#externalRelevantArticles{width:357px;margin-top:0}#comments{padding:20px 50px;position:relative}.comment-header{float:left;background-color:#FFF;border:1px solid #DEDEDE;padding:2px;height:60px;width:60px}.comment-panel{float:left;line-height:16px;margin:0 0 20px 10px;min-height:64px;overflow:hidden;width:814px}.comment-body-ref{background-color:#FCFCFC;box-shadow:0 0 2px #D5D5D5;display:block;left:127px;padding:10px;opacity:0.9;filter:alpha(opacity=90);position:absolute;border:1px solid #e2e2e2}.comment-body-ref>.comment-header{border:0 none;float:right;height:48px;width:48px;padding:0}.comment-body-ref>.comment-panel{margin:0 20px 0 0;min-height:48px;width:725px}.comment-body-ref>.comment-panel>.right{display:none}.form{padding:0 50px 20px}.wrapper>.form{float:left}.form th{text-align:right;white-space:nowrap}.form input[type="text"],.form input[type="password"],.form textarea{background-color:#FCFCFC;border-width:0;box-shadow:0 0 2px #BCBCBC;font-family:Verdana,arial,\5fae\8f6f\96c5\9ed1;font-size:12px;margin:0 5px 10px 0;outline:medium none;padding:0 3px;height:28px;line-height:28px;width:260px}.form input:focus,.form textarea:focus{box-shadow:0 0 4px #D5D5D5}.form textarea{height:120px;overflow:auto;width:426px;line-height:16px}.form button{background-color:#F6F6F6;border:0 none;box-shadow:0 0 2px #D5D5D5;height:28px;line-height:28px;padding:0 12px;color:#808080}.form button:hover{box-shadow:0 0 4px #D5D5D5;text-shadow:0 0 2px}.form img{background-color:#FCFCFC;box-shadow:0 0 2px #D5D5D5;cursor:pointer;height:24px;padding:1px}#tags.other-main{margin:47px 44px 0;width:902px}#tags li{float:left;height:38px}#tags a{margin:3px 6px;padding:3px 12px;background-color:#FCFCFC;box-shadow:0 0 2px #D5D5D5;float:left}#tags a:hover{text-shadow:0 0 2px;text-decoration:none;box-shadow:0 0 4px #D5D5D5}.tags1,.tags1:visited{font-size:12px;color:#a7a7a7}.tags2,.tags2:visited{font-size:14px;color:#808080}.tags3,.tags3:visited{font-size:16px;color:#595959}.tags4,.tags4:visited{font-size:18px;color:#323232}.tags5,.tags5:visited{font-size:20px;color:#0a0a0a}.archives{position:relative}.archives>div{background-color:#FCFCFC;box-shadow:0 0 2px #D5D5D5;padding-bottom:20px;line-height:20px;margin:20px;width:270px;position:absolute;top:0}.archives h3{text-align:center}.archives>div:hover{box-shadow:0 0 4px #D5D5D5}.archives a{display:block;margin-left:77px}.dynamic ul{list-style:none}.dynamic h3{text-align:center}.dynamic .module{background-color:#FCFCFC;box-shadow:0 0 2px #D5D5D5;float:left;line-height:20px;margin:20px;padding:10px 20px 20px;width:380px}.dynamic .module:hover{box-shadow:0 0 4px #D5D5D5}.dynamic .side-comments{width:840px}.dynamic .side-comments .comment-panel{width:760px}.dynamic .side-tags li{float:left;margin:0 5px}.dynamic .side-most-comment,.dynamic .side-most-view{margin-bottom:0}.other-main.links{margin-top:45px}.links li{float:left;line-height:22px;margin:0 20px;width:270px}.other-main{display:inline-block;margin:30px 30px 0;width:930px}#tags a,.archives>div,.dynamic .module,.form input[type="text"],.form input[type="password"],.form textarea,.article-relative{border:1px solid #f2f2f2}#tags a:hover,.archives>div:hover,.dynamic .module:hover,.form input:focus,.form textarea:focus,.article-relative:hover{border:1px solid #e2e2e2} diff --git a/ease/css/ease.css b/ease/css/base.scss similarity index 77% rename from ease/css/ease.css rename to ease/css/base.scss index 81ea2ce..fc08b16 100644 --- a/ease/css/ease.css +++ b/ease/css/base.scss @@ -16,11 +16,13 @@ * along with this program. If not, see . */ /* -* Skin ease style. -* -* @author Liyuan Li -* @version 1.2.1.0, Jan 4, 2019 -*/ + * Skin ease style. + * + * @author Liyuan Li + * @version 2.0.0.0, Feb 21, 2019 + */ + +@import "../../../scss/reset-content"; /* start base */ html, body, div, ul, li { margin: 0; @@ -320,202 +322,20 @@ sup { background-color: #FCFCFC; } -/* start article-body */ -.article-body { - word-break: break-word; - line-height: 145%; - overflow: hidden; - word-wrap: break-word; - margin-bottom: 10px; - font-size: 14px; -} - -.article-body ul, -.article-body ol { - margin-top: 0; - margin-bottom: 16px; - margin-left: 40px; - padding-left: 0; -} - -.article-body li { - margin-top: 0.25em; -} - -.article-body img { - cursor: zoom-in; -} - -.article-body img.emoji { - cursor: auto; - max-width: 18px; -} - -.article-body h1, -.article-body h2, -.article-body h3, -.article-body h4, -.article-body h5, -.article-body h6 { - margin-top: 24px; - margin-bottom: 16px; - font-weight: 600; - line-height: 1.25; -} - -.article-body h1 { - padding-bottom: 0.3em; - font-size: 1.7em; - border-bottom: 1px solid #eee; -} - -.article-body h2 { - padding-bottom: 0.3em; - font-size: 1.5em; - border-bottom: 1px solid #eee; -} - -.article-body h3 { - font-size: 1.25em; -} - -.article-body h4 { - font-size: 1em; -} - -.article-body h5 { - font-size: 0.875em; -} - -.article-body h6 { - font-size: 0.85em; -} - -.article-body hr { - height: 0.15em; - padding: 0; - margin: 24px 0; - background-color: #e7e7e7; - border: 0; -} - -.article-body p { - margin-top: 0; - margin-bottom: 16px; -} - -.article-body blockquote { - padding: 0 1em; - color: #777; - border-left: 0.25em solid #ddd; - margin-bottom: 16px; -} - -.article-body blockquote p { - margin: 0; -} - -.article-body ins > iframe { - border: 0; -} - -.article-body iframe { - border: 1px solid rgba(0, 0, 0, 0.38); -} - -.article-body table { - width: 100%; - border: 1px solid #dedede; - margin: 15px auto; - border-collapse: collapse; - empty-cells: show; -} - -.article-body thead { - text-align: center; -} - -.article-body td, -.article-body th { - height: 35px; - border: 1px solid #dedede; - padding: 0 10px; -} - -.article-body th { - font-weight: bold; - text-align: center !important; - background: rgba(158, 188, 226, 0.2); -} - -.article-body tbody tr:nth-child(2n) { - background: rgba(158, 188, 226, 0.12); -} - -.article-body tr:hover { - background: #efefef; -} - -.article-body code { - padding: 0.2em 0.4em; - margin: 0; - font-size: 85%; - background-color: rgba(252, 41, 41, 0.12); - border-radius: 3px; - word-break: break-word; -} - -.article-body pre { - position: relative; -} - -.article-body pre textarea { - position: absolute; - top: -100000px; -} - -.article-body pre > code { - padding: 0.5em; - background-color: rgba(0, 0, 0, 0.04); - background-size: 20px 20px; - border-radius: 5px; - display: block; -} - -.article-body 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: solid 1px rgba(0, 0, 0, 0.38); - border-bottom-color: #bbb; - border-radius: 3px; - box-shadow: inset 0 -1px 0 #bbb; -} - -.article-body__task, -.article-body .task-list-item { - list-style: none; - margin-left: -1em; -} -/* end article-body */ -.article-body a { +.content-reset a { color: #808080; text-decoration: underline; } -.article-body a:vidited { +.content-reset a:vidited { color: #9a9a9a } -.article-body a:hover { +.content-reset a:hover { color: #676767; } -.article-body>div { +.content-reset>div { min-height: 32px; } diff --git a/ease/css/ease.min.css b/ease/css/ease.min.css deleted file mode 100644 index 3aac86e..0000000 --- a/ease/css/ease.min.css +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Solo - A small and beautiful blogging system written in Java. - * Copyright (c) 2010-2019, b3log.org & hacpai.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -body,img{font-size:12px}.footer,sup{-webkit-text-size-adjust:none}.clear,img{border:0;overflow:hidden}#search,.translate-ico{background-repeat:no-repeat}.article-body kbd,img{vertical-align:middle}.article-body,.clear,.comment-panel,img{overflow:hidden}a,input,textarea{outline:0}.article-relative ul,.dynamic ul,.nav ul,.wrapper>ul{list-style:none}body,div,html,li,ul{margin:0;padding:0}body{font-family:Verdana,arial,'\5fae\8f6f\96c5\9ed1';background-color:#FCFCFC}::selection{background-color:#D5D5D5;color:#FCFCFC}::-moz-selection{background-color:#D5D5D5;color:#FCFCFC}a{color:#009EB8;text-decoration:none}a:visited{color:#00b4d2}a:hover{text-decoration:underline}a:active{color:#00889f}img{max-width:100%;height:auto;-ms-interpolation-mode:bicubic}sup{font-size:10px;font-weight:400}.left{float:left}#search,.right{float:right}.clear{background-color:transparent;clear:both;display:block;font-size:0;height:0;line-height:0}.none{display:none}.ft-gray{color:grey}.ft-gray:visited{color:#9a9a9a}.ft-gray:hover{color:#676767;text-decoration:none}.fn-mgtb10{margin:10px 0}.logo{padding:0 5px;text-shadow:0 0 1px #D5D5D5}#search,.translate-ico{background-image:url(/skins/ease/images/icons.png)}.translate-ico{background-position:1px -125px;border:1px solid #D5D5D5;border-radius:3px;cursor:pointer;float:right;height:16px;margin:-3px 0 0 15px;padding:1px;width:16px}.translate-ico:hover{border-color:#9a9a9a;box-shadow:0 0 1px grey;background-color:#FCFCFC}#search,.main{background-color:#FFF}.wrapper{margin:0 auto;width:990px}.main{padding-bottom:50px}.header{width:100%;z-index:1}.header .title{border-bottom:1px solid grey;font-size:26px;font-weight:400}.header .sub-title{font-size:11px}#search,.nav a{font-size:14px}#search{background-position:7px -99px;border:1px solid #D5D5D5;border-radius:2px;box-shadow:0 1px 1px rgba(0,0,0,.1) inset;color:grey;height:19px;line-height:145%;padding:4px 10px 4px 28px;width:24px;-moz-transition:width .4s ease,background .4s ease;-webkit-transition:width .4s ease,background .4s ease;transition:width .4s ease,background .4s ease}#search:focus{width:150px}.banner{margin-bottom:20px}.banner .notice{float:left;margin:20px 0 0 50px}.nav{background-color:#2C2C2C;box-shadow:0 2px 2px #D5D5D5,0 3px 3px -3px #D5D5D5 inset;border-top:1px solid #e2e2e2;border-bottom:1px solid #e2e2e2;height:29px;top:0;width:100%;z-index:1}.nav li,.nav ul{float:left}.nav a{color:#C9C9C9;display:block;float:left;font-weight:700;line-height:29px;margin-right:20px;padding:0 10px;text-decoration:none;transition:color .4s ease,background-color .8s ease;-webkit-transition:color .4s ease,background-color .8s ease;-moz-transition:color .4s ease,background-color .8s ease}#goTop,.footer{font-size:11px}.nav a:hover{color:#FFF;background-color:#535353}.nav a.current{background-color:#FFF;box-shadow:0 -1px 1px rgba(0,0,0,.1) inset,0 1px 1px rgba(0,0,0,.1) inset;color:grey}.nav img{margin-left:3px}.nav .page-icon{float:left;height:14px;width:14px;margin:8px 5px 0 0}.footer{border-top:1px solid #D5D5D5;box-shadow:0 -1px 1px #D5D5D5;padding:12px 0}#goTop{background:url(/skins/ease/images/icons.png) 5px -51px no-repeat #D5D5D5;border-radius:2px 2px 0 0;box-shadow:0 0 3px #D5D5D5;cursor:pointer;height:21px;line-height:21px;padding:0 10px 0 23px;position:absolute;right:50px;display:none}#goTop:hover{background-color:#c8c8c8;box-shadow:0 0 3px #c8c8c8}.main>.wrapper>h2{margin:0;padding:14px 0}.article{border-bottom:1px solid #f6f6f6;padding:30px 50px}.article:hover{border-bottom-color:#ddd;box-shadow:0 0 1px #f6f6f6 inset;background-color:#FCFCFC}.article-body h1,.article-body h2{padding-bottom:.3em;border-bottom:1px solid #eee}.article-body{word-break:break-word;line-height:145%;word-wrap:break-word;margin-bottom:10px;font-size:14px}.article-body ol,.article-body ul{margin-top:0;margin-bottom:16px;margin-left:40px;padding-left:0}.article-body li{margin-top:.25em}.article-body img{cursor:zoom-in}.article-body img.emoji{cursor:auto;max-width:18px}.article-next,.article-title span,.form img{cursor:pointer}.article-body h1,.article-body h2,.article-body h3,.article-body h4,.article-body h5,.article-body h6{margin-top:24px;margin-bottom:16px;font-weight:600;line-height:1.25}.article-body h1{font-size:1.7em}.article-body h2{font-size:1.5em}.article-body h3{font-size:1.25em}.article-body h4{font-size:1em}.article-body h5{font-size:.875em}.article-body h6{font-size:.85em}.article-body hr{height:.15em;padding:0;margin:24px 0;background-color:#e7e7e7;border:0}.article-body p{margin-top:0;margin-bottom:16px}.article-body blockquote{padding:0 1em;color:#777;border-left:.25em solid #ddd;margin-bottom:16px}.article-body blockquote p{margin:0}.article-body ins>iframe{border:0}.article-body iframe{border:1px solid rgba(0,0,0,.38)}.article-body table{width:100%;border:1px solid #dedede;margin:15px auto;border-collapse:collapse;empty-cells:show}.article-body thead{text-align:center}.article-body td,.article-body th{height:35px;border:1px solid #dedede;padding:0 10px}.article-body th{font-weight:700;text-align:center!important;background:rgba(158,188,226,.2)}.article-body tbody tr:nth-child(2n){background:rgba(158,188,226,.12)}.article-body tr:hover{background:#efefef}.article-body code{padding:.2em .4em;margin:0;font-size:85%;background-color:rgba(252,41,41,.12);border-radius:3px;word-break:break-word}.article-body pre{position:relative}.article-body pre textarea{position:absolute;top:-100000px}.article-body pre>code{padding:.5em;background-color:rgba(0,0,0,.04);background-size:20px 20px;border-radius:5px;display:block}.article-body kbd{display:inline-block;padding:3px 5px;font:11px Consolas,"Liberation Mono",Menlo,Courier,monospace;line-height:10px;color:#555;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}.article-body .task-list-item,.article-body__task{list-style:none;margin-left:-1em}.article-body a{color:grey;text-decoration:underline}.article-body a:vidited{color:#9a9a9a}.article-body a:hover{color:#676767}.article-body>div{min-height:32px}.article-title h2{display:inline}.article-last:hover{border-bottom:1px solid #f6f6f6}.article-next{border:1px solid #eee;background-color:#F9F9F9;font-size:14px;line-height:36px;text-align:center}.article-next:hover,.article-relative{background-color:#FCFCFC}.article-relative{box-shadow:0 0 2px #D5D5D5;float:left;margin:10px 0;padding:0 20px 10px;width:382px}.article-relative:hover{background-color:#fff;box-shadow:0 0 4px #D5D5D5}#relevantArticles{margin-right:40px}#externalRelevantArticles{width:357px;margin-top:0}#comments{padding:20px 50px;position:relative}.comment-header{float:left;background-color:#FFF;border:1px solid #DEDEDE;padding:2px;height:60px;width:60px}.comment-panel{float:left;line-height:16px;margin:0 0 20px 10px;min-height:64px;width:814px}.comment-body-ref{background-color:#FCFCFC;box-shadow:0 0 2px #D5D5D5;display:block;left:127px;padding:10px;opacity:.9;filter:alpha(opacity=90);position:absolute;border:1px solid #e2e2e2}.comment-body-ref>.comment-header{border:0;float:right;height:48px;width:48px;padding:0}#tags a,#tags li,.dynamic .module,.links li,.wrapper>.form{float:left}.comment-body-ref>.comment-panel{margin:0 20px 0 0;min-height:48px;width:725px}.comment-body-ref>.comment-panel>.right{display:none}.form{padding:0 50px 20px}.form th{text-align:right;white-space:nowrap}.archives h3,.dynamic h3{text-align:center}.form input[type=text],.form input[type=password],.form textarea{background-color:#FCFCFC;border-width:0;box-shadow:0 0 2px #BCBCBC;font-family:Verdana,arial,\5fae\8f6f\96c5\9ed1;font-size:12px;margin:0 5px 10px 0;outline:0;padding:0 3px;height:28px;line-height:28px;width:260px}.form input:focus,.form textarea:focus{box-shadow:0 0 4px #D5D5D5}.form textarea{height:120px;overflow:auto;width:426px;line-height:16px}.form button{background-color:#F6F6F6;border:0;box-shadow:0 0 2px #D5D5D5;height:28px;line-height:28px;padding:0 12px;color:grey}.form button:hover{box-shadow:0 0 4px #D5D5D5;text-shadow:0 0 2px}#tags a,.form img{box-shadow:0 0 2px #D5D5D5;background-color:#FCFCFC}.form img{height:24px;padding:1px}#tags.other-main{margin:47px 44px 0;width:902px}#tags li{height:38px}#tags a{margin:3px 6px;padding:3px 12px}#tags a:hover{text-shadow:0 0 2px;text-decoration:none;box-shadow:0 0 4px #D5D5D5}.tags1,.tags1:visited{font-size:12px;color:#a7a7a7}.tags2,.tags2:visited{font-size:14px;color:grey}.tags3,.tags3:visited{font-size:16px;color:#595959}.tags4,.tags4:visited{font-size:18px;color:#323232}.tags5,.tags5:visited{font-size:20px;color:#0a0a0a}.archives{position:relative}.archives>div{background-color:#FCFCFC;box-shadow:0 0 2px #D5D5D5;padding-bottom:20px;line-height:20px;margin:20px;width:270px;position:absolute;top:0}.archives>div:hover{box-shadow:0 0 4px #D5D5D5}.archives a{display:block;margin-left:77px}.dynamic .module{background-color:#FCFCFC;box-shadow:0 0 2px #D5D5D5;line-height:20px;margin:20px;padding:10px 20px 20px;width:380px}.dynamic .module:hover{box-shadow:0 0 4px #D5D5D5}.dynamic .side-comments{width:840px}.dynamic .side-comments .comment-panel{width:760px}.dynamic .side-tags li{float:left;margin:0 5px}.dynamic .side-most-comment,.dynamic .side-most-view{margin-bottom:0}.other-main.links{margin-top:45px}.links li{line-height:22px;margin:0 20px;width:270px}.other-main{display:inline-block;margin:30px 30px 0;width:930px}#tags a,.archives>div,.article-relative,.dynamic .module,.form input[type=text],.form input[type=password],.form textarea{border:1px solid #f2f2f2}#tags a:hover,.archives>div:hover,.article-relative:hover,.dynamic .module:hover,.form input:focus,.form textarea:focus{border:1px solid #e2e2e2} \ No newline at end of file diff --git a/ease/dynamic.ftl b/ease/dynamic.ftl index 4da6782..253f1d4 100644 --- a/ease/dynamic.ftl +++ b/ease/dynamic.ftl @@ -54,7 +54,7 @@ ${viewLabel}
-
+
${comment.commentContent}
diff --git a/ease/footer.ftl b/ease/footer.ftl index 419058a..eb53b0f 100644 --- a/ease/footer.ftl +++ b/ease/footer.ftl @@ -67,22 +67,7 @@ "abstractLabel": "${abstractLabel}", "adminLabel": "${adminLabel}", "logoutLabel": "${logoutLabel}", - "skinDirName": "${skinDirName}", - "em00Label": "${em00Label}", - "em01Label": "${em01Label}", - "em02Label": "${em02Label}", - "em03Label": "${em03Label}", - "em04Label": "${em04Label}", - "em05Label": "${em05Label}", - "em06Label": "${em06Label}", - "em07Label": "${em07Label}", - "em08Label": "${em08Label}", - "em09Label": "${em09Label}", - "em10Label": "${em10Label}", - "em11Label": "${em11Label}", - "em12Label": "${em12Label}", - "em13Label": "${em13Label}", - "em14Label": "${em14Label}" + "skinDirName": "${skinDirName}" }; diff --git a/ease/js/ease.js b/ease/js/ease.js index 355ba6d..5e989d2 100644 --- a/ease/js/ease.js +++ b/ease/js/ease.js @@ -88,7 +88,7 @@ var getNextPage = function () { '
' + '
' + '
' + - '
' + + '
' + '
' + article.articleAbstract + '
' + @@ -279,7 +279,7 @@ var ease = { } // emotions - $(".article-body").each(function () { + $(".content-reset").each(function () { this.innerHTML = Util.replaceEmString($(this).html()); }); } diff --git a/ease/js/ease.min.js b/ease/js/ease.min.js index ac9a7c7..f5d1150 100644 --- a/ease/js/ease.min.js +++ b/ease/js/ease.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 goTranslate=function(){window.open("http://translate.google.com/translate?sl=auto&tl=auto&u="+location.href)},getNextPage=function(){var c=$(".article-next");currentPage+=1;var e="/articles";if(1===$("#tag").length)e="/articles/tags/"+(t=location.pathname.split("/"))[t.length-1]+"/";else if(1===$("#archive").length){e="/articles/archives/"+(t=location.pathname.split("/"))[t.length-2]+"/"+t[t.length-1]+"/"}else if(1===$("#author").length){var t;e="/articles/authors/"+(t=location.pathname.split("/"))[t.length-1]+"/"}$.ajax({url:latkeConfig.servePath+e+"?p="+currentPage,type:"GET",beforeSend:function(){c.css("background","url("+latkeConfig.staticServePath+"/skins/ease/images/ajax-loader.gif) no-repeat scroll center center #fefefe")},success:function(e,t){if(e.sc){for(var a="",i=e.rslts.pagination,r=0;r

'+l.articleTitle+"",l.hasUpdated&&(a+=""+Label.updatedLabel+""),l.articlePutTop&&(a+=""+Label.topArticleLabel+""),a+='

'+ +l.articleCommentCount+"  "+Label.commentLabel+'  '+l.articleViewCount+"  "+Label.viewLabel+'
'+l.articleAbstract+'
',l.hasUpdated?a+=Util.toDate(l.articleUpdateTime,"yy-MM-dd HH:mm"):a+=Util.toDate(l.articleCreateTime,"yy-MM-dd HH:mm"),a+=' '+l.authorName+'
'+Label.tag1Label+" ";for(var s=l.articleTags.split(","),o=0;o
"}e.html(a);for(var o=$(".archives>div"),c=0,h=0,g=[],d=0;d=o.length);f++)o[d].style.left=310*f+"px",g[f]=0i.headerH){var t=$(window).height(),a=e+t-21;$("body").height()-58<=e+t&&(a=$(".footer").offset().top-21),$("#goTop").fadeIn("slow").css("top",a)}else $("#goTop").hide()})},setDynamic:function(){var e=$(".dynamic");if(!($(".dynamic").length<1)){var t=e.find(".side-categories"),a=e.find(".side-tags"),i=e.find(".side-most-comment"),r=e.find(".side-most-view");t.height()>a.height()?a.height(t.height()):t.height(a.height()),i.height()>r.height()?r.height(i.height()):i.height(r.height()),$(".article-body").each(function(){this.innerHTML=Util.replaceEmString($(this).html())})}}};ease.getCurrentPage(),ease.initCommon(),ease.scrollEvent(),ease.setNavCurrent(),ease.initArchives(),ease.setDynamic(); \ No newline at end of file +var goTranslate=function(){window.open("http://translate.google.com/translate?sl=auto&tl=auto&u="+location.href)},getNextPage=function(){var c=$(".article-next");currentPage+=1;var e="/articles";if(1===$("#tag").length)e="/articles/tags/"+(t=location.pathname.split("/"))[t.length-1]+"/";else if(1===$("#archive").length){e="/articles/archives/"+(t=location.pathname.split("/"))[t.length-2]+"/"+t[t.length-1]+"/"}else if(1===$("#author").length){var t;e="/articles/authors/"+(t=location.pathname.split("/"))[t.length-1]+"/"}$.ajax({url:latkeConfig.servePath+e+"?p="+currentPage,type:"GET",beforeSend:function(){c.css("background","url("+latkeConfig.staticServePath+"/skins/ease/images/ajax-loader.gif) no-repeat scroll center center #fefefe")},success:function(e,t){if(e.sc){for(var a="",i=e.rslts.pagination,r=0;r

'+n.articleTitle+"",n.hasUpdated&&(a+=""+Label.updatedLabel+""),n.articlePutTop&&(a+=""+Label.topArticleLabel+""),a+='

'+ +n.articleCommentCount+"  "+Label.commentLabel+'  '+n.articleViewCount+"  "+Label.viewLabel+'
'+n.articleAbstract+'
',n.hasUpdated?a+=Util.toDate(n.articleUpdateTime,"yy-MM-dd HH:mm"):a+=Util.toDate(n.articleCreateTime,"yy-MM-dd HH:mm"),a+=' '+n.authorName+'
'+Label.tag1Label+" ";for(var s=n.articleTags.split(","),o=0;o
"}e.html(a);for(var o=$(".archives>div"),c=0,h=0,g=[],d=0;d=o.length);f++)o[d].style.left=310*f+"px",g[f]=0i.headerH){var t=$(window).height(),a=e+t-21;$("body").height()-58<=e+t&&(a=$(".footer").offset().top-21),$("#goTop").fadeIn("slow").css("top",a)}else $("#goTop").hide()})},setDynamic:function(){var e=$(".dynamic");if(!($(".dynamic").length<1)){var t=e.find(".side-categories"),a=e.find(".side-tags"),i=e.find(".side-most-comment"),r=e.find(".side-most-view");t.height()>a.height()?a.height(t.height()):t.height(a.height()),i.height()>r.height()?r.height(i.height()):i.height(r.height()),$(".content-reset").each(function(){this.innerHTML=Util.replaceEmString($(this).html())})}}};ease.getCurrentPage(),ease.initCommon(),ease.scrollEvent(),ease.setNavCurrent(),ease.initArchives(),ease.setDynamic(); \ No newline at end of file diff --git a/ease/lang/lang_zh_CN.properties b/ease/lang/lang_zh_CN.properties index 834d1a8..d03be87 100644 --- a/ease/lang/lang_zh_CN.properties +++ b/ease/lang/lang_zh_CN.properties @@ -74,4 +74,3 @@ randomArticlesLabel=\u968F\u673A\u9605\u8BFB externalRelevantArticlesLabel=\u7AD9\u5916\u76F8\u5173\u9605\u8BFB captchaErrorLabel=\u9A8C\u8BC1\u7801\u9519\u8BEF b3logLabel=B3LOG -killBrowserLabel=

\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01

\u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002

\u60A8\u53EF\u4EE5\u4E0B\u8F7D diff --git a/ease/macro-head.ftl b/ease/macro-head.ftl index 473ae69..8d60e64 100644 --- a/ease/macro-head.ftl +++ b/ease/macro-head.ftl @@ -27,7 +27,7 @@ - + diff --git a/ease/page.ftl b/ease/page.ftl index 9309332..19e760a 100644 --- a/ease/page.ftl +++ b/ease/page.ftl @@ -33,7 +33,7 @@ <#include "header.ftl">
-
+
${page.pageContent}
<@comments commentList=pageComments article=page> diff --git a/favourite/article-list.ftl b/favourite/article-list.ftl index 38338bd..310de05 100644 --- a/favourite/article-list.ftl +++ b/favourite/article-list.ftl @@ -50,7 +50,7 @@
-
+
diff --git a/favourite/article.ftl b/favourite/article.ftl index f627b7b..a841119 100644 --- a/favourite/article.ftl +++ b/favourite/article.ftl @@ -94,7 +94,7 @@
-
+
${article.articleContent} <#if "" != article.articleSign.signHTML?trim>
diff --git a/favourite/common-comment.ftl b/favourite/common-comment.ftl index b934200..ba21258 100644 --- a/favourite/common-comment.ftl +++ b/favourite/common-comment.ftl @@ -47,7 +47,7 @@
-
+
${comment.commentContent}
diff --git a/favourite/css/base.css b/favourite/css/base.css new file mode 100644 index 0000000..2f08f7f --- /dev/null +++ b/favourite/css/base.css @@ -0,0 +1,18 @@ +/** + * Solo - A small and beautiful blogging system written in Java. + * Copyright (c) 2010-2019, b3log.org & hacpai.com + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +.content-reset{word-wrap:break-word;overflow:auto;line-height:1.65;font-size:16px;word-break:break-word}.content-reset ul,.content-reset ol{padding-left:2em;margin-top:0;margin-bottom:16px}.content-reset li{margin-top:0.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{padding-bottom:0.3em;font-size:1.7em;border-bottom:1px solid #eee}.content-reset h2{padding-bottom:0.3em;font-size:1.5em;border-bottom:1px solid #eee}.content-reset h3{font-size:1.25em}.content-reset h4{font-size:1em}.content-reset h5{font-size:0.875em}.content-reset h6{font-size:0.85em}.content-reset hr{height:0.15em;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:0.25em solid #ddd;margin-bottom:16px}.content-reset blockquote p{margin:0}.content-reset ins>iframe{border:0}.content-reset iframe{border:1px solid rgba(0,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:bold;text-align:center !important;background:rgba(158,188,226,0.2)}.content-reset tbody tr:nth-child(2n){background:rgba(158,188,226,0.12)}.content-reset tr:hover{background:#efefef}.content-reset code{padding:0.2em 0.4em;margin:0;font-size:85%;background-color:rgba(252,41,41,0.12);border-radius:3px;word-break:break-word}.content-reset pre{position:relative}.content-reset pre textarea{position:absolute;top:-100000px}.content-reset pre>code{padding:0.5em;background-color:rgba(0,0,0,0.04);background-size:20px 20px;border-radius:5px;display:block}.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:solid 1px rgba(0,0,0,0.38);border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.content-reset__task,.content-reset .task-list-item{list-style:none;margin-left:-1em}.img-preview{width:100%;height:100%;top:0;z-index:211;overflow:auto;cursor:zoom-out;transition:background-color .2s ease-in-out}.img-preview img{max-width:inherit;transition:transform .3s ease-in-out}.left{float:left}.right{float:right}.clear:before,.clear:after{display:table;content:""}.clear:after{clear:both}.none{display:none}body{background:url("../images/bg.jpg") repeat scroll left top transparent}a,a:link,a:active,a:visited{color:#2970A6;text-decoration:none}a:hover{color:black}h1{font-size:300%}h4{font-size:160%;padding:18px 0 0 80px}h5{font-size:12px}img{max-width:100%;vertical-align:middle;border:0;height:auto;-ms-interpolation-mode:bicubic;overflow:hidden;font-size:12px}.margin5R{margin-right:5px}.margin5{margin:5px}.margin25{margin:25px 25px 0}.content{margin:0 auto;width:960px}.header{height:65px;padding:15px 0 0 30px}.body{background:url("../images/cont-bg.png") repeat-y scroll right center #fff;min-height:400px}.side-navi{background:url("../images/cont-bg.png") repeat-y scroll left top #00798A;color:white;font-size:95%;line-height:145%;padding-top:8px;position:relative;width:300px}.side-navi ul{list-style:none}.side-navi a{color:#FFFFFF}.comm div{display:none}.main{padding:0 0 15px 35px;width:600px}.footer{color:#fff;line-height:145%}.footer a{color:#fff;font-weight:bold}.footer a:hover{text-decoration:underline}#logoTitle{color:white;display:block;font-family:"Microsoft YaHei";height:50px;outline:none;text-decoration:none}.sub-title{border-top:1px solid #FFFFFF;color:#FFFFFF;font-size:18px;padding:0 15px}#header-navi{background:none repeat scroll 0 0 #FFFFFF;border-bottom:1px solid #A6A6A6}#header-navi li{float:left;list-style:none;margin-left:0px}#header-navi li a{background:url("../images/menu.gif") no-repeat scroll 0 0 transparent;color:#382E1F;display:block;font-size:11px;height:31px;line-height:31px;margin-left:-10px;outline:none;padding:0 20px;text-decoration:none}#header-navi li a:hover{background-position:0 -31px}#header-navi li a.home{background-position:0 -93px;margin-left:0;padding:0;text-indent:-999em;width:45px}#header-navi li a.home:hover{background-position:0 -124px}#header-navi li a.lastNavi:hover{background-position:0 0}#header-navi li.selected a{background-position:0 -62px}#header-navi li.selected a.home{background-position:0 -155px}#statistic{left:250px;position:relative;text-align:left;top:110px;width:600px}.footer .copyright{padding-top:60px;text-align:center}.footer .goTop{background:url("../images/icons.gif") no-repeat scroll 0 -304px transparent;cursor:pointer;font-size:12px;padding-left:16px;position:absolute;right:17px;top:0;width:25px}.article{border-top:1px dotted #0184AF;padding-bottom:15px}.article-title{font-size:22px;margin-top:10px;padding:0 5px 3px;position:relative;top:20px}.article-title sup{font-size:12px}.article-title a{color:#4C4C4C;text-decoration:none}.article-title a:hover{color:#2970A6}.article-abstract{line-height:145%;margin:5px 0 5px 5px;word-wrap:break-word}.tagsIcon,.articles-commentIcon,.dateIcon,.article-browserIcon{background:url("../images/icons.gif") no-repeat scroll 0 -400px transparent;float:left;height:30px;margin-right:6px;width:30px}.tagsIcon{background:url("../images/tagsIcon.png")}.dateIcon{background-position:0 -48px}.articles-commentIcon{background:url("../images/comment.jpg")}.article-browserIcon{background:url("../images/category.jpg")}.content-reset{line-height:145%;padding:5px 0 0 5px}.article-footer{margin:0 5px 10px 5px}.article-relative{line-height:22px;margin-top:20px}.article-relative h4{font-size:12px;padding:0}.comments{background:none repeat scroll 0 0 #FCFCFC;border-bottom:1px solid #CCCCCC;border-top:1px solid #CCCCCC;margin:15px -15px;padding:0 15px 15px;position:relative}.comment-title{background-color:#E3E9FF;border-top:1px solid #3366CC;padding:3px 12px 3px 12px;position:relative}.comment-body-ref{background-color:#FFFFFF;filter:alpha(opacity=90);left:217px;opacity:0.9;padding:6px;position:absolute;width:605px;z-index:10}.comment-body{margin-top:15px}.comment-author{float:left;text-align:center;width:81px}.comment-author div{background:url("../images/commentpoint.png") no-repeat scroll 100% 33% transparent;margin-top:10px;padding-right:14px}.comment-author img{border:1px solid #999999;height:32px;padding:1px;width:32px}.comment-author a{font-weight:bold;white-space:nowrap;margin-right:14px}.comment-info{background:url("../images/comment.gif") no-repeat scroll 0 0 #EDEFF0;font-size:12px;margin:-62px 0 0 80px;padding:10px 15px 0;width:494px}.comment-content{background:url("../images/comment.gif") no-repeat scroll 100% 100% transparent;font-size:12px;line-height:145%;margin:0 -15px;overflow:hidden;padding:9px 15px 10px;word-wrap:break-word}.comment-form img{cursor:pointer}.comment-form input,.comment-form textarea{background:url("../images/textfield.gif") repeat-x scroll 50% 0 #fff;border:1px solid #A6A6A6;color:#555555;font-family:Helvetica, Arial, sans-serif;height:16px;outline:none;padding:2px 1px;width:200px}.comment-form textarea{font-size:12px;height:auto;width:600px}.comment-form button{background:none repeat scroll 0 0 #B4D666;border-color:#B4D666 #81B840 #81B840 #B4D666;border-radius:0px;border-style:solid;border-width:1px;color:#2970A6;font-size:12px;height:22px;line-height:22px;padding:0px 6px}.comment-form button:hover{background:none repeat scroll 0 0 #98C64C;border-color:#76B33A #98C64C #98C64C #76B33A;color:#074A7E}.error-msg{color:#3366CC}.side-navi .item{padding:12px 15px}.side-navi .navi-comments img{border:1px solid #999999;height:32px;margin-right:7px;padding:1px;width:32px}.side-navi .navi-comments a{color:white;font-weight:bold}.side-navi .navi-comments .side-comment{color:white;font-weight:normal;height:18px;width:210px}.side-navi .navi-comments .side-comment img{border:0px;height:16px;margin-right:0px;padding:0px;width:16px}.side-navi .navi-comments li{padding:2px 0}.side-navi .navi-comments li div{width:215px;overflow:hidden;text-overflow:ellipsis;-o-text-overflow:ellipsis}.side-navi a.selected{color:#555555;text-decoration:none}.side-navi ul.navi-tags li,.side-navi .navi-comments li{background-image:none;padding-left:0px}.side-navi ul.navi-tags li img{height:16px;padding-right:6px;width:16px}.side-navi li{background:url("../images/pl.png") no-repeat scroll 0 0 transparent;margin:5px 0 0 0;overflow:hidden;padding-left:22px;white-space:nowrap;text-overflow:ellipsis;-o-text-overflow:ellipsis}.side-navi li.aboutMe{white-space:normal}.side-navi .line{border-color:#67C3CF;border-style:dotted;border-width:1px 0}.pagination{margin:16px;text-align:center}.pagination a,.pagination a:visited{color:#4272DB;padding:0 3px}.pagination a.selected{color:#000000;font-weight:bold}#tagsPanel .tagPanel{border:2px solid;border-radius:6px;cursor:pointer;float:left;margin:3px}#tagsPanel .tagPanel:hover{background-color:#EEEEEE;border:2px dashed}#tagsPanel .tagPanel{text-decoration:none}.error-body{background:url("../images/cont-bg_2.png") repeat-y scroll left;height:400px;padding:12px}.error-title{line-height:72px}.error-panel{margin:0 auto;width:201px}.error-panel a{background:none repeat scroll 0 0 #9CD941;border-color:#D0F29D #398A38 #398A38 #D0F29D;border-style:solid;border-width:1px;color:#000000;font-size:14px;font-weight:bold;margin-right:3px;padding:10px 15px;text-decoration:none}.error-panel a:hover{background-color:#ADEb51}.kind-panel{background:url("../images/box.gif") no-repeat scroll 100% 100% #F4F5F7;margin-bottom:10px;padding:8px 12px}.kind-title{background:url("../images/box.gif") no-repeat scroll 0 0 #E3E4E6;border-bottom:1px solid #CCCCCC;font-weight:bold;padding:6px 12px}.top{background:url("../images/top-bg.jpg") repeat-x scroll left top transparent;border:none;color:white;height:87px}.footer-icon{background:url("../images/footer-ico.png") no-repeat scroll center center transparent;height:133px}.info{background:url("../images/info.png") repeat-x scroll left top transparent;height:110px;position:relative}.logoutIcon{background-position:-96px -16px}#qq2{float:right;padding:68px 120px 0 0}.thinks{background:url("../images/thinks.png") no-repeat scroll left top transparent;height:420px;position:absolute;right:12px;top:36px;width:388px;z-index:1}.lamb{background:url("../images/lamb.png") no-repeat scroll left top transparent;height:80px;left:460px;position:absolute;top:100px;width:320px}.lamb a{display:block;height:80px;outline:none;width:320px}.null{height:160px}#navigation{height:87px;margin:0 auto;width:960px}#navigation a.classifiche{background:url("../images/classifiche.png") no-repeat scroll left top transparent}#navigation a.about{background:url("../images/about.png") no-repeat scroll left top transparent}#navigation a.home{background:url("../images/home.png") no-repeat scroll left top transparent}#navigation a.Guestbook{background:url("../images/Guestbook.png") no-repeat scroll left top transparent}#navigation a{background:url("../images/default.png") no-repeat scroll left top transparent;color:#FFFFFF;cursor:pointer !important;float:left;height:70px;margin-left:10px;outline:none;padding-top:2px;text-align:center;text-decoration:none;width:73px}.admins{position:relative;top:-85px}#mostCommentArticles li a,#mostViewCountArticles li a,.navi-tags li a,#sideLink li a,#save li a,#sideAuthor li a{color:white}.roundtop{background:url("../images/roundtop.png") no-repeat scroll left top transparent;height:75px}.roundbottom{background:url("../images/roundbottom.png") no-repeat scroll left top transparent;height:35px}.paint{background:url("../images/paint.png") no-repeat scroll left top transparent;height:183px;left:34px;position:absolute;top:450px;width:87px}.rings{background:url("../images/anelli.png") no-repeat scroll left top transparent;height:121px;left:-28px;position:absolute;width:56px;z-index:80}.antefatto{background:url("../images/twitter.png") no-repeat scroll left top transparent;height:64px}.ads{background:url("../images/ads.png") no-repeat scroll left top transparent;height:64px}.categorie{background:url("../images/categorie.png") no-repeat scroll left top transparent;height:64px}#sideNavi .tags{background:url(../images/tagsIcon.png) no-repeat scroll left top transparent;height:52px;background-size:contain}.archivio{background:url("../images/archivio.png") no-repeat scroll left top transparent;height:64px}.side-author{background:url("../images/antefatto.png") no-repeat scroll left top transparent;height:64px}.blog{background:url("../images/blog.png") no-repeat scroll left top transparent;height:64px}.cuore{background:url("../images/cuore.png") no-repeat scroll left top transparent;height:64px}.esclamativo{background:url("../images/esclamativo.png") no-repeat scroll left top transparent;height:64px}.posttime-blue{background-color:#0184AF}.posttime-blue,.posttime-pink{border:1px solid #999999;clear:right;color:#FFFFFF;float:right;font-family:Tohama, Arial, Helvetica, sans-serif;height:60px;position:relative;right:30px;top:-25px;width:60px}.posttime-MY{border-bottom:1px solid #FFFFFF;font-size:9px;height:15px;padding-top:5px;text-align:center}.posttime-D{font-size:28px;font-weight:bold;text-align:center}.note{background:none repeat scroll 0 0 #E7F5F7;margin:40px 0 0 -49px;padding:10px 10px 10px 85px;position:relative;width:574px;z-index:50}.corner{background:url("../images/corner.png") no-repeat scroll left top transparent;height:9px;left:0;position:absolute;top:-9px;width:9px}.count{position:relative;top:8px}.substance{overflow:hidden;width:500px} diff --git a/favourite/css/favourite.css b/favourite/css/base.scss similarity index 98% rename from favourite/css/favourite.css rename to favourite/css/base.scss index 26af59b..b06546f 100644 --- a/favourite/css/favourite.css +++ b/favourite/css/base.scss @@ -20,8 +20,32 @@ * skin favoutite style * * @author Liyuan Li - * @version 1.2.0.1, Oct 24, 2018 -*/ + * @version 2.0.0.0, Feb 21, 2019 + */ + +@import "../../../scss/reset-content"; + +.left { + float: left; +} + +.right { + float: right; +} + +.clear:before, +.clear:after { + display: table; + content: ""; +} + +.clear:after { + clear: both; +} + +.none { + display: none; +} body { background: url("../images/bg.jpg") repeat scroll left top transparent; } @@ -274,7 +298,7 @@ img { background: url("../images/category.jpg"); } -.article-body { +.content-reset { line-height: 145%; padding: 5px 0 0 5px; } @@ -407,11 +431,6 @@ img { color: #074A7E; } -.em00, .em01, .em02, .em03, .em04, .em05, .em06, .em07, .em08, .em09, .em10, .em11, .em12, .em13, .em14 { - background-image: url("../../../images/emotions/emotions.png"); - background-size: 120px; -} - .error-msg { color: #3366CC; } diff --git a/favourite/css/favourite.min.css b/favourite/css/favourite.min.css deleted file mode 100644 index 4c8c32d..0000000 --- a/favourite/css/favourite.min.css +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Solo - A small and beautiful blogging system written in Java. - * Copyright (c) 2010-2019, b3log.org & hacpai.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -@charset "utf-8";#header-navi li,.side-navi ul{list-style:none}.side-navi .navi-comments li div,.side-navi li{text-overflow:ellipsis;-o-text-overflow:ellipsis;overflow:hidden}.comment-form img,.footer .goTop{cursor:pointer}.comment-content,.side-navi li,.substance,img{overflow:hidden}body{background:url(../images/bg.jpg) left top}a,a:active,a:link,a:visited{color:#2970A6;text-decoration:none}a:hover{color:#000}h1{font-size:300%}h4{font-size:160%;padding:18px 0 0 80px}h5,img{font-size:12px}img{max-width:100%;vertical-align:middle;border:0;height:auto;-ms-interpolation-mode:bicubic}.margin5R{margin-right:5px}.margin5{margin:5px}.margin25{margin:25px 25px 0}.content{margin:0 auto;width:960px}.header{height:65px;padding:15px 0 0 30px}.body{background:url(../images/cont-bg.png) right center repeat-y #FFF;min-height:400px}.side-navi{background:url(../images/cont-bg.png) left top repeat-y #00798A;color:#fff;font-size:95%;line-height:145%;padding-top:8px;position:relative;width:300px}.side-navi a{color:#FFF}.comm div{display:none}#header-navi li a,#logoTitle,.lamb a{display:block;outline:0}.main{padding:0 0 15px 35px;width:600px}.footer{color:#fff;line-height:145%}.footer a{color:#fff;font-weight:700}.footer a:hover{text-decoration:underline}#header-navi li a,#logoTitle,#navigation a,#tagsPanel .tagPanel,.article-title a,.error-panel a{text-decoration:none}#logoTitle{color:#fff;font-family:"Microsoft YaHei";height:50px}.sub-title{border-top:1px solid #FFF;color:#FFF;font-size:18px;padding:0 15px}#header-navi{background:#FFF;border-bottom:1px solid #A6A6A6}#header-navi li{float:left;margin-left:0}#header-navi li a{background:url(../images/menu.gif) no-repeat;color:#382E1F;font-size:11px;height:31px;line-height:31px;margin-left:-10px;padding:0 20px}#header-navi li a:hover{background-position:0 -31px}#header-navi li a.home{background-position:0 -93px;margin-left:0;padding:0;text-indent:-999em;width:45px}#header-navi li a.home:hover{background-position:0 -124px}#header-navi li a.lastNavi:hover{background-position:0 0}#header-navi li.selected a{background-position:0 -62px}#header-navi li.selected a.home{background-position:0 -155px}#statistic{left:250px;position:relative;text-align:left;top:110px;width:600px}#navigation a,.comment-author,.pagination,.posttime-D,.posttime-MY{text-align:center}.footer .copyright{padding-top:60px;text-align:center}.footer .goTop{background:url(../images/icons.gif) 0 -304px no-repeat;font-size:12px;padding-left:16px;position:absolute;right:17px;top:0;width:25px}.article{border-top:1px dotted #0184AF;padding-bottom:15px}.article-title{font-size:22px;margin-top:10px;padding:0 5px 3px;position:relative;top:20px}.article-title sup{font-size:12px}.article-title a{color:#4C4C4C}.article-title a:hover{color:#2970A6}.article-abstract{line-height:145%;margin:5px 0 5px 5px;word-wrap:break-word}.article-browserIcon,.articles-commentIcon,.dateIcon,.tagsIcon{background:url(../images/icons.gif) 0 -400px no-repeat;float:left;height:30px;margin-right:6px;width:30px}.tagsIcon{background:url(../images/tagsIcon.png)}.dateIcon{background-position:0 -48px}.articles-commentIcon{background:url(../images/comment.jpg)}.article-browserIcon{background:url(../images/category.jpg)}.article-body{line-height:145%;padding:5px 0 0 5px}.article-footer{margin:0 5px 10px}.article-relative{line-height:22px;margin-top:20px}.article-relative h4{font-size:12px;padding:0}.comments{background:#FCFCFC;border-bottom:1px solid #CCC;border-top:1px solid #CCC;margin:15px -15px;padding:0 15px 15px;position:relative}.comment-title{background-color:#E3E9FF;border-top:1px solid #36C;padding:3px 12px;position:relative}.comment-body-ref{background-color:#FFF;filter:alpha(opacity=90);left:217px;opacity:.9;padding:6px;position:absolute;width:605px;z-index:10}.comment-body{margin-top:15px}.comment-author{float:left;width:81px}.comment-author div{background:url(../images/commentpoint.png) 100% 33% no-repeat;margin-top:10px;padding-right:14px}.comment-author img{border:1px solid #999;height:32px;padding:1px;width:32px}.comment-author a{font-weight:700;white-space:nowrap;margin-right:14px}.comment-info{background:url(../images/comment.gif) no-repeat #EDEFF0;font-size:12px;margin:-62px 0 0 80px;padding:10px 15px 0;width:494px}.comment-content{background:url(../images/comment.gif) 100% 100% no-repeat;font-size:12px;line-height:145%;margin:0 -15px;padding:9px 15px 10px;word-wrap:break-word}.comment-form input,.comment-form textarea{background:url(../images/textfield.gif) 50% 0 repeat-x #FFF;border:1px solid #A6A6A6;color:#555;font-family:Helvetica,Arial,sans-serif;height:16px;outline:0;padding:2px 1px;width:200px}.comment-form textarea{font-size:12px;height:auto;width:600px}.comment-form button{background:#B4D666;border-color:#B4D666 #81B840 #81B840 #B4D666;border-radius:0;border-style:solid;border-width:1px;color:#2970A6;font-size:12px;height:22px;line-height:22px;padding:0 6px}.comment-form button:hover{background:#98C64C;border-color:#76B33A #98C64C #98C64C #76B33A;color:#074A7E}.em00,.em01,.em02,.em03,.em04,.em05,.em06,.em07,.em08,.em09,.em10,.em11,.em12,.em13,.em14{background-image:url(../../../images/emotions/emotions.png);background-size:120px}.error-msg{color:#36C}.side-navi .item{padding:12px 15px}.side-navi .navi-comments img{border:1px solid #999;height:32px;margin-right:7px;padding:1px;width:32px}.side-navi .navi-comments a{color:#fff;font-weight:700}.side-navi .navi-comments .side-comment{color:#fff;font-weight:400;height:18px;width:210px}.side-navi .navi-comments .side-comment img{border:0;height:16px;margin-right:0;padding:0;width:16px}.side-navi .navi-comments li{padding:2px 0}.side-navi .navi-comments li div{width:215px}.side-navi a.selected{color:#555;text-decoration:none}.side-navi .navi-comments li,.side-navi ul.navi-tags li{background-image:none;padding-left:0}.side-navi ul.navi-tags li img{height:16px;padding-right:6px;width:16px}.side-navi li{background:url(../images/pl.png) no-repeat;margin:5px 0 0;padding-left:22px;white-space:nowrap}.side-navi li.aboutMe{white-space:normal}.side-navi .line{border-color:#67C3CF;border-style:dotted;border-width:1px 0}.pagination{margin:16px}.pagination a,.pagination a:visited{color:#4272DB;padding:0 3px}.error-panel a,.pagination a.selected{color:#000;font-weight:700}#tagsPanel .tagPanel{border:2px solid;border-radius:6px;cursor:pointer;float:left;margin:3px}#tagsPanel .tagPanel:hover{background-color:#EEE;border:2px dashed}.error-body{background:url(../images/cont-bg_2.png) left repeat-y;height:400px;padding:12px}.error-title{line-height:72px}.error-panel{margin:0 auto;width:201px}.error-panel a{background:#9CD941;border-color:#D0F29D #398A38 #398A38 #D0F29D;border-style:solid;border-width:1px;font-size:14px;margin-right:3px;padding:10px 15px}.error-panel a:hover{background-color:#ADEb51}.kind-panel{background:url(../images/box.gif) 100% 100% no-repeat #F4F5F7;margin-bottom:10px;padding:8px 12px}.kind-title{background:url(../images/box.gif) no-repeat #E3E4E6;border-bottom:1px solid #CCC;font-weight:700;padding:6px 12px}.top{background:url(../images/top-bg.jpg) left top repeat-x;border:none;color:#fff;height:87px}.footer-icon{background:url(../images/footer-ico.png) center center no-repeat;height:133px}.info{background:url(../images/info.png) left top repeat-x;height:110px;position:relative}.lamb,.thinks{position:absolute}.logoutIcon{background-position:-96px -16px}#qq2{float:right;padding:68px 120px 0 0}.thinks{background:url(../images/thinks.png) left top no-repeat;height:420px;right:12px;top:36px;width:388px;z-index:1}.lamb,.lamb a{height:80px;width:320px}.lamb{background:url(../images/lamb.png) left top no-repeat;left:460px;top:100px}.null{height:160px}#navigation{height:87px;margin:0 auto;width:960px}#navigation a.classifiche{background:url(../images/classifiche.png) left top no-repeat}#navigation a.about{background:url(../images/about.png) left top no-repeat}#navigation a.home{background:url(../images/home.png) left top no-repeat}#navigation a.Guestbook{background:url(../images/Guestbook.png) left top no-repeat}#navigation a{background:url(../images/default.png) left top no-repeat;color:#FFF;cursor:pointer!important;float:left;height:70px;margin-left:10px;outline:0;padding-top:2px;width:73px}.admins{position:relative;top:-85px}.paint,.rings{position:absolute}#mostCommentArticles li a,#mostViewCountArticles li a,#save li a,#sideAuthor li a,#sideLink li a,.navi-tags li a{color:#fff}.roundtop{background:url(../images/roundtop.png) left top no-repeat;height:75px}.roundbottom{background:url(../images/roundbottom.png) left top no-repeat;height:35px}.paint{background:url(../images/paint.png) left top no-repeat;height:183px;left:34px;top:450px;width:87px}.rings{background:url(../images/anelli.png) left top no-repeat;height:121px;left:-28px;width:56px;z-index:80}.antefatto{background:url(../images/twitter.png) left top no-repeat;height:64px}.ads{background:url(../images/ads.png) left top no-repeat;height:64px}.categorie{background:url(../images/categorie.png) left top no-repeat;height:64px}#sideNavi .tags{background:url(../images/tagsIcon.png) left top no-repeat;height:52px;background-size:contain}.archivio,.blog,.cuore,.esclamativo{height:64px}.archivio{background:url(../images/archivio.png) left top no-repeat}.side-author{background:url(../images/antefatto.png) left top no-repeat;height:64px}.blog{background:url(../images/blog.png) left top no-repeat}.cuore{background:url(../images/cuore.png) left top no-repeat}.esclamativo{background:url(../images/esclamativo.png) left top no-repeat}.posttime-blue{background-color:#0184AF}.posttime-blue,.posttime-pink{border:1px solid #999;clear:right;color:#FFF;float:right;font-family:Tohama,Arial,Helvetica,sans-serif;height:60px;position:relative;right:30px;top:-25px;width:60px}.posttime-MY{border-bottom:1px solid #FFF;font-size:9px;height:15px;padding-top:5px}.posttime-D{font-size:28px;font-weight:700}.note{background:#E7F5F7;margin:40px 0 0 -49px;padding:10px 10px 10px 85px;position:relative;width:574px;z-index:50}.corner{background:url(../images/corner.png) left top no-repeat;height:9px;left:0;position:absolute;top:-9px;width:9px}.count{position:relative;top:8px}.substance{width:500px} \ No newline at end of file diff --git a/favourite/footer.ftl b/favourite/footer.ftl index 3ca1336..137598c 100644 --- a/favourite/footer.ftl +++ b/favourite/footer.ftl @@ -41,22 +41,7 @@ "markedAvailable": ${markedAvailable?c}, "adminLabel": "${adminLabel}", "logoutLabel": "${logoutLabel}", - "skinDirName": "${skinDirName}", - "em00Label": "${em00Label}", - "em01Label": "${em01Label}", - "em02Label": "${em02Label}", - "em03Label": "${em03Label}", - "em04Label": "${em04Label}", - "em05Label": "${em05Label}", - "em06Label": "${em06Label}", - "em07Label": "${em07Label}", - "em08Label": "${em08Label}", - "em09Label": "${em09Label}", - "em10Label": "${em10Label}", - "em11Label": "${em11Label}", - "em12Label": "${em12Label}", - "em13Label": "${em13Label}", - "em14Label": "${em14Label}" + "skinDirName": "${skinDirName}" }; $(document).ready(function () { diff --git a/favourite/lang/lang_zh_CN.properties b/favourite/lang/lang_zh_CN.properties index 7d83afc..42c5f5f 100644 --- a/favourite/lang/lang_zh_CN.properties +++ b/favourite/lang/lang_zh_CN.properties @@ -188,7 +188,6 @@ permalink1Label=\u94FE\u63A5\uFF1A permalinkLabel=\u94FE\u63A5 welcomeToSoloLabel=\u6B22\u8FCE\u4F7F\u7528 Solo\uFF01 b3logLabel=B3LOG -killBrowserLabel=

\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01

\u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002

\u60A8\u53EF\u4EE5\u4E0B\u8F7D readmoreLabel=\u9605\u8BFB\u66F4\u591A\u00BB readmore2Label=\u9605\u8BFB\u66F4\u591A replyLabel=\u56DE\u590D\u00BB diff --git a/favourite/macro-head.ftl b/favourite/macro-head.ftl index 50b83dc..410c898 100644 --- a/favourite/macro-head.ftl +++ b/favourite/macro-head.ftl @@ -27,8 +27,7 @@ - - + diff --git a/favourite/page.ftl b/favourite/page.ftl index fd92f22..f16c9ce 100644 --- a/favourite/page.ftl +++ b/favourite/page.ftl @@ -41,7 +41,7 @@
-
+
${page.pageContent}
diff --git a/i-nove/article-list.ftl b/i-nove/article-list.ftl index b0d93a3..3992793 100644 --- a/i-nove/article-list.ftl +++ b/i-nove/article-list.ftl @@ -57,7 +57,7 @@
-
+
${article.articleAbstract}
diff --git a/i-nove/article.ftl b/i-nove/article.ftl index 38ab3e7..54f8b43 100644 --- a/i-nove/article.ftl +++ b/i-nove/article.ftl @@ -93,7 +93,7 @@
-
+
${article.articleContent} <#if "" != article.articleSign.signHTML?trim>
diff --git a/i-nove/common-comment.ftl b/i-nove/common-comment.ftl index 0720da2..5323296 100644 --- a/i-nove/common-comment.ftl +++ b/i-nove/common-comment.ftl @@ -45,7 +45,7 @@
-
+
${comment.commentContent}
diff --git a/i-nove/css/base.css b/i-nove/css/base.css new file mode 100644 index 0000000..deba163 --- /dev/null +++ b/i-nove/css/base.css @@ -0,0 +1,18 @@ +/** + * Solo - A small and beautiful blogging system written in Java. + * Copyright (c) 2010-2019, b3log.org & hacpai.com + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +.content-reset{word-wrap:break-word;overflow:auto;line-height:1.65;font-size:16px;word-break:break-word}.content-reset ul,.content-reset ol{padding-left:2em;margin-top:0;margin-bottom:16px}.content-reset li{margin-top:0.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{padding-bottom:0.3em;font-size:1.7em;border-bottom:1px solid #eee}.content-reset h2{padding-bottom:0.3em;font-size:1.5em;border-bottom:1px solid #eee}.content-reset h3{font-size:1.25em}.content-reset h4{font-size:1em}.content-reset h5{font-size:0.875em}.content-reset h6{font-size:0.85em}.content-reset hr{height:0.15em;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:0.25em solid #ddd;margin-bottom:16px}.content-reset blockquote p{margin:0}.content-reset ins>iframe{border:0}.content-reset iframe{border:1px solid rgba(0,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:bold;text-align:center !important;background:rgba(158,188,226,0.2)}.content-reset tbody tr:nth-child(2n){background:rgba(158,188,226,0.12)}.content-reset tr:hover{background:#efefef}.content-reset code{padding:0.2em 0.4em;margin:0;font-size:85%;background-color:rgba(252,41,41,0.12);border-radius:3px;word-break:break-word}.content-reset pre{position:relative}.content-reset pre textarea{position:absolute;top:-100000px}.content-reset pre>code{padding:0.5em;background-color:rgba(0,0,0,0.04);background-size:20px 20px;border-radius:5px;display:block}.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:solid 1px rgba(0,0,0,0.38);border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.content-reset__task,.content-reset .task-list-item{list-style:none;margin-left:-1em}.img-preview{width:100%;height:100%;top:0;z-index:211;overflow:auto;cursor:zoom-out;transition:background-color .2s ease-in-out}.img-preview img{max-width:inherit;transition:transform .3s ease-in-out}html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;height:100%}body{margin:0;font-family:"Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif;font-size:14px;background-color:#fff;-webkit-font-smoothing:antialiased;-webkit-overflow-scrolling:touch}::-moz-selection{text-shadow:none;background:rgba(65,131,196,0.4)}::selection{text-shadow:none;background:rgba(66,133,244,0.4)}ul,ol{margin:0;padding:0}h1,h2,h3,h4,h5,h6,dl,dd,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{outline:0;text-decoration:none}a:hover{text-decoration:underline}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.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{margin:0;font-size:100%;vertical-align:middle;font-family:"Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif;outline:none}button,input{line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}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-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;resize:vertical}svg{fill:currentColor;display:inline-block;stroke-width:0;stroke:currentColor;width:14px;height:14px}blockquote{margin:0}.left{float:left}.right{float:right}.clear:before,.clear:after{display:table;content:""}.clear:after{clear:both}.none{display:none}img{max-width:100%;height:auto}.bg{background:url("../images/bg.jpg") repeat-x scroll 0 0 #BEC3C6;color:#555555}a,a:link,a:active,a:visited{color:#2970A6;text-decoration:none}a:hover{text-decoration:underline}h1{font-size:200%}h4{font-size:160%}h5{font-size:12px}.margin5R{margin-right:5px}.margin5{margin:5px}.wrapper{background:url("../images/light.gif") no-repeat scroll 50% 0 transparent;padding:20px 0}.content{margin:0 auto;width:936px}.header{background:url("../images/header.jpg") no-repeat scroll 0 0 transparent;border-bottom:1px solid #A6A6A6;height:65px;padding:25px 30px 0}.body{background:url("../images/sidesep.gif") repeat-y scroll right center #fff;min-height:400px}.side-navi{background:url("../images/sidebar_shadow.gif") repeat-x scroll 50% 0 #F7F7F7;font-size:95%;line-height:145%;padding-top:8px;width:300px}.main{background:url("../images/main_shadow.gif") repeat-x scroll center top #fff;padding:13px 15px 15px;width:605px}.footer{background:url("../images/footer.jpg") no-repeat scroll 0 0 transparent;border-top:1px solid #CCCCCC;font-size:11px;height:88px;line-height:145%;padding:0}#logoTitle{color:#FFFFFF;display:block;font-family:"Trajan Pro";height:30px;outline:none;text-decoration:none}.sub-title{border-top:1px solid #FFFFFF;color:#FFFFFF;font-size:10px;padding:0 3px}#header-navi{background:none repeat scroll 0 0 #FFFFFF;border-bottom:1px solid #A6A6A6}#header-navi ul{margin:0}#header-navi li{float:left;list-style:none;margin-left:0px}#header-navi li a{background:url("../images/menu.gif") no-repeat scroll 0 0 transparent;color:#382E1F;display:block;font-size:11px;height:31px;line-height:31px;margin-left:-10px;outline:none;padding:0 20px;text-decoration:none}#header-navi li a:hover{background-position:0 -31px}#header-navi li a.home{background-position:0 -93px;margin-left:0;padding:0;text-indent:-999em;width:45px}#header-navi li a.home:hover{background-position:0 -124px}#header-navi li a.lastNavi:hover{background-position:0 0}#header-navi li.selected a{background-position:0 -62px}#header-navi li.selected a.home{background-position:0 -155px}#header-navi .page-icon{float:left;height:14px;width:14px;margin:8px 3px 0 0}#statistic{font-size:11px;line-height:31px;margin-right:15px}.footer .copyright{padding:12px;width:857px}.footer .copyright span{margin:0px}.footer .goTop{background:url("../images/icons.gif") no-repeat scroll 0 -304px transparent;color:#2A2A2A;cursor:pointer;line-height:18px;margin:5px 17px 0 0;padding-left:16px;width:22px;white-space:nowrap}.article{padding-bottom:15px;overflow:hidden}.article-title{border-bottom:1px solid #CCCCCC;font-size:16px;margin-top:10px;padding:0 5px 3px}.article-title sup{font-size:12px}.article-title a{color:#4C4C4C;text-decoration:none}.article-title a:hover{color:#2970A6}.article-abstract{line-height:145%;margin:10px 0 10px 5px;word-wrap:break-word}.tagsIcon,.articles-commentIcon,.dateIcon,.article-browserIcon,.authorIcon{background:url("../images/icons.gif") no-repeat scroll 0 -400px transparent;float:left;height:16px;margin-right:6px;width:16px}.tagsIcon{background-position:0 -400px;margin-left:15px}.dateIcon{background-position:0 -48px;margin-left:15px}.authorIcon{background-position:0 0}.articles-commentIcon{background-position:0 -96px}.article-browserIcon{background-position:0 -480px}.content-reset{line-height:145%;padding:5px 0 0 5px}.article-footer{margin:0 5px 10px 5px}.article-relative{line-height:22px;margin-top:24px}.article-relative h4{font-size:12px}.comments{background:none repeat scroll 0 0 #FCFCFC;border-bottom:1px solid #CCCCCC;border-top:1px solid #CCCCCC;margin:15px -15px;padding:0 15px 15px;position:relative}.comment-title{background-color:#E3E9FF;border-top:1px solid #3366CC;padding:3px 12px 3px 12px;position:relative}.comment-body-ref{background-color:#FFFFFF;filter:alpha(opacity=90);left:217px;opacity:0.9;padding:6px;position:absolute;width:605px;z-index:10}.comment-body{margin-top:15px}.comment-author{float:left;text-align:center;width:81px}.comment-author div{background:url("../images/commentpoint.png") no-repeat scroll 100% 33% transparent;margin-top:10px;padding-right:14px}.comment-author img{border:1px solid #999999;height:32px;padding:1px;width:32px}.comment-author a{font-weight:bold;white-space:nowrap;margin-right:14px}.comment-info{background:url("../images/comment.gif") no-repeat scroll 0 0 #EDEFF0;font-size:12px;padding:10px 15px 0;width:494px}.comment-content{background:url("../images/comment.gif") no-repeat scroll 100% 100% transparent;font-size:12px;line-height:145%;margin:0 -15px;overflow:hidden;padding:9px 15px 10px;word-wrap:break-word}.comment-form img{cursor:pointer}.comment-form input,.comment-form textarea{background:url("../images/textfield.gif") repeat-x scroll 50% 0 #fff;border:1px solid #A6A6A6;color:#555555;font-family:Helvetica,Arial,sans-serif;height:16px;outline:none;padding:2px 1px;width:200px}.comment-form textarea{font-size:12px;height:auto;width:601px}.comment-form button{background:none repeat scroll 0 0 #B4D666;border-color:#B4D666 #81B840 #81B840 #B4D666;border-radius:0px;border-style:solid;border-width:1px;color:#2970A6;font-size:12px;height:24px;line-height:24px;padding:0px 6px}.comment-form button:hover{background:none repeat scroll 0 0 #98C64C;border-color:#76B33A #98C64C #98C64C #76B33A;color:#074A7E}.error-msg{color:#3366CC}.side-navi ul{list-style:none;margin-top:10px}.side-navi .item{padding:15px}.side-navi sup{margin-right:3px;color:#555}.side-navi .navi-comments li>img{border:1px solid #999999;height:32px;margin-right:7px;padding:1px;width:32px}.side-navi .navi-comments a{font-weight:bold}.side-navi .navi-comments .side-comment{color:#555555;font-weight:normal;height:18px}.side-navi .navi-comments div.left>div>div{display:none}.side-navi .navi-comments .side-comment img{border:0px;height:16px;margin-right:0px;padding:0px;width:16px}.side-navi .navi-comments li{padding:2px 0}.side-navi .navi-comments li div{overflow:hidden;text-overflow:ellipsis;-o-text-overflow:ellipsis;width:227px}.side-navi a.selected{color:#555555;text-decoration:none}.side-navi ul.navi-tags li,.side-navi .navi-comments li{background-image:none;padding-left:0px}.side-navi ul.navi-tags li img{height:16px;padding-right:6px;width:16px}.side-navi li{background:url("../images/icons.gif") no-repeat scroll 0 -623px transparent;margin:5px 0 0 0;overflow:hidden;padding-left:20px;text-overflow:ellipsis;-o-text-overflow:ellipsis;white-space:nowrap}.side-navi li.aboutMe{white-space:normal}.side-navi .line{background:url("../images/widgetsep.png") no-repeat scroll center bottom transparent;height:6px;width:300px}.pagination{margin:16px;text-align:center}.pagination a,.pagination a:visited{color:#4272DB;padding:0 3px}.pagination a.selected{color:#000000;font-weight:bold}#tagsPanel .tagPanel{border:2px solid;border-radius:6px;cursor:pointer;float:left;margin:3px}#tagsPanel .tagPanel:hover{background-color:#EEEEEE;border:2px dashed}#tagsPanel .tagPanel{text-decoration:none}.error-body{background:url("../images/main_shadow.gif") repeat-x scroll center top #fff;height:400px;padding:12px}.error-title{line-height:72px}.error-panel{margin-left:35px;width:201px}.error-panel a{background-color:#9CD941;border-color:#D0F29D #398A38 #398A38 #D0F29D;border-style:solid;border-width:1px;color:#000000;font-size:14px;font-weight:bold;margin-right:3px;padding:10px 15px;text-decoration:none}.error-panel a:hover{background-color:#ADEb51}.kind-panel{background:url("../images/box.gif") no-repeat scroll 100% 100% #F4F5F7;margin-bottom:10px;padding:8px 12px}.kind-title{background:url("../images/box.gif") no-repeat scroll 0 0 #E3E4E6;border-bottom:1px solid #CCCCCC;font-weight:bold;padding:6px 12px} diff --git a/i-nove/css/i-nove.css b/i-nove/css/base.scss similarity index 96% rename from i-nove/css/i-nove.css rename to i-nove/css/base.scss index a25a047..a426ffc 100644 --- a/i-nove/css/i-nove.css +++ b/i-nove/css/base.scss @@ -20,8 +20,32 @@ * skin i-nove style * * @author Liyuan Li - * @version 1.1.0.0, Sep 21 2017 -*/ + * @version 2.0.0.0, Feb 21, 2019 + */ + +@import "../../../scss/reset-content"; +@import "../../../scss/reset"; +.left { + float: left; +} + +.right { + float: right; +} + +.clear:before, +.clear:after { + display: table; + content: ""; +} + +.clear:after { + clear: both; +} + +.none { + display: none; +} img { max-width: 100%; height: auto; @@ -108,6 +132,9 @@ h5 { #header-navi { background: none repeat scroll 0 0 #FFFFFF; border-bottom: 1px solid #A6A6A6; + ul { + margin: 0; + } } #header-navi li { float: left; @@ -227,7 +254,7 @@ h5 { .article-browserIcon { background-position: 0 -480px; } -.article-body { +.content-reset { line-height: 145%; padding: 5px 0 0 5px; } diff --git a/i-nove/css/i-nove.min.css b/i-nove/css/i-nove.min.css deleted file mode 100644 index 1b4b9bb..0000000 --- a/i-nove/css/i-nove.min.css +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Solo - A small and beautiful blogging system written in Java. - * Copyright (c) 2010-2019, b3log.org & hacpai.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -@charset "utf-8";#header-navi,.header{border-bottom:1px solid #A6A6A6}.side-navi .navi-comments li div,.side-navi li{overflow:hidden;text-overflow:ellipsis;-o-text-overflow:ellipsis}.comment-form img,.footer .goTop{cursor:pointer}img{max-width:100%;height:auto}.bg{background:url(../images/bg.jpg) repeat-x #BEC3C6;color:#555}a,a:active,a:link,a:visited{color:#2970A6;text-decoration:none}a:hover{text-decoration:underline}#header-navi li a,#logoTitle,#tagsPanel .tagPanel,.article-title a,.error-panel a{text-decoration:none}h1{font-size:200%}h4{font-size:160%}h5{font-size:12px}.margin5R{margin-right:5px}.margin5{margin:5px}.wrapper{background:url(../images/light.gif) 50% 0 no-repeat;padding:20px 0}.content{margin:0 auto;width:936px}.header{background:url(../images/header.jpg) no-repeat;height:65px;padding:25px 30px 0}.body{background:url(../images/sidesep.gif) right center repeat-y #FFF;min-height:400px}.side-navi{background:url(../images/sidebar_shadow.gif) 50% 0 repeat-x #F7F7F7;font-size:95%;line-height:145%;padding-top:8px;width:300px}.main{background:url(../images/main_shadow.gif) center top repeat-x #FFF;padding:13px 15px 15px;width:605px}.footer{background:url(../images/footer.jpg) no-repeat;border-top:1px solid #CCC;font-size:11px;height:88px;line-height:145%;padding:0}#logoTitle{color:#FFF;display:block;font-family:"Trajan Pro";height:30px;outline:0}.sub-title{border-top:1px solid #FFF;color:#FFF;font-size:10px;padding:0 3px}#header-navi li a,#statistic{font-size:11px;line-height:31px}#header-navi{background:#FFF}.article-title,.comments{border-bottom:1px solid #CCC}#header-navi li{float:left;list-style:none;margin-left:0}#header-navi li a{background:url(../images/menu.gif) no-repeat;color:#382E1F;display:block;height:31px;margin-left:-10px;outline:0;padding:0 20px}#header-navi li a:hover{background-position:0 -31px}#header-navi li a.home{background-position:0 -93px;margin-left:0;padding:0;text-indent:-999em;width:45px}#header-navi li a.home:hover{background-position:0 -124px}#header-navi li a.lastNavi:hover{background-position:0 0}#header-navi li.selected a{background-position:0 -62px}#header-navi li.selected a.home{background-position:0 -155px}#header-navi .page-icon{float:left;height:14px;width:14px;margin:8px 3px 0 0}#statistic{margin-right:15px}.footer .copyright{padding:12px;width:857px}.footer .copyright span{margin:0}.footer .goTop{background:url(../images/icons.gif) 0 -304px no-repeat;color:#2A2A2A;line-height:18px;margin:5px 17px 0 0;padding-left:16px;width:22px;white-space:nowrap}.article{padding-bottom:15px;overflow:hidden}.article-title{font-size:16px;margin-top:10px;padding:0 5px 3px}.article-relative h4,.article-title sup,.comment-content,.comment-form button,.comment-info{font-size:12px}.article-title a{color:#4C4C4C}.article-title a:hover{color:#2970A6}.article-abstract{line-height:145%;margin:10px 0 10px 5px;word-wrap:break-word}.article-browserIcon,.articles-commentIcon,.authorIcon,.dateIcon,.tagsIcon{background:url(../images/icons.gif) 0 -400px no-repeat;float:left;height:16px;margin-right:6px;width:16px}.tagsIcon{background-position:0 -400px;margin-left:15px}.dateIcon{background-position:0 -48px;margin-left:15px}.authorIcon{background-position:0 0}.articles-commentIcon{background-position:0 -96px}.article-browserIcon{background-position:0 -480px}.article-body{line-height:145%;padding:5px 0 0 5px}.article-footer{margin:0 5px 10px}.article-relative{line-height:22px;margin-top:24px}.comments{background:#FCFCFC;border-top:1px solid #CCC;margin:15px -15px;padding:0 15px 15px;position:relative}.comment-title{background-color:#E3E9FF;border-top:1px solid #36C;padding:3px 12px;position:relative}.comment-body-ref{background-color:#FFF;filter:alpha(opacity=90);left:217px;opacity:.9;padding:6px;position:absolute;width:605px;z-index:10}.comment-body{margin-top:15px}.comment-author{float:left;text-align:center;width:81px}.comment-author div{background:url(../images/commentpoint.png) 100% 33% no-repeat;margin-top:10px;padding-right:14px}.comment-author img{border:1px solid #999;height:32px;padding:1px;width:32px}.comment-author a{font-weight:700;white-space:nowrap;margin-right:14px}.comment-info{background:url(../images/comment.gif) no-repeat #EDEFF0;padding:10px 15px 0;width:494px}.comment-content{background:url(../images/comment.gif) 100% 100% no-repeat;line-height:145%;margin:0 -15px;overflow:hidden;padding:9px 15px 10px;word-wrap:break-word}.comment-form input,.comment-form textarea{background:url(../images/textfield.gif) 50% 0 repeat-x #FFF;border:1px solid #A6A6A6;color:#555;font-family:Helvetica,Arial,sans-serif;height:16px;outline:0;padding:2px 1px;width:200px}.comment-form textarea{font-size:12px;height:auto;width:601px}.comment-form button{background:#B4D666;border-color:#B4D666 #81B840 #81B840 #B4D666;border-radius:0;border-style:solid;border-width:1px;color:#2970A6;height:24px;line-height:24px;padding:0 6px}.comment-form button:hover{background:#98C64C;border-color:#76B33A #98C64C #98C64C #76B33A;color:#074A7E}.error-msg{color:#36C}.side-navi ul{list-style:none;margin-top:10px}.side-navi .item{padding:15px}.side-navi sup{margin-right:3px;color:#555}.side-navi .navi-comments li>img{border:1px solid #999;height:32px;margin-right:7px;padding:1px;width:32px}.side-navi .navi-comments a{font-weight:700}.side-navi .navi-comments .side-comment{color:#555;font-weight:400;height:18px}.side-navi .navi-comments div.left>div>div{display:none}.side-navi .navi-comments .side-comment img{border:0;height:16px;margin-right:0;padding:0;width:16px}.side-navi .navi-comments li{padding:2px 0}.side-navi .navi-comments li div{width:227px}.side-navi a.selected{color:#555;text-decoration:none}.side-navi .navi-comments li,.side-navi ul.navi-tags li{background-image:none;padding-left:0}.side-navi ul.navi-tags li img{height:16px;padding-right:6px;width:16px}.side-navi li{background:url(../images/icons.gif) 0 -623px no-repeat;margin:5px 0 0;padding-left:20px;white-space:nowrap}.side-navi li.aboutMe{white-space:normal}.side-navi .line{background:url(../images/widgetsep.png) center bottom no-repeat;height:6px;width:300px}.pagination{margin:16px;text-align:center}.pagination a,.pagination a:visited{color:#4272DB;padding:0 3px}.error-panel a,.pagination a.selected{color:#000;font-weight:700}#tagsPanel .tagPanel{border:2px solid;border-radius:6px;cursor:pointer;float:left;margin:3px}#tagsPanel .tagPanel:hover{background-color:#EEE;border:2px dashed}.error-body{background:url(../images/main_shadow.gif) center top repeat-x #FFF;height:400px;padding:12px}.error-title{line-height:72px}.error-panel{margin-left:35px;width:201px}.error-panel a{background-color:#9CD941;border-color:#D0F29D #398A38 #398A38 #D0F29D;border-style:solid;border-width:1px;font-size:14px;margin-right:3px;padding:10px 15px}.error-panel a:hover{background-color:#ADEb51}.kind-panel{background:url(../images/box.gif) 100% 100% no-repeat #F4F5F7;margin-bottom:10px;padding:8px 12px}.kind-title{background:url(../images/box.gif) no-repeat #E3E4E6;border-bottom:1px solid #CCC;font-weight:700;padding:6px 12px} \ No newline at end of file diff --git a/i-nove/footer.ftl b/i-nove/footer.ftl index 43318f7..66e1dcb 100644 --- a/i-nove/footer.ftl +++ b/i-nove/footer.ftl @@ -39,22 +39,7 @@ "markedAvailable": ${markedAvailable?c}, "adminLabel": "${adminLabel}", "logoutLabel": "${logoutLabel}", - "skinDirName": "${skinDirName}", - "em00Label": "${em00Label}", - "em01Label": "${em01Label}", - "em02Label": "${em02Label}", - "em03Label": "${em03Label}", - "em04Label": "${em04Label}", - "em05Label": "${em05Label}", - "em06Label": "${em06Label}", - "em07Label": "${em07Label}", - "em08Label": "${em08Label}", - "em09Label": "${em09Label}", - "em10Label": "${em10Label}", - "em11Label": "${em11Label}", - "em12Label": "${em12Label}", - "em13Label": "${em13Label}", - "em14Label": "${em14Label}" + "skinDirName": "${skinDirName}" }; $(document).ready(function () { diff --git a/i-nove/lang/lang_zh_CN.properties b/i-nove/lang/lang_zh_CN.properties index 7d83afc..42c5f5f 100644 --- a/i-nove/lang/lang_zh_CN.properties +++ b/i-nove/lang/lang_zh_CN.properties @@ -188,7 +188,6 @@ permalink1Label=\u94FE\u63A5\uFF1A permalinkLabel=\u94FE\u63A5 welcomeToSoloLabel=\u6B22\u8FCE\u4F7F\u7528 Solo\uFF01 b3logLabel=B3LOG -killBrowserLabel=

\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01

\u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002

\u60A8\u53EF\u4EE5\u4E0B\u8F7D readmoreLabel=\u9605\u8BFB\u66F4\u591A\u00BB readmore2Label=\u9605\u8BFB\u66F4\u591A replyLabel=\u56DE\u590D\u00BB diff --git a/i-nove/macro-head.ftl b/i-nove/macro-head.ftl index 50b83dc..410c898 100644 --- a/i-nove/macro-head.ftl +++ b/i-nove/macro-head.ftl @@ -27,8 +27,7 @@ - - + diff --git a/i-nove/page.ftl b/i-nove/page.ftl index 7385bfb..5f6bca5 100644 --- a/i-nove/page.ftl +++ b/i-nove/page.ftl @@ -37,7 +37,7 @@
-
+
${page.pageContent}
diff --git a/metro-hot/article-list.ftl b/metro-hot/article-list.ftl index 49c70ba..99608a1 100644 --- a/metro-hot/article-list.ftl +++ b/metro-hot/article-list.ftl @@ -57,7 +57,7 @@ ${article.articleTitle} -
+
${article.articleAbstract}
diff --git a/metro-hot/article.ftl b/metro-hot/article.ftl index 5e5d071..4fd7d99 100644 --- a/metro-hot/article.ftl +++ b/metro-hot/article.ftl @@ -98,7 +98,7 @@
-
+
${article.articleContent} <#if "" != article.articleSign.signHTML?trim> ${article.articleSign.signHTML} diff --git a/metro-hot/common-comment.ftl b/metro-hot/common-comment.ftl index 2378a9f..68f3660 100644 --- a/metro-hot/common-comment.ftl +++ b/metro-hot/common-comment.ftl @@ -43,6 +43,6 @@ ${comment.commentDate2?string("yy-MM-dd HH:mm")}
-
${comment.commentContent}
+
${comment.commentContent}
\ No newline at end of file diff --git a/metro-hot/css/base.css b/metro-hot/css/base.css new file mode 100644 index 0000000..1a5abfe --- /dev/null +++ b/metro-hot/css/base.css @@ -0,0 +1,18 @@ +/** + * Solo - A small and beautiful blogging system written in Java. + * Copyright (c) 2010-2019, b3log.org & hacpai.com + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +.content-reset{word-wrap:break-word;overflow:auto;line-height:1.65;font-size:16px;word-break:break-word}.content-reset ul,.content-reset ol{padding-left:2em;margin-top:0;margin-bottom:16px}.content-reset li{margin-top:0.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{padding-bottom:0.3em;font-size:1.7em;border-bottom:1px solid #eee}.content-reset h2{padding-bottom:0.3em;font-size:1.5em;border-bottom:1px solid #eee}.content-reset h3{font-size:1.25em}.content-reset h4{font-size:1em}.content-reset h5{font-size:0.875em}.content-reset h6{font-size:0.85em}.content-reset hr{height:0.15em;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:0.25em solid #ddd;margin-bottom:16px}.content-reset blockquote p{margin:0}.content-reset ins>iframe{border:0}.content-reset iframe{border:1px solid rgba(0,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:bold;text-align:center !important;background:rgba(158,188,226,0.2)}.content-reset tbody tr:nth-child(2n){background:rgba(158,188,226,0.12)}.content-reset tr:hover{background:#efefef}.content-reset code{padding:0.2em 0.4em;margin:0;font-size:85%;background-color:rgba(252,41,41,0.12);border-radius:3px;word-break:break-word}.content-reset pre{position:relative}.content-reset pre textarea{position:absolute;top:-100000px}.content-reset pre>code{padding:0.5em;background-color:rgba(0,0,0,0.04);background-size:20px 20px;border-radius:5px;display:block}.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:solid 1px rgba(0,0,0,0.38);border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.content-reset__task,.content-reset .task-list-item{list-style:none;margin-left:-1em}.img-preview{width:100%;height:100%;top:0;z-index:211;overflow:auto;cursor:zoom-out;transition:background-color .2s ease-in-out}.img-preview img{max-width:inherit;transition:transform .3s ease-in-out}@font-face{font-family:'IcoMoon';src:url("font/IcoMoon.eot");src:url("font/IcoMoon.eot?#iefix") format("embedded-opentype"),url("font/IcoMoon.svg#IcoMoon") format("svg"),url("font/IcoMoon.woff") format("woff"),url("font/IcoMoon.ttf") format("truetype");font-weight:normal;font-style:normal}[data-ico]:before{font-family:'IcoMoon';content:attr(data-ico);speak:none;cursor:pointer}html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{font-family:Verdana, arial, '\5fae\8f6f\96c5\9ed1';font-size:12px;background-color:#292929;min-height:1990px;margin:0;color:#D1D2D1}a{outline:0;text-decoration:none;color:#BDBEBD}a:hover{color:#FFF}a:focus{color:#9E0B0E !important}sub,sup{position:relative;font-size:70%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;font-family:'\5fae\8f6f\96c5\9ed1';outline:none}button,input{line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;vertical-align:top}::selection{background-color:#D5D5D5;color:#FCFCFC}::-moz-selection{background-color:#D5D5D5;color:#FCFCFC}.fn-clear:before,.fn-clear:after{display:table;content:""}.fn-clear:after{clear:both}.fn-left{float:left}.fn-right{float:right}.fn-none{display:none}.fn-ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-wrap:normal}.footer a:hover,.article-relative a:hover,.article-abstract .article-title a:hover,.article-abstract .article-tags a:hover,.content-reset a{text-decoration:underline}.content-reset a:hover{text-decoration:none}.wrapper{height:auto;margin:30px auto 10px;width:1190px}.footer{background-color:#141414;color:#FFF;padding:30px;margin-right:10px}.main{float:left;width:920px}.header{position:relative}.header .title{color:#E61E1E;padding:30px 0}.header .title:hover{color:#CA1B1E}.header .title>span:before{color:inherit}.top-info{font-size:38px;height:46px;line-height:46px}.top-info>hr{background-color:#7B7B7B;border:0 none;display:inline-block;height:42px;margin:2px 10px;padding:0;vertical-align:top;width:1px}.top-info a{color:#FFF}.top-info a:hover{color:#CA1B1E}#showTop{display:none}.sub-nav{background-color:#E61E1E;color:#FFF;padding:30px;margin:30px 0}.sub-nav>h2{float:left;margin:0}.pagination{float:right;margin-top:5px}.pagination>a,.pagination>span{background-color:#EA4040;color:#FFF;padding:6px 7px;text-align:center;font-weight:bold}.pagination>a:hover,.pagination>span{color:#E61E1E;background-color:#FFF}.navigation{background-color:#FFF;border:2px solid #BABABA;left:0;list-style:none outside none;margin:0;min-width:223px;padding:0;position:absolute;top:63px;z-index:1;display:none}.navigation a{background-color:#FFF;border-bottom:1px solid #BABABA;color:#333;display:block;padding:10px 15px}.navigation a:hover{background-color:#E61E1E;color:#FFFFFF}.navigation a.lats{border-bottom-width:0}.navigation .page-icon{float:left;height:14px;width:14px;margin:2px 5px 0 0}.main .pagination{float:none;padding:20px 0 25px;text-align:right;margin-right:10px;line-height:34px}.article-list>div{background-color:#323232;float:left;height:220px;margin:5px 10px 5px 0;overflow:hidden;position:relative;width:450px}.article-abstract{background-color:#3E3E3E;opacity:0.9;filter:alpha(opacity=90);position:absolute;top:0;width:100%;transition:all 1.2s;height:100%}.article-image{top:151px}.article-list>div:hover .article-image{top:0}.article-list>div>img{max-width:100%;transition:all 1.2s;display:block;margin:0 auto}.article-list>div:hover>img{transform:scale(1.2)}.article-date{float:left;margin:10px}.article-title{height:24px;line-height:24px;margin:0 10px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:430px;font-weight:normal}.article-title span{color:#E61E1E}.article-title a{color:#F8F7F7}.article-title sup{color:#9E0B0E}.article-abstract .fn-right{display:none;position:absolute;right:0}.article-abstract:hover .fn-right{display:block}.article-abstract .fn-right>a{background-color:#FFF;color:#E61E1E;float:left;padding:10px;transition:all 0.8s}.article-abstract .fn-right>a:hover{color:#FFF;background-color:#E61E1E}.article-abstract>.article-tags{margin:10px 0 0 10px}.article-abstract>.content-reset{margin:10px;overflow:hidden;white-space:inherit;word-wrap:break-word;padding:10px;height:95px}.side{float:right;width:240px}#search{background-color:#FFF;border:0 none;color:#3A3A3A;height:50px;margin-top:5px;padding:0 10px;width:177px;transition:all 0.3s ease-out 0s}.side form>span{background-color:#FFF;color:#3A3A3A;float:right;font-size:25px;height:32px;margin-top:5px;padding:9px}.side-tile{color:#FFF;float:left;margin-top:20px;padding:15px 25px 15px 25px;position:relative;background-color:#F09609;width:65px;transition:all 0.3s ease-out 0s}.side-tile:hover,.side form input:focus,.form input:focus,.form textarea:focus,.form button:hover,#dynamic .footer:hover{outline:3px solid #BABABA}.side-tile>span{display:block;font-size:60px;text-align:center;width:60px}.side-tile>.title{line-height:17px}.side-tile>.text{font-size:15px;font-weight:bold;left:93px;line-height:30px;position:absolute;top:20px}.side-tile>.text a{color:#FFF}.online-count,.user,.notice-board,.share,.article-relative{width:188px}.translate,.logout,.prev,.prev-disabled{margin-left:10px}.translate{background-color:#2E8BCC}.login,.settings{background-color:#008641}.logout,.register{background-color:#7B4F9D}.next,.prev{background-color:#E61E1E}.next-disabled,.prev-disabled{color:#BDBEBD;background-color:#EA4040}.user{background-color:#393}.user img{margin:0 10px 10px 0;height:60px;width:60px}.online-count,.share{background-color:#20608E}.share div.text{color:#BDBEBD;font-size:43px;font-weight:normal;left:128px;line-height:54px;top:5px;width:105px}.share .text span:hover{color:#FFF}.online-count .text,.article-relative .text{font-size:12px;font-weight:normal;left:104px;line-height:19px;text-align:left;top:12px}.article-relative .text{left:70px;overflow:hidden;top:10px;white-space:nowrap;width:158px;word-break:keep-all}.article-relative .text ul{margin:0}.notice-board{background-color:#2E8BCC;overflow:hidden;height:auto}.user .text,.notice-board .text{top:36px}#goCmt,#goTop{background-color:#141414;bottom:10px;font-size:30px;height:35px;padding:5px 7px;position:fixed;right:30px;width:30px;z-index:10}#goCmt{bottom:55px}.archives{background-color:#323232;padding:10px;margin:5px 10px 30px 0}.archives li{list-style:none;float:left}.archives a{background-color:#E61E1E;color:#FFF;line-height:15px;float:left;margin:10px;padding:10px 15px;white-space:nowrap;transition:all 0.8s}.archives a:hover{background-color:#FFF;color:#E61E1E}.article-header{background-color:#E61E1E;margin:30px 0;padding:20px 30px;position:relative}.article-info{position:absolute;right:0;top:0}.article-info>a{background-color:#FFF;color:#E61E1E;transition:all 0.8s;font-size:14px;float:left;padding:14px;border-bottom:1px solid #FFF;border-left:1px solid #FFF}.article-info>a:hover{background-color:#E61E1E;color:#FFF}.article-header h2{color:#FFF}.article-header h2>span{font-weight:normal;color:#D1D2D1}.article-header .article-date{float:none;margin:0}.content-reset{background-color:#323232;margin-bottom:30px;overflow:hidden;padding:10px;white-space:normal;word-break:break-all;font-size:14px;word-wrap:break-word}.main>.content-reset{margin-right:10px;margin-top:20px}pre.prettyprint{background-color:#F7F7F7}#comments{position:relative}#comments>div{margin-bottom:20px;margin-right:10px}#comments>div.fn-clear>img{width:80px}#comments .content-reset{margin:10px 0;width:800px}#comments .user-name{color:#E61E1E;font-weight:bold}#comments .user-name:hover{color:#CA1B1E}.comment-info a{color:#F8F7F7}.at{font-size:15px;color:#FFF;font-weight:bold}.comment-main{float:right}.comment-body-ref{background-color:#EA4040;left:79px;padding:10px;position:absolute;width:900px;z-index:1}.comment-disabled{background-color:#EA4040;color:#FFFFFF;margin:0 10px 30px 0;padding:5px 20px}.form{width:600px;margin-bottom:30px}.form input,.form textarea{height:30px;margin:5px 10px 5px 0;padding:0 5px;transition:all 0.3s ease-out 0s;width:456px}.form textarea{width:600px;height:300px;margin:0 0 10px}.form button{background-color:#E61E1E;border:0 none;color:#FFFFFF;cursor:pointer;font-size:15px;transition:all 0.3s ease-out 0s;padding:10px 50px}.tip{color:#CA1B1E}#dynamic #comments{background-color:#EA4040;margin-top:5px;padding:25px 15px 15px 25px}#dynamic #comments .content-reset{width:743px}#dynamic .article-relative .text{left:110px}#dynamic .footer{margin:20px 0 10px;float:left;transition:all 0.3s ease-out 0s}.most-comment,.most-view,.links-tile,.tags-tile{position:static;background-color:#F09609;width:535px;margin-top:20px}.most-view{margin-left:20px;background-color:#2E8BCC}.tags-tile{margin-left:20px;background-color:#339933}.links-tile{background-color:#7B4F9D}.tags-tile span,.links-tile span,.most-comment span,.most-view span{font-size:60px}.tags-tile .text,.links-tile .text,.most-comment .text,.most-view .text{position:static;width:430px}.tags-tile a,.links-tile a{background-color:#EA4040;color:#D1D2D1;float:left;font-size:12px;line-height:20px;margin:6px;padding:5px 10px;transition:all 0.8s ease 0s;white-space:nowrap}.tags-tile a:hover,.links-tile a:hover{background-color:#FFF;color:#EA4040}.most-comment .text,.most-view .text{margin-right:20px;line-height:24px}.most-comment .text a:hover,.most-view .text a:hover{text-decoration:underline}.most-comment .text span,.most-view .text span{color:#D1D2D1;font-size:13px;font-weight:normal} diff --git a/metro-hot/css/metro-hot.css b/metro-hot/css/base.scss similarity index 81% rename from metro-hot/css/metro-hot.css rename to metro-hot/css/base.scss index 3ffa1bc..99afa7b 100644 --- a/metro-hot/css/metro-hot.css +++ b/metro-hot/css/base.scss @@ -17,11 +17,13 @@ */ @charset "utf-8"; /* -* skin metro-hot style -* -* @author Liyuan Li -* @version 1.2.1.0, Jan 4, 2019 -*/ + * skin metro-hot style + * + * @author Liyuan Li + * @version 2.0.0.0, Feb 21, 2019 + */ + +@import "../../../scss/reset-content"; /* start base */ @font-face { font-family: 'IcoMoon'; @@ -150,187 +152,6 @@ textarea { color: #FCFCFC; } -/* start article-body */ -.article-body { - word-wrap: break-word; - overflow: auto; - line-height: 1.65; - font-size: 16px; - word-break: break-word; -} - -.article-body ul, -.article-body ol { - padding-left: 2em; - margin-top: 0; - margin-bottom: 16px; -} - -.article-body li { - margin-top: 0.25em; -} - -.article-body img { - cursor: zoom-in; -} - -.article-body img.emoji { - cursor: auto; - max-width: 18px; -} - -.article-body h1, -.article-body h2, -.article-body h3, -.article-body h4, -.article-body h5, -.article-body h6 { - margin-top: 24px; - margin-bottom: 16px; - font-weight: 600; - line-height: 1.25; -} - -.article-body h1 { - padding-bottom: 0.3em; - font-size: 1.7em; - border-bottom: 1px solid #eee; -} - -.article-body h2 { - padding-bottom: 0.3em; - font-size: 1.5em; - border-bottom: 1px solid #eee; -} - -.article-body h3 { - font-size: 1.25em; -} - -.article-body h4 { - font-size: 1em; -} - -.article-body h5 { - font-size: 0.875em; -} - -.article-body h6 { - font-size: 0.85em; -} - -.article-body hr { - height: 0.15em; - padding: 0; - margin: 24px 0; - background-color: #e7e7e7; - border: 0; -} - -.article-body p { - margin-top: 0; - margin-bottom: 16px; -} - -.article-body blockquote { - padding: 0 1em; - color: #777; - border-left: 0.25em solid #ddd; - margin-bottom: 16px; -} - -.article-body blockquote p { - margin: 0; -} - -.article-body ins > iframe { - border: 0; -} - -.article-body iframe { - border: 1px solid rgba(0, 0, 0, 0.38); -} - -.article-body table { - width: 100%; - border: 1px solid #dedede; - margin: 15px auto; - border-collapse: collapse; - empty-cells: show; -} - -.article-body thead { - text-align: center; -} - -.article-body td, -.article-body th { - height: 35px; - border: 1px solid #dedede; - padding: 0 10px; -} - -.article-body th { - font-weight: bold; - text-align: center !important; - background: rgba(158, 188, 226, 0.2); -} - -.article-body tbody tr:nth-child(2n) { - background: rgba(158, 188, 226, 0.12); -} - -.article-body tr:hover { - background: #efefef; -} - -.article-body code { - padding: 0.2em 0.4em; - margin: 0; - font-size: 85%; - background-color: rgba(252, 41, 41, 0.12); - border-radius: 3px; - word-break: break-word; -} - -.article-body pre { - position: relative; -} - -.article-body pre textarea { - position: absolute; - top: -100000px; -} - -.article-body pre > code { - padding: 0.5em; - background-color: rgba(0, 0, 0, 0.04); - background-size: 20px 20px; - border-radius: 5px; - display: block; -} - -.article-body 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: solid 1px rgba(0, 0, 0, 0.38); - border-bottom-color: #bbb; - border-radius: 3px; - box-shadow: inset 0 -1px 0 #bbb; -} - -.article-body__task, -.article-body .task-list-item { - list-style: none; - margin-left: -1em; -} -/* end article-body */ - .fn-clear:before, .fn-clear:after { display: table; @@ -364,11 +185,11 @@ textarea { .article-relative a:hover, .article-abstract .article-title a:hover, .article-abstract .article-tags a:hover, -.article-body a { +.content-reset a { text-decoration: underline; } -.article-body a:hover { +.content-reset a:hover { text-decoration: none; } /* end base */ @@ -616,7 +437,7 @@ textarea { margin: 10px 0 0 10px; } -.article-abstract > .article-body { +.article-abstract > .content-reset { margin: 10px; overflow: hidden; white-space: inherit; @@ -891,7 +712,7 @@ textarea { margin: 0; } -.article-body { +.content-reset { background-color: #323232; margin-bottom: 30px; overflow: hidden; @@ -902,7 +723,7 @@ textarea { word-wrap: break-word; } -.main > .article-body { +.main > .content-reset { margin-right: 10px; margin-top: 20px; } @@ -926,7 +747,7 @@ pre.prettyprint { width: 80px; } -#comments .article-body { +#comments .content-reset { margin: 10px 0; width: 800px; } @@ -1012,7 +833,7 @@ pre.prettyprint { padding: 25px 15px 15px 25px; } -#dynamic #comments .article-body { +#dynamic #comments .content-reset { width: 743px; } diff --git a/metro-hot/css/metro-hot-responsive.css b/metro-hot/css/metro-hot-responsive.css index 6e857b4..699913b 100644 --- a/metro-hot/css/metro-hot-responsive.css +++ b/metro-hot/css/metro-hot-responsive.css @@ -42,15 +42,11 @@ width: 434px; } - .em00, .em01, .em02, .em03, .em04, .em05, .em06, .em07, .em08, .em09, .em10, .em11, .em12, .em13, .em14 { - margin-right: 4px; - } - - #comments .article-body { + #comments .content-reset { width: 340px; } - #dynamic #comments .article-body { + #dynamic #comments .content-reset { width: 283px; } @@ -101,8 +97,7 @@ .sub-nav > .pagination, .footer, - #comments > div > img, - #emotions { + #comments > div > img { display: none; } @@ -124,14 +119,14 @@ } .main .pagination, - .main > .article-body, + .main > .content-reset, .comment-disabled, #comments > div { margin-right: 0; } .side > div, - #comments .article-body { + #comments .content-reset { position: static !important; width: auto !important; } diff --git a/metro-hot/css/metro-hot-responsive.min.css b/metro-hot/css/metro-hot-responsive.min.css deleted file mode 100644 index cea2fbe..0000000 --- a/metro-hot/css/metro-hot-responsive.min.css +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Solo - A small and beautiful blogging system written in Java. - * Copyright (c) 2010-2019, b3log.org & hacpai.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -@media (max-width:860px) and (min-width:460px){.wrapper{width:720px}.main{width:460px}.form{width:auto}.form input{width:395px}.form textarea{width:434px}.em00,.em01,.em02,.em03,.em04,.em05,.em06,.em07,.em08,.em09,.em10,.em11,.em12,.em13,.em14{margin-right:4px}#comments .article-body{width:340px}#dynamic #comments .article-body{width:283px}.most-comment,.most-view{width:300px;margin-bottom:20px;margin-top:40px}.most-comment .text,.most-view .text{width:195px}.archives-tile,.links-tile,.tags-tile{width:670px}.archives-tile .text,.links-tile .text,.tags-tile .text{width:580px}.links-tile,.tags-tile{margin-left:0}}@media (max-width:460px){#comments>div,.archives,.comment-disabled,.main .pagination,.main>.article-body{margin-right:0}.comment-main,.header>.fn-left,.side,.top-info{float:none}.article-list>div,.main,.side,.wrapper{width:300px}#comments>div>img,#emotions,.footer,.sub-nav>.pagination{display:none}#search{width:237px}.side-tile{width:94px}.article-relative,.notice-board,.online-count,.share,.user{width:249px}#comments .article-body,.side>div{position:static!important;width:auto!important}.share div.text{left:173px}.form{width:auto}.form input{width:240px}.form textarea{width:285px;height:150px}#dynamic .main{margin-bottom:20px}.tags-tile{margin-bottom:50px}.article-title{width:280px}.article-info>a{padding:3px;font-size:12px}#dynamic #comments{padding-left:15px}.links-tile .title,.most-comment .title,.most-view .title,.tags-tile .title{float:right;font-size:15px;font-weight:700;margin:20px 0 0 40px}.most-comment,.most-view{width:249px;margin-left:0}.most-comment .text,.most-view .text{margin-right:0;width:274px;font-size:12px;font-weight:400}.links-tile,.tags-tile{width:249px;margin-left:0}.links-tile .text,.tags-tile .text{width:249px}} \ No newline at end of file diff --git a/metro-hot/css/metro-hot.min.css b/metro-hot/css/metro-hot.min.css deleted file mode 100644 index d466c36..0000000 --- a/metro-hot/css/metro-hot.min.css +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Solo - A small and beautiful blogging system written in Java. - * Copyright (c) 2010-2019, b3log.org & hacpai.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -@charset "utf-8";.article-body pre,sub,sup{position:relative}.article-title,.fn-ellipsis{text-overflow:ellipsis;white-space:nowrap}@font-face{font-family:IcoMoon;src:url(font/IcoMoon.eot);src:url(font/IcoMoon.eot?#iefix) format('embedded-opentype'),url(font/IcoMoon.svg#IcoMoon) format('svg'),url(font/IcoMoon.woff) format('woff'),url(font/IcoMoon.ttf) format('truetype');font-weight:400;font-style:normal}[data-ico]:before{font-family:IcoMoon;content:attr(data-ico);speak:none;cursor:pointer}html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{font-family:Verdana,arial,'\5fae\8f6f\96c5\9ed1';font-size:12px;background-color:#292929;min-height:1990px;margin:0;color:#D1D2D1}a{outline:0;text-decoration:none;color:#BDBEBD}a:hover{color:#FFF}a:focus{color:#9E0B0E!important}sub,sup{font-size:70%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;font-family:'\5fae\8f6f\96c5\9ed1';outline:0}button,input{line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}.article-body h1,.article-body 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]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;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;vertical-align:top}::selection{background-color:#D5D5D5;color:#FCFCFC}::-moz-selection{background-color:#D5D5D5;color:#FCFCFC}.article-body{line-height:1.65}.article-body ol,.article-body ul{padding-left:2em;margin-top:0;margin-bottom:16px}.article-body li{margin-top:.25em}.article-body img{cursor:zoom-in}.article-body img.emoji{cursor:auto;max-width:18px}.article-body h1,.article-body h2,.article-body h3,.article-body h4,.article-body h5,.article-body h6{margin-top:24px;margin-bottom:16px;font-weight:600;line-height:1.25}.article-body h1{font-size:1.7em}.article-body h2{font-size:1.5em}.article-body h3{font-size:1.25em}.article-body h4{font-size:1em}.article-body h5{font-size:.875em}.article-body h6{font-size:.85em}.article-body hr{height:.15em;padding:0;margin:24px 0;background-color:#e7e7e7;border:0}.article-body p{margin-top:0;margin-bottom:16px}.article-body blockquote{padding:0 1em;color:#777;border-left:.25em solid #ddd;margin-bottom:16px}.article-body blockquote p{margin:0}.article-body ins>iframe{border:0}.article-body iframe{border:1px solid rgba(0,0,0,.38)}.article-body table{width:100%;border:1px solid #dedede;margin:15px auto;border-collapse:collapse;empty-cells:show}.article-body thead{text-align:center}.article-body td,.article-body th{height:35px;border:1px solid #dedede;padding:0 10px}.article-body th{font-weight:700;text-align:center!important;background:rgba(158,188,226,.2)}.article-body tbody tr:nth-child(2n){background:rgba(158,188,226,.12)}.article-body tr:hover{background:#efefef}.article-body code{padding:.2em .4em;margin:0;font-size:85%;background-color:rgba(252,41,41,.12);border-radius:3px;word-break:break-word}.article-body pre textarea{position:absolute;top:-100000px}.article-body pre>code{padding:.5em;background-color:rgba(0,0,0,.04);background-size:20px 20px;border-radius:5px;display:block}.article-body 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}.article-body .task-list-item,.article-body__task{list-style:none;margin-left:-1em}.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-ellipsis{overflow:hidden;word-wrap:normal}.article-abstract .article-tags a:hover,.article-abstract .article-title a:hover,.article-body a,.article-relative a:hover,.footer a:hover{text-decoration:underline}.article-body a:hover{text-decoration:none}.wrapper{height:auto;margin:30px auto 10px;width:1190px}.footer{background-color:#141414;color:#FFF;padding:30px;margin-right:10px}.main{float:left;width:920px}.header{position:relative}.header .title{color:#E61E1E;padding:30px 0}.header .title:hover{color:#CA1B1E}.header .title>span:before{color:inherit}.top-info{font-size:38px;height:46px;line-height:46px}.top-info>hr{background-color:#7B7B7B;border:0;display:inline-block;height:42px;margin:2px 10px;padding:0;vertical-align:top;width:1px}#showTop,.navigation{display:none}.top-info a{color:#FFF}.top-info a:hover{color:#CA1B1E}.sub-nav{background-color:#E61E1E;color:#FFF;padding:30px;margin:30px 0}.sub-nav>h2{float:left;margin:0}.pagination{float:right;margin-top:5px}.pagination>a,.pagination>span{background-color:#EA4040;color:#FFF;padding:6px 7px;text-align:center;font-weight:700}.pagination>a:hover,.pagination>span{color:#E61E1E;background-color:#FFF}.navigation{background-color:#FFF;border:2px solid #BABABA;left:0;list-style:none;margin:0;min-width:223px;padding:0;position:absolute;top:63px;z-index:1}.navigation a{background-color:#FFF;border-bottom:1px solid #BABABA;color:#333;display:block;padding:10px 15px}.navigation a:hover{background-color:#E61E1E;color:#FFF}.navigation a.lats{border-bottom-width:0}.navigation .page-icon{float:left;height:14px;width:14px;margin:2px 5px 0 0}.main .pagination{float:none;padding:20px 0 25px;text-align:right;margin-right:10px;line-height:34px}.article-list>div{background-color:#323232;float:left;height:220px;margin:5px 10px 5px 0;overflow:hidden;position:relative;width:450px}.article-abstract{background-color:#3E3E3E;opacity:.9;filter:alpha(opacity=90);position:absolute;top:0;width:100%;transition:all 1.2s;height:100%}.article-image{top:151px}.article-list>div:hover .article-image{top:0}.article-list>div>img{max-width:100%;transition:all 1.2s;display:block;margin:0 auto}.article-list>div:hover>img{transform:scale(1.2)}.article-date{float:left;margin:10px}.article-title{height:24px;line-height:24px;margin:0 10px;overflow:hidden;width:430px;font-weight:400}.article-title span{color:#E61E1E}.article-title a{color:#F8F7F7}.article-title sup{color:#9E0B0E}.article-abstract .fn-right{display:none;position:absolute;right:0}.article-abstract:hover .fn-right{display:block}.article-abstract .fn-right>a{background-color:#FFF;color:#E61E1E;float:left;padding:10px;transition:all .8s}#search,.side-tile{transition:all .3s ease-out 0s}.article-abstract .fn-right>a:hover{color:#FFF;background-color:#E61E1E}.article-abstract>.article-tags{margin:10px 0 0 10px}.article-abstract>.article-body{margin:10px;overflow:hidden;white-space:inherit;word-wrap:break-word;padding:10px;height:95px}#search,.side form>span{background-color:#FFF;color:#3A3A3A;margin-top:5px}.side{float:right;width:240px}#search{border:0;height:50px;padding:0 10px;width:177px}.side form>span{float:right;font-size:25px;height:32px;padding:9px}.side-tile,.side-tile>.text a{color:#FFF}.side-tile{float:left;margin-top:20px;padding:15px 25px;position:relative;background-color:#F09609;width:65px}.archives a,.article-info>a{transition:all .8s;float:left}#dynamic .footer:hover,.form button:hover,.form input:focus,.form textarea:focus,.side form input:focus,.side-tile:hover{outline:#BABABA solid 3px}.side-tile>span{display:block;font-size:60px;text-align:center;width:60px}.side-tile>.title{line-height:17px}.side-tile>.text{font-size:15px;font-weight:700;left:93px;line-height:30px;position:absolute;top:20px}.article-relative,.notice-board,.online-count,.share,.user{width:188px}.logout,.prev,.prev-disabled,.translate{margin-left:10px}.translate{background-color:#2E8BCC}.login,.settings{background-color:#008641}.logout,.register{background-color:#7B4F9D}.next,.prev{background-color:#E61E1E}.next-disabled,.prev-disabled{color:#BDBEBD;background-color:#EA4040}.user{background-color:#393}.user img{margin:0 10px 10px 0;height:60px;width:60px}.online-count,.share{background-color:#20608E}.share div.text{color:#BDBEBD;font-size:43px;font-weight:400;left:128px;line-height:54px;top:5px;width:105px}.share .text span:hover{color:#FFF}.article-relative .text,.online-count .text{font-size:12px;font-weight:400;left:104px;line-height:19px;text-align:left;top:12px}.article-relative .text{left:70px;overflow:hidden;top:10px;white-space:nowrap;width:158px;word-break:keep-all}.article-relative .text ul{margin:0}.notice-board{background-color:#2E8BCC;overflow:hidden;height:auto}.notice-board .text,.user .text{top:36px}#goCmt,#goTop{background-color:#141414;bottom:10px;font-size:30px;height:35px;padding:5px 7px;position:fixed;right:30px;width:30px;z-index:10}#goCmt{bottom:55px}.archives{background-color:#323232;padding:10px;margin:5px 10px 30px 0}.archives li{list-style:none;float:left}.archives a{background-color:#E61E1E;color:#FFF;line-height:15px;margin:10px;padding:10px 15px;white-space:nowrap}.archives a:hover{background-color:#FFF;color:#E61E1E}.article-header{background-color:#E61E1E;margin:30px 0;padding:20px 30px;position:relative}.article-info{position:absolute;right:0;top:0}.article-info>a{background-color:#FFF;color:#E61E1E;font-size:14px;padding:14px;border-bottom:1px solid #FFF;border-left:1px solid #FFF}#dynamic .footer,.form button,.form input,.form textarea{transition:all .3s ease-out 0s}.article-info>a:hover{background-color:#E61E1E;color:#FFF}.article-header h2{color:#FFF}.article-header h2>span{font-weight:400;color:#D1D2D1}.article-header .article-date{float:none;margin:0}.article-body{background-color:#323232;margin-bottom:30px;overflow:hidden;padding:10px;white-space:normal;word-break:break-all;font-size:14px;word-wrap:break-word}.at,.form button{font-size:15px;color:#FFF}.main>.article-body{margin-right:10px;margin-top:20px}pre.prettyprint{background-color:#F7F7F7}#comments{position:relative}#comments>div{margin-bottom:20px;margin-right:10px}#comments>div.fn-clear>img{width:80px}#comments .article-body{margin:10px 0;width:800px}#comments .user-name{color:#E61E1E;font-weight:700}#comments .user-name:hover{color:#CA1B1E}.comment-info a{color:#F8F7F7}.at{font-weight:700}.comment-main{float:right}.comment-body-ref{background-color:#EA4040;left:79px;padding:10px;position:absolute;width:900px;z-index:1}.comment-disabled{background-color:#EA4040;color:#FFF;margin:0 10px 30px 0;padding:5px 20px}.form{width:600px;margin-bottom:30px}.form input,.form textarea{height:30px;margin:5px 10px 5px 0;padding:0 5px;width:456px}.form textarea{width:600px;height:300px;margin:0 0 10px}.form button{background-color:#E61E1E;border:0;cursor:pointer;padding:10px 50px}.tip{color:#CA1B1E}#dynamic #comments{background-color:#EA4040;margin-top:5px;padding:25px 15px 15px 25px}#dynamic #comments .article-body{width:743px}#dynamic .article-relative .text{left:110px}#dynamic .footer{margin:20px 0 10px;float:left}.links-tile,.most-comment,.most-view,.tags-tile{position:static;background-color:#F09609;width:535px;margin-top:20px}.most-view{margin-left:20px;background-color:#2E8BCC}.tags-tile{margin-left:20px;background-color:#393}.links-tile{background-color:#7B4F9D}.links-tile span,.most-comment span,.most-view span,.tags-tile span{font-size:60px}.links-tile .text,.most-comment .text,.most-view .text,.tags-tile .text{position:static;width:430px}.links-tile a,.tags-tile a{background-color:#EA4040;color:#D1D2D1;float:left;font-size:12px;line-height:20px;margin:6px;padding:5px 10px;transition:all .8s ease 0s;white-space:nowrap}.links-tile a:hover,.tags-tile a:hover{background-color:#FFF;color:#EA4040}.most-comment .text,.most-view .text{margin-right:20px;line-height:24px}.most-comment .text a:hover,.most-view .text a:hover{text-decoration:underline}.most-comment .text span,.most-view .text span{color:#D1D2D1;font-size:13px;font-weight:400} \ No newline at end of file diff --git a/metro-hot/dynamic.ftl b/metro-hot/dynamic.ftl index 3b16fd9..60c78bc 100644 --- a/metro-hot/dynamic.ftl +++ b/metro-hot/dynamic.ftl @@ -60,7 +60,7 @@ ${comment.commentDate?string("yy-MM-dd HH:mm")}   
-
${comment.commentContent}
+
${comment.commentContent}
@@ -206,7 +206,7 @@ <#include "footer.ftl"/> diff --git a/metro-hot/js/metro-hot.js b/metro-hot/js/metro-hot.js index 5548c7f..76a930d 100644 --- a/metro-hot/js/metro-hot.js +++ b/metro-hot/js/metro-hot.js @@ -118,7 +118,7 @@ var MetroHot = { $(".side > div").css("position", "static"); } } else { - if (y + Util.getWinHeight() > $(".side > div").height() + MetroHot.headerH) { + if (y + $(window).height() > $(".side > div").height() + MetroHot.headerH) { $(".side > div").css({ "position": "fixed", "top": "auto", @@ -175,7 +175,7 @@ var MetroHot = { share: function() { var title = encodeURIComponent($("title").text()), url = window.location.href, - pic = $(".article-body img").attr("src"); + pic = $(".content-reset img").attr("src"); var urls = {}; urls.tencent = "http://share.v.t.qq.com/index.php?c=share&a=index&title=" + title + "&url=" + url + "&pic=" + pic; diff --git a/metro-hot/js/metro-hot.min.js b/metro-hot/js/metro-hot.min.js index 7e036f0..cb39d3c 100644 --- a/metro-hot/js/metro-hot.min.js +++ b/metro-hot/js/metro-hot.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 MetroHot={headerH:$("#header").height()+30+($("#header > div").get(1)?30:0),responsiveType:"large",goTranslate:function(){window.open("http://translate.google.com/translate?sl=auto&tl=auto&u="+location.href)},init:function(){var t="";$("#admin a").each(function(){-1<$(this).attr("href").indexOf("/logout")&&(t=$(this).attr("href"))}),$("#logout, .logout").attr("href",t),$(".header .title, .navigation").mouseover(function(){$(".navigation").show()}).mouseout(function(){$(".navigation").hide()}),$(".header .title").click(function(){window.location.href=latkeConfig.servePath});var e=$("#top > span").first().text();$(".online-count .text").append(e.substr(1,e.length));var i=$("#admin").data("login");if(i?($(".user .text").html($("#admin > span").text()),$(".login, .register, #login, #register, .logout, .settings").hide()):$(".login, .register, .user, .clear, .logout, .settings, #logout, #settings").hide(),1===$("#dynamic").length)return $(window).scroll(function(){$(window).scrollTop()>MetroHot.headerH?$("#goTop").fadeIn("slow"):$("#goTop").hide()}).click(function(t){"title"!==t.target.className&&"title"!==t.target.parentElement.className&&$(".navigation").slideUp()}),void $("body").css("min-height","inherit");$("#login, .login").attr("href",$("#admin > a").first().attr("href")),$(window).scroll(function(){var t=$(window).scrollTop();t>MetroHot.headerH?i?$(".logout, .settings").show():$(".login, .register").show():i?$(".logout, .settings").hide():$(".login, .register").hide(),t>MetroHot.headerH?$("#goTop").fadeIn("slow"):$("#goTop").hide(),$(".side > div").height()<620?t>MetroHot.headerH?$(".side > div").css({position:"fixed",top:"0px",width:"240px"}):$(".side > div").css("position","static"):t+Util.getWinHeight()>$(".side > div").height()+MetroHot.headerH?$(".side > div").css({position:"fixed",top:"auto",bottom:"10px",width:"240px"}):$(".side > div").css("position","static")}).click(function(t){"title"!==t.target.className&&"title"!==t.target.parentElement.className&&$(".navigation").slideUp()}).resize(function(){var t=window.innerWidth,e="large";460"))})},loadImg:function(t){t.style.marginTop=(220-t.height)/2+"px"},share:function(){var t=encodeURIComponent($("title").text()),e=window.location.href,i=$(".article-body img").attr("src"),o={};o.tencent="http://share.v.t.qq.com/index.php?c=share&a=index&title="+t+"&url="+e+"&pic="+i,o.sina="http://v.t.sina.com.cn/share/share.php?title="+t+"&url="+e+"&pic="+i,o.google="https://plus.google.com/share?url="+e,o.twitter="https://twitter.com/intent/tweet?status="+t+" "+e,$(".share span").click(function(){var t=$(this).attr("title").toLowerCase();window.open(o[t],"_blank","top=100,left=200,width=648,height=618")})},loadRandomArticles:function(){$.ajax({url:latkeConfig.servePath+"/articles/random",type:"POST",success:function(t,e){var i=t.randomArticles;if(i&&0!==i.length){for(var o="",a=0;a"+l+""}var n="
    "+o+"
";$("#randomArticles .text").append(n)}else $("#randomArticles").remove()}})},loadRelevantArticles:function(t){$.ajax({url:latkeConfig.servePath+"/article/id/"+t+"/relevant/articles",type:"GET",success:function(t,e){var i=t.relevantArticles;if(i&&0!==i.length){for(var o="",a=0;a"+l+""}var n="
    "+o+"
";$("#relevantArticles .text").append(n)}else $("#relevantArticles").remove()},error:function(){$("#relevantArticles").remove()}})},loadExternalRelevantArticles:function(t){var e=this.tips;try{$.ajax({url:"http://rhythm.b3log.org:80/get-articles-by-tags.do?tags="+t+"&blogHost="+e.blogHost+"&paginationPageSize="+e.externalRelevantArticlesDisplayCount,type:"GET",cache:!0,dataType:"jsonp",error:function(){$("#externalRelevantArticles").remove()},success:function(t,e){var i=t.articles;if(i&&0!==i.length){for(var o="",a=0;a"+l+""}var n="
    "+o+"
";$("#externalRelevantArticles .text").append(n)}else $("#externalRelevantArticles").remove()}})}catch(t){$("#externalRelevantArticles").remove()}},goCmt:function(){$("html, body").animate({scrollTop:$(".comment-disabled").get(0).offsetTop})}};MetroHot.init(),Util.killIE(),0<$(".article-header").length?MetroHot.share():MetroHot.initArticleList(); \ No newline at end of file +var MetroHot={headerH:$("#header").height()+30+($("#header > div").get(1)?30:0),responsiveType:"large",goTranslate:function(){window.open("http://translate.google.com/translate?sl=auto&tl=auto&u="+location.href)},init:function(){var t="";$("#admin a").each(function(){-1<$(this).attr("href").indexOf("/logout")&&(t=$(this).attr("href"))}),$("#logout, .logout").attr("href",t),$(".header .title, .navigation").mouseover(function(){$(".navigation").show()}).mouseout(function(){$(".navigation").hide()}),$(".header .title").click(function(){window.location.href=latkeConfig.servePath});var e=$("#top > span").first().text();$(".online-count .text").append(e.substr(1,e.length));var i=$("#admin").data("login");if(i?($(".user .text").html($("#admin > span").text()),$(".login, .register, #login, #register, .logout, .settings").hide()):$(".login, .register, .user, .clear, .logout, .settings, #logout, #settings").hide(),1===$("#dynamic").length)return $(window).scroll(function(){$(window).scrollTop()>MetroHot.headerH?$("#goTop").fadeIn("slow"):$("#goTop").hide()}).click(function(t){"title"!==t.target.className&&"title"!==t.target.parentElement.className&&$(".navigation").slideUp()}),void $("body").css("min-height","inherit");$("#login, .login").attr("href",$("#admin > a").first().attr("href")),$(window).scroll(function(){var t=$(window).scrollTop();t>MetroHot.headerH?i?$(".logout, .settings").show():$(".login, .register").show():i?$(".logout, .settings").hide():$(".login, .register").hide(),t>MetroHot.headerH?$("#goTop").fadeIn("slow"):$("#goTop").hide(),$(".side > div").height()<620?t>MetroHot.headerH?$(".side > div").css({position:"fixed",top:"0px",width:"240px"}):$(".side > div").css("position","static"):t+$(window).height()>$(".side > div").height()+MetroHot.headerH?$(".side > div").css({position:"fixed",top:"auto",bottom:"10px",width:"240px"}):$(".side > div").css("position","static")}).click(function(t){"title"!==t.target.className&&"title"!==t.target.parentElement.className&&$(".navigation").slideUp()}).resize(function(){var t=window.innerWidth,e="large";460"))})},loadImg:function(t){t.style.marginTop=(220-t.height)/2+"px"},share:function(){var t=encodeURIComponent($("title").text()),e=window.location.href,i=$(".content-reset img").attr("src"),o={};o.tencent="http://share.v.t.qq.com/index.php?c=share&a=index&title="+t+"&url="+e+"&pic="+i,o.sina="http://v.t.sina.com.cn/share/share.php?title="+t+"&url="+e+"&pic="+i,o.google="https://plus.google.com/share?url="+e,o.twitter="https://twitter.com/intent/tweet?status="+t+" "+e,$(".share span").click(function(){var t=$(this).attr("title").toLowerCase();window.open(o[t],"_blank","top=100,left=200,width=648,height=618")})},loadRandomArticles:function(){$.ajax({url:latkeConfig.servePath+"/articles/random",type:"POST",success:function(t,e){var i=t.randomArticles;if(i&&0!==i.length){for(var o="",r=0;r"+n+""}var l="
    "+o+"
";$("#randomArticles .text").append(l)}else $("#randomArticles").remove()}})},loadRelevantArticles:function(t){$.ajax({url:latkeConfig.servePath+"/article/id/"+t+"/relevant/articles",type:"GET",success:function(t,e){var i=t.relevantArticles;if(i&&0!==i.length){for(var o="",r=0;r"+n+""}var l="
    "+o+"
";$("#relevantArticles .text").append(l)}else $("#relevantArticles").remove()},error:function(){$("#relevantArticles").remove()}})},loadExternalRelevantArticles:function(t){var e=this.tips;try{$.ajax({url:"http://rhythm.b3log.org:80/get-articles-by-tags.do?tags="+t+"&blogHost="+e.blogHost+"&paginationPageSize="+e.externalRelevantArticlesDisplayCount,type:"GET",cache:!0,dataType:"jsonp",error:function(){$("#externalRelevantArticles").remove()},success:function(t,e){var i=t.articles;if(i&&0!==i.length){for(var o="",r=0;r"+n+""}var l="
    "+o+"
";$("#externalRelevantArticles .text").append(l)}else $("#externalRelevantArticles").remove()}})}catch(t){$("#externalRelevantArticles").remove()}},goCmt:function(){$("html, body").animate({scrollTop:$(".comment-disabled").get(0).offsetTop})}};MetroHot.init(),Util.killIE(),0<$(".article-header").length?MetroHot.share():MetroHot.initArticleList(); \ No newline at end of file diff --git a/metro-hot/lang/lang_zh_CN.properties b/metro-hot/lang/lang_zh_CN.properties index c715766..284162c 100644 --- a/metro-hot/lang/lang_zh_CN.properties +++ b/metro-hot/lang/lang_zh_CN.properties @@ -81,4 +81,3 @@ randomArticlesLabel=\u968F\u673A\u9605\u8BFB externalRelevantArticlesLabel=\u7AD9\u5916\u9605\u8BFB captchaErrorLabel=\u9A8C\u8BC1\u7801\u9519\u8BEF b3logLabel=B3LOG -killBrowserLabel=

\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01

\u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002

\u60A8\u53EF\u4EE5\u4E0B\u8F7D diff --git a/metro-hot/macro-head.ftl b/metro-hot/macro-head.ftl index 23ce8c7..c84f424 100644 --- a/metro-hot/macro-head.ftl +++ b/metro-hot/macro-head.ftl @@ -29,7 +29,7 @@ - + diff --git a/metro-hot/page.ftl b/metro-hot/page.ftl index 96a102e..6dbb3be 100644 --- a/metro-hot/page.ftl +++ b/metro-hot/page.ftl @@ -47,7 +47,7 @@
-
+
${page.pageContent}
<@comments commentList=pageComments article=page> diff --git a/mobile/article.ftl b/mobile/article.ftl index 635882f..6e01c5d 100644 --- a/mobile/article.ftl +++ b/mobile/article.ftl @@ -66,8 +66,8 @@
-
-
+
+
${article.articleContent} <#if "" != article.articleSign.signHTML?trim>
diff --git a/mobile/common-comment.ftl b/mobile/common-comment.ftl index 2eecb80..beeb94e 100644 --- a/mobile/common-comment.ftl +++ b/mobile/common-comment.ftl @@ -40,7 +40,7 @@
-
+

${comment.commentContent}

diff --git a/mobile/footer.ftl b/mobile/footer.ftl index bab0b64..827be62 100644 --- a/mobile/footer.ftl +++ b/mobile/footer.ftl @@ -39,22 +39,7 @@ var Label = { "markedAvailable": ${markedAvailable?c}, - "skinDirName": "${skinDirName}", - "em00Label": "${em00Label}", - "em01Label": "${em01Label}", - "em02Label": "${em02Label}", - "em03Label": "${em03Label}", - "em04Label": "${em04Label}", - "em05Label": "${em05Label}", - "em06Label": "${em06Label}", - "em07Label": "${em07Label}", - "em08Label": "${em08Label}", - "em09Label": "${em09Label}", - "em10Label": "${em10Label}", - "em11Label": "${em11Label}", - "em12Label": "${em12Label}", - "em13Label": "${em13Label}", - "em14Label": "${em14Label}" + "skinDirName": "${skinDirName}" }; $(document).ready(function () { diff --git a/mobile/lang/lang_zh_CN.properties b/mobile/lang/lang_zh_CN.properties index 97ab37e..e183e39 100644 --- a/mobile/lang/lang_zh_CN.properties +++ b/mobile/lang/lang_zh_CN.properties @@ -192,7 +192,6 @@ removeUnusedTagsLabel=\u79FB\u9664\u672A\u4F7F\u7528\u6807\u7B7E goTopLabel=\u9876\u90E8 permalink1Label=\u94FE\u63A5\uFF1A permalinkLabel=\u94FE\u63A5 -killBrowserLabel=

\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01

\u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002

\u60A8\u53EF\u4EE5\u4E0B\u8F7D readmoreLabel=\u9605\u8BFB\u66F4\u591A\u00BB readmore2Label=\u9605\u8BFB\u66F4\u591A replyLabel=\u56DE\u590D\u00BB diff --git a/mobile/page.ftl b/mobile/page.ftl index 3c449de..bd98abb 100644 --- a/mobile/page.ftl +++ b/mobile/page.ftl @@ -31,7 +31,7 @@ <#include "header.ftl">
-
+
${page.pageContent}
<@comments commentList=pageComments article=page> diff --git a/mobile/themes/default/style.css b/mobile/themes/default/style.css index 2f96a00..008cc3b 100644 --- a/mobile/themes/default/style.css +++ b/mobile/themes/default/style.css @@ -74,187 +74,6 @@ blockquote { margin: 5px 15px; } -/* start article-body */ -.article-body { - word-wrap: break-word; - overflow: auto; - line-height: 1.65; - font-size: 16px; - word-break: break-word; -} - -.article-body ul, -.article-body ol { - padding-left: 2em; - margin-top: 0; - margin-bottom: 16px; -} - -.article-body li { - margin-top: 0.25em; -} - -.article-body img { - cursor: zoom-in; -} - -.article-body img.emoji { - cursor: auto; - max-width: 18px; -} - -.article-body h1, -.article-body h2, -.article-body h3, -.article-body h4, -.article-body h5, -.article-body h6 { - margin-top: 24px; - margin-bottom: 16px; - font-weight: 600; - line-height: 1.25; -} - -.article-body h1 { - padding-bottom: 0.3em; - font-size: 1.7em; - border-bottom: 1px solid #eee; -} - -.article-body h2 { - padding-bottom: 0.3em; - font-size: 1.5em; - border-bottom: 1px solid #eee; -} - -.article-body h3 { - font-size: 1.25em; -} - -.article-body h4 { - font-size: 1em; -} - -.article-body h5 { - font-size: 0.875em; -} - -.article-body h6 { - font-size: 0.85em; -} - -.article-body hr { - height: 0.15em; - padding: 0; - margin: 24px 0; - background-color: #e7e7e7; - border: 0; -} - -.article-body p { - margin-top: 0; - margin-bottom: 16px; -} - -.article-body blockquote { - padding: 0 1em; - color: #777; - border-left: 0.25em solid #ddd; - margin-bottom: 16px; -} - -.article-body blockquote p { - margin: 0; -} - -.article-body ins > iframe { - border: 0; -} - -.article-body iframe { - border: 1px solid rgba(0, 0, 0, 0.38); -} - -.article-body table { - width: 100%; - border: 1px solid #dedede; - margin: 15px auto; - border-collapse: collapse; - empty-cells: show; -} - -.article-body thead { - text-align: center; -} - -.article-body td, -.article-body th { - height: 35px; - border: 1px solid #dedede; - padding: 0 10px; -} - -.article-body th { - font-weight: bold; - text-align: center !important; - background: rgba(158, 188, 226, 0.2); -} - -.article-body tbody tr:nth-child(2n) { - background: rgba(158, 188, 226, 0.12); -} - -.article-body tr:hover { - background: #efefef; -} - -.article-body code { - padding: 0.2em 0.4em; - margin: 0; - font-size: 85%; - background-color: rgba(252, 41, 41, 0.12); - border-radius: 3px; - word-break: break-word; -} - -.article-body pre { - position: relative; -} - -.article-body pre textarea { - position: absolute; - top: -100000px; -} - -.article-body pre > code { - padding: 0.5em; - background-color: rgba(0, 0, 0, 0.04); - background-size: 20px 20px; - border-radius: 5px; - display: block; -} - -.article-body 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: solid 1px rgba(0, 0, 0, 0.38); - border-bottom-color: #bbb; - border-radius: 3px; - box-shadow: inset 0 -1px 0 #bbb; -} - -.article-body__task, -.article-body .task-list-item { - list-style: none; - margin-left: -1em; -} -/* end article-body */ - .clearer { clear: both; } diff --git a/next/article-list.ftl b/next/article-list.ftl index a00cfd2..3f1b0ed 100644 --- a/next/article-list.ftl +++ b/next/article-list.ftl @@ -52,7 +52,7 @@   |  ${viewsLabel} ${article.articleViewCount}ยฐC
-
+
${article.articleAbstract}
diff --git a/next/article.ftl b/next/article.ftl index 1d3c168..7e1d35f 100644 --- a/next/article.ftl +++ b/next/article.ftl @@ -87,7 +87,7 @@
-
+
${article.articleContent} <#if "" != article.articleSign.signHTML?trim>
@@ -146,6 +146,6 @@ <#if 0 != relevantArticlesDisplayCount> page.loadRelevantArticles('${article.oId}', '

${relevantArticles1Label}

'); - + diff --git a/next/common-comment.ftl b/next/common-comment.ftl index 3adebb1..66a470c 100644 --- a/next/common-comment.ftl +++ b/next/common-comment.ftl @@ -40,7 +40,7 @@ ${replyLabel}
-
+
${comment.commentContent}
diff --git a/next/css/base.css b/next/css/base.css new file mode 100644 index 0000000..9977601 --- /dev/null +++ b/next/css/base.css @@ -0,0 +1,18 @@ +/** + * Solo - A small and beautiful blogging system written in Java. + * Copyright (c) 2010-2019, b3log.org & hacpai.com + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +.content-reset{word-wrap:break-word;overflow:auto;line-height:1.65;font-size:16px;word-break:break-word}.content-reset ul,.content-reset ol{padding-left:2em;margin-top:0;margin-bottom:16px}.content-reset li{margin-top:0.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{padding-bottom:0.3em;font-size:1.7em;border-bottom:1px solid #eee}.content-reset h2{padding-bottom:0.3em;font-size:1.5em;border-bottom:1px solid #eee}.content-reset h3{font-size:1.25em}.content-reset h4{font-size:1em}.content-reset h5{font-size:0.875em}.content-reset h6{font-size:0.85em}.content-reset hr{height:0.15em;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:0.25em solid #ddd;margin-bottom:16px}.content-reset blockquote p{margin:0}.content-reset ins>iframe{border:0}.content-reset iframe{border:1px solid rgba(0,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:bold;text-align:center !important;background:rgba(158,188,226,0.2)}.content-reset tbody tr:nth-child(2n){background:rgba(158,188,226,0.12)}.content-reset tr:hover{background:#efefef}.content-reset code{padding:0.2em 0.4em;margin:0;font-size:85%;background-color:rgba(252,41,41,0.12);border-radius:3px;word-break:break-word}.content-reset pre{position:relative}.content-reset pre textarea{position:absolute;top:-100000px}.content-reset pre>code{padding:0.5em;background-color:rgba(0,0,0,0.04);background-size:20px 20px;border-radius:5px;display:block}.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:solid 1px rgba(0,0,0,0.38);border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.content-reset__task,.content-reset .task-list-item{list-style:none;margin-left:-1em}.img-preview{width:100%;height:100%;top:0;z-index:211;overflow:auto;cursor:zoom-out;transition:background-color .2s ease-in-out}.img-preview img{max-width:inherit;transition:transform .3s ease-in-out}html{background-color:#f5f5f5}body{margin:0;font-family:Lato, "PingFang SC", "Microsoft YaHei", sans-serif;font-size:14px;color:#555;background:#fff}a{color:#555;text-decoration:none;border-bottom:1px solid #999}a:active,a:hover{outline:0}a:hover{color:#222;border-bottom-color:#222}hr{margin:40px 0;height:3px;border:none;background-color:#ddd;background-image:repeating-linear-gradient(-45deg, #fff, #fff 4px, transparent 4px, transparent 8px)}blockquote{padding:0 15px;color:#666;border-left:4px solid #ddd}img{max-width:100%;height:auto}.fn-clear:before,.fn-clear:after{display:table;content:"";line-height:0}.fn-clear:after{clear:both;line-height:0}.fn-left{float:left}.fn-right{float:right}.fn-none{display:none}@font-face{font-family:'icomoon';src:url("fonts/icomoon.eot?a0psdo");src:url("fonts/icomoon.eot?a0psdo#iefix") format("embedded-opentype"),url("fonts/icomoon.ttf?a0psdo") format("truetype"),url("fonts/icomoon.woff?a0psdo") format("woff"),url("fonts/icomoon.svg?a0psdo#icomoon") format("svg");font-weight:normal;font-style:normal}[class^="icon-"],[class*=" icon-"]{font-family:'icomoon' !important;speak:none;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon-register:before{content:"\e973"}.icon-setting:before{content:"\e994"}.icon-login:before{content:"\ea13"}.icon-logout:before{content:"\ea14"}.icon-rss:before{content:"\e901"}.form{width:100%;margin-top:50px}.form input,.form textarea,.form button{border:1px solid #CCCCCC;background-color:#FAFAFA;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,0.075) inset;padding:7px 8px;width:100%;box-sizing:border-box;outline:none}.form button{width:auto}.form input:focus,.form textarea:focus{background-color:#FFF;box-shadow:0 1px 2px rgba(0,0,0,0.075) inset,0 0 5px rgba(81,167,232,0.5);border:1px solid #51A7E8}.error-msg{color:#9EABB3;margin-right:10px}.wrapper{max-width:700px;min-width:600px;margin:0 auto;padding:0 10px}.main{position:relative;top:-50px;opacity:0}.header{background:#f5f5f5;margin-bottom:80px;padding:40px 0px}.logo-wrap{float:left;overflow:hidden;top:0;opacity:0}.logo-line-before,.logo-line-after{display:block;overflow:hidden;margin:0 auto;width:75%}.logo-line-before i,.logo-line-after i{position:relative;display:block;height:2px;background:#222;left:-100%}.logo-line-after i{left:auto;right:-100%}.logo-wrap .site-title{font-size:22px;font-weight:bolder;opacity:0;top:-10px;position:relative}.logo-wrap>a{position:relative;display:inline-block;padding:2px 1px;color:#222;line-height:2;border-bottom:none;font-family:Lato, "PingFang SC", "Microsoft YaHei", sans-serif}.site-nav-toggle{display:none}.menu{float:left;margin:5px 0 0 20px;padding:0 20px;opacity:0}.menu .menu-item{display:inline-block}.menu .menu-item a{padding:5px 10px;border:none;transition-property:background;transition-duration:0.2s;transition-timing-function:ease-in-out;transition-delay:0s}.menu .menu-item a:hover{background:#e1e1e1}.menu .page-icon{float:left;height:14px;width:14px;margin:4px -4px 0 0}.site-search{float:right;margin-top:15px}.site-search input{padding:3px;border:none;padding-left:18px;border-radius:0;width:140px;background:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/PjwhRE9DVFlQRSBzdmcgIFBVQkxJQyAnLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4nICAnaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkJz48c3ZnIGhlaWdodD0iMTZweCIgaWQ9IkxheWVyXzEiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDE2IDE2OyIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIDAgMTYgMTYiIHdpZHRoPSIxNnB4IiB4bWw6c3BhY2U9InByZXNlcnZlIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj48cGF0aCBkPSJNMTUuNywxNC4zbC0zLjEwNS0zLjEwNUMxMy40NzMsMTAuMDI0LDE0LDguNTc2LDE0LDdjMC0zLjg2Ni0zLjEzNC03LTctN1MwLDMuMTM0LDAsN3MzLjEzNCw3LDcsNyAgYzEuNTc2LDAsMy4wMjQtMC41MjcsNC4xOTQtMS40MDVMMTQuMywxNS43YzAuMTg0LDAuMTg0LDAuMzgsMC4zLDAuNywwLjNjMC41NTMsMCwxLTAuNDQ3LDEtMUMxNiwxNC43ODEsMTUuOTQ2LDE0LjU0NiwxNS43LDE0LjN6ICAgTTIsN2MwLTIuNzYyLDIuMjM4LTUsNS01czUsMi4yMzgsNSw1cy0yLjIzOCw1LTUsNVMyLDkuNzYyLDIsN3oiLz48L3N2Zz4=") no-repeat 0 50%;background-size:12px 12px;outline:none;border-bottom:1px solid #999;opacity:0.5}.site-search input:focus{opacity:1}.footer{margin-top:80px;padding:10px 20px;background:#f5f5f5;color:#666;line-height:2}.sidebar-toggle{position:fixed;right:50px;bottom:45px;width:15px;height:15px;padding:5px;background:#222;line-height:0;z-index:1050;cursor:pointer;-webkit-transform:translateZ(0)}.sidebar-toggle.has-toc .sidebar-toggle-line{background:#87daff}.sidebar-toggle-line{position:relative;display:inline-block;vertical-align:top;height:2px;width:100%;background:#fff;margin-top:4px;transition-duration:0.2s;transition-timing-function:ease-in-out;transition-delay:0s}.sidebar-toggle-line:first-child{margin-top:0}.sidebar-toggle:hover .sidebar-toggle-line-first{width:50%;transform:rotateZ(-45deg);top:3px}.sidebar-toggle:hover .sidebar-toggle-line-middle{width:90%}.sidebar-toggle:hover .sidebar-toggle-line-last{width:50%;transform:rotateZ(45deg);top:-3px}.sidebar-toggle.sidebar-active .sidebar-toggle-line-first{width:100%;transform:rotateZ(-45deg);top:6px}.sidebar-toggle.sidebar-active .sidebar-toggle-line-middle{opacity:0}.sidebar-toggle.sidebar-active .sidebar-toggle-line-last{width:100%;transform:rotateZ(45deg);top:-6px}.back-to-top{position:fixed;bottom:19px;right:50px;z-index:1050;width:15px;height:13px;padding:5px;background:#222;color:#fff;cursor:pointer;-webkit-transform:translateZ(0)}.back-to-top:before{display:block;content:" ";margin-top:2px;width:0;height:0;border-width:0 7px 8px 7px;border-color:transparent transparent #fff transparent;border-style:solid}.sidebar{overflow:auto;width:320px;position:fixed;right:-320px;top:0;bottom:0;z-index:1040;box-shadow:inset 0 2px 6px #000;background:#222;-webkit-transform:translateZ(0);padding:20px 10px;color:#999;text-align:center;box-sizing:border-box}.sidebar::-webkit-scrollbar{display:none}.sidebar a{color:#999;border-bottom-color:#555}.sidebar a:hover{color:#eee}.sidebar .site-author-image{display:block;margin:20px auto 0;max-width:96px;height:auto;border:2px solid #333;padding:2px}.sidebar .site-author-name{margin:5px 0 0;color:#f5f5f5}.sidebar .site-description{margin-top:5px;font-size:14px;color:#555}.sidebar .site-state-item{display:inline-block;padding:0 15px;border-left:1px solid #333}.sidebar .site-state-item:first-child{border-left:none}.sidebar .site-state-item a{border-bottom:none}.sidebar .site-state-item-count{display:block;text-align:center;font-size:18px}.sidebar .site-state-item-name{font-size:13px}.sidebar .feed-link{margin-top:20px}.sidebar .feed-link a{display:inline-block;padding:3px 15px;color:#fc6423;border:1px solid #fc6423;border-radius:4px}.sidebar .feed-link a:hover{color:#fff;background:#fc6423}.sidebar .links-of-author{margin-top:20px}.sidebar .links-of-author a{display:inline-block;vertical-align:middle;margin-right:10px;margin-bottom:10px;border-bottom-color:#555;font-size:13px}.sidebar .links-of-author a:before{display:inline-block;vertical-align:middle;margin-right:3px;content:" ";width:4px;height:4px;border-radius:50%;background:#0dd5ff}.sidebar .b3-solo-list{margin:20px;list-style:none;text-align:left;padding:0;font-size:14px;line-height:2}.sidebar .b3-solo-list li.current a{color:#87daff}.sidebar section{opacity:0;position:relative;overflow:auto}.sidebar>ul>li{display:inline-block;cursor:pointer;border-bottom:1px solid transparent;font-size:14px;color:#555}.sidebar>ul>li:hover{color:#f5f5f5}.sidebar>ul>li.current{color:#87daff;border-bottom-color:#87daff}.sidebar>ul>li:last-child{margin-left:10px}.posts-expand .post-item{margin-top:120px}.posts-expand .post-item:first-child{margin-top:0}.post-title-link{display:inline-block;position:relative;color:#555;border-bottom:none;line-height:1.2;vertical-align:top;font-size:26px;font-weight:400}.post-title-link::before{content:"";position:absolute;width:100%;height:2px;bottom:0;left:0;background-color:#000;visibility:hidden;transform:scaleX(0);transition-duration:0.2s;transition-timing-function:ease-in-out;transition-delay:0s}.post-title-link:hover::before{visibility:visible;transform:scaleX(1)}.posts-expand .post-meta{margin:3px 0 60px 0;color:#999;font-size:12px}.post-more-link a{color:#666;border:none;border-bottom:2px solid #666;transition-property:border}.post-more-link a:hover{border-bottom-color:#222}.pagination{border-top:1px solid #eee;margin:120px 0 0;text-align:left}.pagination .next,.pagination .page-number{display:inline-block;position:relative;top:-1px;margin:0 5px;padding:0 10px;line-height:30px;border-bottom:0;border-top:1px solid #eee;transition-property:border-color;transition-duration:0.2s;transition-timing-function:ease-in-out;transition-delay:0s}.pagination .next:hover,.pagination .page-number:hover{border-top-color:#222}.pagination .page-number.current{color:#fff;background:#ccc;border-top-color:#ccc}.post-header{text-align:center}.post-body{word-wrap:break-word}.post-body img{box-sizing:border-box;margin:auto}.posts-expand .post-tags{margin-top:40px}.posts-expand .post-tags a{padding:1px 5px;background:#f5f5f5;border-bottom:none}.posts-expand .post-tags a:hover{background:#ccc}.posts-expand .post-nav{margin-top:40px;overflow:hidden;padding:10px;white-space:nowrap;border-top:1px solid #eee}.post-nav-item a:hover{color:#222;border-bottom:none}.post-nav-item a{position:relative;display:inline-block;line-height:25px;font-size:14px;color:#555;border-bottom:none;width:50%}#externalRelevantArticles h4{margin-bottom:0}#externalRelevantArticles ul{margin-top:5px}.content-reset{text-align:justify}.content-reset p{margin:0 0 25px 0}ul.comments{padding:0;list-style:none;margin-top:50px;position:relative}ul.comments li{padding:10px;white-space:normal;word-wrap:break-word;position:relative;border-bottom:#EBF2F6 1px solid}ul.comments li:hover{background-color:#F7F7F7}ul.comments .avatar-48{position:absolute;box-shadow:0 0 2px #ddd;height:48px;width:48px;margin:8px 10px 0 0;border-radius:24px}ul.comments .comment-body{margin:8px 0 0 60px;min-height:50px}ul.comments li.comment-body-ref{position:absolute;z-index:10;background-color:#EBF2F6;border:#d5dbde 1px solid;width:80%;left:69px}ul.comments .comment-meta{font-family:"Open Sans","Microsoft Yahei",Helvetica;color:#9eabb3;font-size:13px}ul.comments .comment-meta a{color:#9EABB3;text-decoration:none;border-bottom-width:0}ul.comments .post-meta a:hover{text-decoration:underline}ul.comments .comment-meta time{border-left:1px solid #d5dbde;margin-left:8px;padding-left:12px}.tag-cloud{text-align:center}.tag-cloud ul.tag-cloud-tags{padding-left:0}#tags li{list-style:none;display:inline-block;margin:10px}#tags .tags1{font-size:12px;color:#CCC}#tags .tags2{font-size:16px;color:#999}#tags .tags3{font-size:21px;color:#6f6f6f}#tags .tags4{font-size:24px;color:#333}#tags .tags5{font-size:30px;color:#111}.posts-collapse .collection-title::before{content:" ";position:absolute;left:0;top:50%;margin-left:-4px;margin-top:-4px;width:8px;height:8px;background:#bbb;border-radius:50%}.posts-collapse .collection-title{position:relative;margin:60px 0}.posts-collapse .collection-title h2{margin-left:20px}.posts-collapse .collection-title small{color:#bbb}.posts-collapse .post-header::before{content:" ";position:absolute;left:0;top:12px;width:6px;height:6px;margin-left:-4px;background:#bbb;border-radius:50%;border:1px solid #fff;transition-duration:0.2s;transition-timing-function:ease-in-out;transition-delay:0s;transition-property:background}.posts-collapse .post-header{position:relative;transition-duration:0.2s;transition-timing-function:ease-in-out;transition-delay:0s;transition-property:border;border-bottom:1px dashed #ccc;text-align:left}.posts-collapse .post-header:hover{border-bottom-color:#666}.posts-collapse .post-header:hover::before{background:#222}.posts-collapse .post-time{position:absolute;font-size:12px;left:20px;top:8px}.posts-collapse .post-title{margin-left:70px;font-size:16px;font-weight:normal;font-family:Lato, "PingFang SC", "Microsoft YaHei", sans-serif;line-height:inherit;text-decoration:none;border-bottom:0;color:#666}.page-archive .archive-page-counter{position:relative;top:7px;left:20px;margin-bottom:50px;display:block}.page-archive .posts-collapse .archive-move-on{position:absolute;top:11px;left:0;margin-left:-6px;width:10px;height:10px;opacity:0.5;background:#555;border:1px solid #fff;border-radius:50%}.page-archive .post-title{margin-left:20px}.page-archive .posts-collapse .post-header::before{top:8px}.page-archive .posts-collapse::after{top:20px;left:0;margin-left:-2px;width:4px;height:100%;background:#f5f5f5;z-index:-1;content:" ";position:absolute}@media (max-width: 1000px){.sidebar-toggle,.sidebar{display:none}body{padding-right:0 !important}}@media (max-width: 700px){.page-archive .posts-collapse .archive-move-on{margin-left:5px}.posts-collapse{margin-left:10px}.page-archive .archive-page-counter{margin-right:10px}.site-nav-toggle{display:block;margin-top:16px}.logo-line-before,.logo-line-after,.menu,.site-search,.back-to-top{display:none}.header{margin-bottom:50px;padding:5px 0px}.header-line{position:relative;top:52px;height:1px;width:100%;background-color:#ddd;display:none}.wrapper{min-width:inherit}.btn-bar{display:block;width:22px;height:2px;background:#555;border-radius:1px}.btn-bar+.btn-bar{margin-top:4px}.menu{width:100%;margin:0 0 0 -20px;padding:0 5px;line-height:26px}.menu .menu-item{display:block}.menu .page-icon{margin:6px -4px 0px 10px}.footer{text-align:center;font-size:12px;padding:10px 0}.footer .fn-right{float:none}} diff --git a/next/css/next.css b/next/css/base.scss similarity index 86% rename from next/css/next.css rename to next/css/base.scss index 083ddd1..e966bbd 100644 --- a/next/css/next.css +++ b/next/css/base.scss @@ -20,8 +20,10 @@ * skin next style * * @author Liyuan Li - * @version 0.6.1.0, Jan 4, 2019 -*/ + * @version 2.0.0.0, Feb 21, 2019 + */ + +@import "../../../scss/reset-content"; /* start reset */ html { background-color: #f5f5f5; @@ -634,170 +636,6 @@ img { } /* end list*/ -/* start article */ -.article-body { - font-family: "Helvetica Neue","Luxi Sans","DejaVu Sans",Tahoma,"Hiragino Sans GB","Microsoft Yahei",sans-serif; - word-wrap: break-word; - overflow: hidden; - line-height: 1.5 -} - -.article-body img { - cursor: pointer; -} - -.article-body img.emoji { - cursor: auto; - max-width: 18px; -} - -.article-body ul,.article-body ol { - padding-left: 2em; - margin-top: 0; - margin-bottom: 16px -} - -.article-body li { - margin-top: 0.25em; -} - -.article-body h1,.article-body h2,.article-body h3,.article-body h4,.article-body h5,.article-body h6 { - margin-top: 24px; - margin-bottom: 16px; - font-weight: 600; - line-height: 1.25 -} - -.article-body h1 { - padding-bottom: 0.3em; - font-size: 2em -} - -.article-body h2 { - padding-bottom: 0.3em; - font-size: 1.5em -} - -.article-body h3 { - font-size: 1.25em -} - -.article-body h4 { - font-size: 1em -} - -.article-body h5 { - font-size: 0.875em -} - -.article-body h6 { - font-size: 0.85em -} - -.article-body p { - margin-top: 0; - margin-bottom: 16px -} - -.article-body hr { - height: 0.15em; - padding: 0; - margin: 24px 0; - background-color: #e7e7e7; - border: 0; -} - -.article-body blockquote { - padding: 0 1em; - color: #777; - border-left: 0.25em solid #ddd; - margin: 1em 0; -} - -.article-body blockquote p { - margin: 0 -} - -.article-body ins > iframe { - border: 0; -} - -.article-body iframe { - border: 1px solid #ccc -} - -.article-body table { - width: 100%; - border: 1px solid #dedede; - margin: 15px auto; - border-collapse: collapse; - empty-cells: show -} - -.article-body thead { - text-align: center -} - -.article-body td,.article-body th { - height: 35px; - border: 1px solid #dedede; - padding: 0 10px -} - -.article-body th { - font-weight: bold; - text-align: center !important; - background: rgba(158,188,226,0.2) -} - -.article-body tbody tr:nth-child(2n) { - background: rgba(158,188,226,0.12) -} - -.article-body tr:hover { - background: #efefef -} - -.article-body code { - padding: 0.2em 0.4em; - margin: 0; - font-size: 85%; - background-color: rgba(252,41,41,0.12); - border-radius: 3px; - color: #d23f31; - font-family: mononoki,Consolas,"Liberation Mono",Menlo,Courier,monospace -} - -.article-body pre>code { - padding: 0.5em; - color: #333; - background-color: rgba(0,0,0,0.04); - background-image: url(../images/code-bg.png); - background-size: 20px 20px; - border-radius: 5px; - display: block; -} - -.article-body 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: solid 1px #ccc; - border-bottom-color: #bbb; - border-radius: 3px; - box-shadow: inset 0 -1px 0 #bbb -} - -.article-body__task, -.article-body .task-list-item { - list-style: none; - margin-left: -1em; -} - .post-header { text-align: center; } @@ -850,11 +688,11 @@ img { margin-top: 5px; } -.article-body { +.content-reset { text-align: justify; } -.article-body p { +.content-reset p { margin: 0 0 25px 0; } /* end article */ diff --git a/next/css/next.min.css b/next/css/next.min.css deleted file mode 100644 index fac80d3..0000000 --- a/next/css/next.min.css +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Solo - A small and beautiful blogging system written in Java. - * Copyright (c) 2010-2019, b3log.org & hacpai.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -@charset "utf-8";a,body{color:#555}.article-body,.post-body,ul.comments li{word-wrap:break-word}.menu .menu-item a,.pagination .next,.pagination .page-number,.post-title-link::before,.posts-collapse .post-header,.posts-collapse .post-header::before,.sidebar-toggle-line{transition-duration:.2s;transition-timing-function:ease-in-out;transition-delay:0s}html{background-color:#f5f5f5}body{margin:0;font-family:Lato,"PingFang SC","Microsoft YaHei",sans-serif;font-size:14px;background:#fff}a{text-decoration:none;border-bottom:1px solid #999}a:active,a:hover{outline:0}a:hover{color:#222;border-bottom-color:#222}hr{margin:40px 0;height:3px;border:none;background-color:#ddd;background-image:repeating-linear-gradient(-45deg,#fff,#fff 4px,transparent 4px,transparent 8px)}blockquote{padding:0 15px;color:#666;border-left:4px solid #ddd}img{max-width:100%;height:auto}.fn-clear:after,.fn-clear:before{display:table;content:"";line-height:0}.fn-clear:after{clear:both;line-height:0}.fn-left{float:left}.fn-right{float:right}.fn-none{display:none}@font-face{font-family:icomoon;src:url(fonts/icomoon.eot?a0psdo);src:url(fonts/icomoon.eot?a0psdo#iefix) format('embedded-opentype'),url(fonts/icomoon.ttf?a0psdo) format('truetype'),url(fonts/icomoon.woff?a0psdo) format('woff'),url(fonts/icomoon.svg?a0psdo#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-register:before{content:"\e973"}.icon-setting:before{content:"\e994"}.icon-login:before{content:"\ea13"}.icon-logout:before{content:"\ea14"}.icon-rss:before{content:"\e901"}.form{width:100%;margin-top:50px}.form button,.form input,.form textarea{border:1px solid #CCC;background-color:#FAFAFA;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.075) inset;padding:7px 8px;width:100%;box-sizing:border-box;outline:0}.form button{width:auto}.form input:focus,.form textarea:focus{background-color:#FFF;box-shadow:0 1px 2px rgba(0,0,0,.075) inset,0 0 5px rgba(81,167,232,.5);border:1px solid #51A7E8}.error-msg{color:#9EABB3;margin-right:10px}.wrapper{max-width:700px;min-width:600px;margin:0 auto;padding:0 10px}.main{position:relative;top:-50px;opacity:0}.header{background:#f5f5f5;margin-bottom:80px;padding:40px 0}.logo-wrap{float:left;overflow:hidden;top:0;opacity:0}.logo-line-after,.logo-line-before{display:block;overflow:hidden;margin:0 auto;width:75%}.logo-line-after i,.logo-line-before i{position:relative;display:block;height:2px;background:#222;left:-100%}.logo-line-after i{left:auto;right:-100%}.logo-wrap .site-title{font-size:22px;font-weight:bolder;opacity:0;top:-10px;position:relative}.logo-wrap>a{position:relative;display:inline-block;padding:2px 1px;color:#222;line-height:2;border-bottom:none;font-family:Lato,"PingFang SC","Microsoft YaHei",sans-serif}.site-nav-toggle{display:none}.menu .menu-item,.sidebar-toggle-line{display:inline-block}.menu{float:left;margin:5px 0 0 20px;padding:0 20px;opacity:0}.menu .menu-item a{padding:5px 10px;border:none;transition-property:background}.menu .menu-item a:hover{background:#e1e1e1}.menu .page-icon{float:left;height:14px;width:14px;margin:4px -4px 0 0}.site-search{float:right;margin-top:15px}.site-search input{padding:3px 3px 3px 18px;border:none;border-radius:0;width:140px;background:url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/PjwhRE9DVFlQRSBzdmcgIFBVQkxJQyAnLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4nICAnaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkJz48c3ZnIGhlaWdodD0iMTZweCIgaWQ9IkxheWVyXzEiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDE2IDE2OyIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIDAgMTYgMTYiIHdpZHRoPSIxNnB4IiB4bWw6c3BhY2U9InByZXNlcnZlIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj48cGF0aCBkPSJNMTUuNywxNC4zbC0zLjEwNS0zLjEwNUMxMy40NzMsMTAuMDI0LDE0LDguNTc2LDE0LDdjMC0zLjg2Ni0zLjEzNC03LTctN1MwLDMuMTM0LDAsN3MzLjEzNCw3LDcsNyAgYzEuNTc2LDAsMy4wMjQtMC41MjcsNC4xOTQtMS40MDVMMTQuMywxNS43YzAuMTg0LDAuMTg0LDAuMzgsMC4zLDAuNywwLjNjMC41NTMsMCwxLTAuNDQ3LDEtMUMxNiwxNC43ODEsMTUuOTQ2LDE0LjU0NiwxNS43LDE0LjN6ICAgTTIsN2MwLTIuNzYyLDIuMjM4LTUsNS01czUsMi4yMzgsNSw1cy0yLjIzOCw1LTUsNVMyLDkuNzYyLDIsN3oiLz48L3N2Zz4=) 0 50% no-repeat;background-size:12px 12px;outline:0;border-bottom:1px solid #999;opacity:.5}.site-search input:focus{opacity:1}.footer{margin-top:80px;padding:10px 20px;background:#f5f5f5;color:#666;line-height:2}.back-to-top,.sidebar-toggle{right:50px;z-index:1050;padding:5px;cursor:pointer}.sidebar-toggle{position:fixed;bottom:45px;width:15px;height:15px;background:#222;line-height:0;-webkit-transform:translateZ(0)}.sidebar-toggle.has-toc .sidebar-toggle-line{background:#87daff}.sidebar-toggle-line{position:relative;vertical-align:top;height:2px;width:100%;background:#fff;margin-top:4px}.sidebar-toggle-line:first-child{margin-top:0}.sidebar-toggle:hover .sidebar-toggle-line-first{width:50%;transform:rotateZ(-45deg);top:3px}.sidebar-toggle:hover .sidebar-toggle-line-middle{width:90%}.sidebar-toggle:hover .sidebar-toggle-line-last{width:50%;transform:rotateZ(45deg);top:-3px}.sidebar-toggle.sidebar-active .sidebar-toggle-line-first{width:100%;transform:rotateZ(-45deg);top:6px}.sidebar-toggle.sidebar-active .sidebar-toggle-line-middle{opacity:0}.sidebar-toggle.sidebar-active .sidebar-toggle-line-last{width:100%;transform:rotateZ(45deg);top:-6px}.back-to-top,.sidebar{position:fixed;background:#222;-webkit-transform:translateZ(0)}.back-to-top{bottom:19px;width:15px;height:13px;color:#fff}.back-to-top:before{display:block;content:" ";margin-top:2px;width:0;height:0;border-width:0 7px 8px;border-color:transparent transparent #fff;border-style:solid}.sidebar{overflow:auto;width:320px;right:-320px;top:0;bottom:0;z-index:1040;box-shadow:inset 0 2px 6px #000;padding:20px 10px;color:#999;text-align:center;box-sizing:border-box}.sidebar::-webkit-scrollbar{display:none}.sidebar a{color:#999;border-bottom-color:#555}.sidebar a:hover{color:#eee}.sidebar .site-author-image{display:block;margin:20px auto 0;max-width:96px;height:auto;border:2px solid #333;padding:2px}.sidebar .site-author-name{margin:5px 0 0;color:#f5f5f5}.sidebar .site-description{margin-top:5px;font-size:14px;color:#555}.sidebar .feed-link,.sidebar .links-of-author{margin-top:20px}.sidebar .site-state-item{display:inline-block;padding:0 15px;border-left:1px solid #333}.sidebar .site-state-item:first-child{border-left:none}.sidebar .site-state-item a{border-bottom:none}.sidebar .site-state-item-count{display:block;text-align:center;font-size:18px}.sidebar .site-state-item-name{font-size:13px}.sidebar .feed-link a{display:inline-block;padding:3px 15px;color:#fc6423;border:1px solid #fc6423;border-radius:4px}.sidebar .feed-link a:hover{color:#fff;background:#fc6423}.sidebar .links-of-author a{display:inline-block;vertical-align:middle;margin-right:10px;margin-bottom:10px;border-bottom-color:#555;font-size:13px}.sidebar .links-of-author a:before{display:inline-block;vertical-align:middle;margin-right:3px;content:" ";width:4px;height:4px;border-radius:50%;background:#0dd5ff}.sidebar .b3-solo-list{margin:20px;list-style:none;text-align:left;padding:0;font-size:14px;line-height:2}.sidebar .b3-solo-list li.current a{color:#87daff}.sidebar section{opacity:0;position:relative;overflow:auto}.sidebar>ul>li{display:inline-block;cursor:pointer;border-bottom:1px solid transparent;font-size:14px;color:#555}.sidebar>ul>li:hover{color:#f5f5f5}.sidebar>ul>li.current{color:#87daff;border-bottom-color:#87daff}.sidebar>ul>li:last-child{margin-left:10px}.posts-expand .post-item{margin-top:120px}.posts-expand .post-item:first-child{margin-top:0}.post-title-link{display:inline-block;position:relative;color:#555;border-bottom:none;line-height:1.2;vertical-align:top;font-size:26px;font-weight:400}.post-title-link::before{content:"";position:absolute;width:100%;height:2px;bottom:0;left:0;background-color:#000;visibility:hidden;transform:scaleX(0)}.post-title-link:hover::before{visibility:visible;transform:scaleX(1)}.posts-expand .post-meta{margin:3px 0 60px;color:#999;font-size:12px}.post-more-link a{color:#666;border:none;border-bottom:2px solid #666;transition-property:border}.post-more-link a:hover{border-bottom-color:#222}.pagination{border-top:1px solid #eee;margin:120px 0 0;text-align:left}.pagination .next,.pagination .page-number{display:inline-block;position:relative;top:-1px;margin:0 5px;padding:0 10px;line-height:30px;border-bottom:0;border-top:1px solid #eee;transition-property:border-color}.pagination .next:hover,.pagination .page-number:hover{border-top-color:#222}.pagination .page-number.current{color:#fff;background:#ccc;border-top-color:#ccc}.article-body{font-family:"Helvetica Neue","Luxi Sans","DejaVu Sans",Tahoma,"Hiragino Sans GB","Microsoft Yahei",sans-serif;overflow:hidden;line-height:1.5}.article-body img{cursor:pointer}.article-body img.emoji{cursor:auto;max-width:18px}.article-body ol,.article-body ul{padding-left:2em;margin-top:0;margin-bottom:16px}.article-body li{margin-top:.25em}.article-body h1,.article-body h2,.article-body h3,.article-body h4,.article-body h5,.article-body h6{margin-top:24px;margin-bottom:16px;font-weight:600;line-height:1.25}.article-body h1{padding-bottom:.3em;font-size:2em}.article-body h2{padding-bottom:.3em;font-size:1.5em}.article-body h3{font-size:1.25em}.article-body h4{font-size:1em}.article-body h5{font-size:.875em}.article-body h6{font-size:.85em}.article-body p{margin-top:0;margin-bottom:16px}.article-body hr{height:.15em;padding:0;margin:24px 0;background-color:#e7e7e7;border:0}.article-body blockquote{padding:0 1em;color:#777;border-left:.25em solid #ddd;margin:1em 0}.article-body blockquote p{margin:0}.article-body ins>iframe{border:0}.article-body iframe{border:1px solid #ccc}.article-body table{width:100%;border:1px solid #dedede;margin:15px auto;border-collapse:collapse;empty-cells:show}.article-body thead{text-align:center}.article-body td,.article-body th{height:35px;border:1px solid #dedede;padding:0 10px}.article-body th{font-weight:700;text-align:center!important;background:rgba(158,188,226,.2)}.article-body tbody tr:nth-child(2n){background:rgba(158,188,226,.12)}.article-body tr:hover{background:#efefef}.article-body code{padding:.2em .4em;margin:0;font-size:85%;background-color:rgba(252,41,41,.12);border-radius:3px;color:#d23f31;font-family:mononoki,Consolas,"Liberation Mono",Menlo,Courier,monospace}.article-body pre>code{padding:.5em;color:#333;background-color:rgba(0,0,0,.04);background-image:url(../images/code-bg.png);background-size:20px 20px;border-radius:5px;display:block}.article-body 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 #ccc;border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.article-body .task-list-item,.article-body__task{list-style:none;margin-left:-1em}.post-header{text-align:center}.post-body img{box-sizing:border-box;margin:auto}.posts-expand .post-tags{margin-top:40px}.posts-expand .post-tags a{padding:1px 5px;background:#f5f5f5;border-bottom:none}.posts-expand .post-tags a:hover{background:#ccc}.posts-expand .post-nav{margin-top:40px;overflow:hidden;padding:10px;white-space:nowrap;border-top:1px solid #eee}.post-nav-item a:hover{color:#222;border-bottom:none}.post-nav-item a{position:relative;display:inline-block;line-height:25px;font-size:14px;color:#555;border-bottom:none;width:50%}#externalRelevantArticles h4{margin-bottom:0}#externalRelevantArticles ul{margin-top:5px}.article-body{text-align:justify}.article-body p{margin:0 0 25px}ul.comments{padding:0;list-style:none;margin-top:50px;position:relative}ul.comments li{padding:10px;white-space:normal;position:relative;border-bottom:#EBF2F6 1px solid}ul.comments li:hover{background-color:#F7F7F7}ul.comments .avatar-48{position:absolute;box-shadow:0 0 2px #ddd;height:48px;width:48px;margin:8px 10px 0 0;border-radius:24px}ul.comments .comment-body{margin:8px 0 0 60px;min-height:50px}ul.comments li.comment-body-ref{position:absolute;z-index:10;background-color:#EBF2F6;border:1px solid #d5dbde;width:80%;left:69px}.posts-collapse .collection-title::before,.posts-collapse .post-header::before{left:0;background:#bbb;border-radius:50%;content:" "}ul.comments .comment-meta{font-family:"Open Sans","Microsoft Yahei",Helvetica;color:#9eabb3;font-size:13px}ul.comments .comment-meta a{color:#9EABB3;text-decoration:none;border-bottom-width:0}ul.comments .post-meta a:hover{text-decoration:underline}ul.comments .comment-meta time{border-left:1px solid #d5dbde;margin-left:8px;padding-left:12px}.tag-cloud{text-align:center}.tag-cloud ul.tag-cloud-tags{padding-left:0}#tags li{list-style:none;display:inline-block;margin:10px}#tags .tags1{font-size:12px;color:#CCC}#tags .tags2{font-size:16px;color:#999}#tags .tags3{font-size:21px;color:#6f6f6f}#tags .tags4{font-size:24px;color:#333}#tags .tags5{font-size:30px;color:#111}.posts-collapse .collection-title::before{position:absolute;top:50%;margin-left:-4px;margin-top:-4px;width:8px;height:8px}.posts-collapse .collection-title{position:relative;margin:60px 0}.posts-collapse .collection-title h2{margin-left:20px}.posts-collapse .collection-title small{color:#bbb}.posts-collapse .post-header::before{position:absolute;top:12px;width:6px;height:6px;margin-left:-4px;border:1px solid #fff;transition-property:background}.posts-collapse .post-header{position:relative;transition-property:border;border-bottom:1px dashed #ccc;text-align:left}.posts-collapse .post-header:hover{border-bottom-color:#666}.posts-collapse .post-header:hover::before{background:#222}.posts-collapse .post-time{position:absolute;font-size:12px;left:20px;top:8px}.posts-collapse .post-title{margin-left:70px;font-size:16px;font-weight:400;font-family:Lato,"PingFang SC","Microsoft YaHei",sans-serif;line-height:inherit;text-decoration:none;border-bottom:0;color:#666}.page-archive .archive-page-counter{position:relative;top:7px;left:20px;margin-bottom:50px;display:block}.page-archive .posts-collapse .archive-move-on{position:absolute;top:11px;left:0;margin-left:-6px;width:10px;height:10px;opacity:.5;background:#555;border:1px solid #fff;border-radius:50%}.page-archive .post-title{margin-left:20px}.page-archive .posts-collapse .post-header::before{top:8px}.page-archive .posts-collapse::after{top:20px;left:0;margin-left:-2px;width:4px;height:100%;background:#f5f5f5;z-index:-1;content:" ";position:absolute}@media (max-width:1000px){.sidebar,.sidebar-toggle{display:none}body{padding-right:0!important}}@media (max-width:700px){.page-archive .posts-collapse .archive-move-on{margin-left:5px}.posts-collapse{margin-left:10px}.page-archive .archive-page-counter{margin-right:10px}.site-nav-toggle{display:block;margin-top:16px}.back-to-top,.header-line,.logo-line-after,.logo-line-before,.menu,.site-search{display:none}.header{margin-bottom:50px;padding:5px 0}.header-line{position:relative;top:52px;height:1px;width:100%;background-color:#ddd}.btn-bar,.menu .menu-item{display:block}.wrapper{min-width:inherit}.btn-bar{width:22px;height:2px;background:#555;border-radius:1px}.btn-bar+.btn-bar{margin-top:4px}.menu{width:100%;margin:0 0 0 -20px;padding:0 5px;line-height:26px}.menu .page-icon{margin:6px -4px 0 10px}.footer{text-align:center;font-size:12px;padding:10px 0}.footer .fn-right{float:none}} \ No newline at end of file diff --git a/next/dynamic.ftl b/next/dynamic.ftl index 2424f2f..117df4a 100644 --- a/next/dynamic.ftl +++ b/next/dynamic.ftl @@ -48,7 +48,7 @@ ${viewLabel}ยป
-
+
${comment.commentContent}
diff --git a/next/footer.ftl b/next/footer.ftl index 779c46e..c6a60d3 100644 --- a/next/footer.ftl +++ b/next/footer.ftl @@ -46,21 +46,6 @@ var Label = { "markedAvailable": ${markedAvailable?c}, "skinDirName": "${skinDirName}", - "em00Label": "${em00Label}", - "em01Label": "${em01Label}", - "em02Label": "${em02Label}", - "em03Label": "${em03Label}", - "em04Label": "${em04Label}", - "em05Label": "${em05Label}", - "em06Label": "${em06Label}", - "em07Label": "${em07Label}", - "em08Label": "${em08Label}", - "em09Label": "${em09Label}", - "em10Label": "${em10Label}", - "em11Label": "${em11Label}", - "em12Label": "${em12Label}", - "em13Label": "${em13Label}", - "em14Label": "${em14Label}", "tocLabel": "${tocLabel}", "siteViewLabel": "${siteViewLabel}" }; diff --git a/next/js/next.js b/next/js/next.js index 630f362..f486f99 100644 --- a/next/js/next.js +++ b/next/js/next.js @@ -90,7 +90,7 @@ var NexT = { }); }, 500); - $('body').on('click', '.article-body img', function () { + $('body').on('click', '.content-reset img', function () { window.open(this.src); }); }); @@ -139,7 +139,7 @@ var NexT = { } }, initToc: function () { - var $articleTocs = $('.article-body [id^=b3_solo_h]'), + var $articleTocs = $('.content-reset [id^=b3_solo_h]'), $articleToc = $('.b3-solo-list'); $(window).scroll(function (event) { diff --git a/next/js/next.min.js b/next/js/next.min.js index 4f45412..334d45c 100644 --- a/next/js/next.min.js +++ b/next/js/next.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 NexT={init:function(){$(".sidebar-toggle").click(function(){var i=$(".sidebar");$(this).hasClass("sidebar-active")?($(this).removeClass("sidebar-active"),$("body").animate({"padding-right":0}),i.animate({right:-320}),i.find("section").css("opacity",0)):($(this).addClass("sidebar-active"),$("body").animate({"padding-right":320}),i.animate({right:0},function(){i.find("section:first").animate({opacity:1})}))}),$(".site-nav-toggle").click(function(){$(".site-nav").slideToggle()}),$(document).ready(function(){setTimeout(function(){$(".logo-wrap").css("opacity",1),$(".logo-line-before i").animate({left:"0"},function(){$(".site-title").css("opacity",1).animate({top:0},function(){$(".menu").css("opacity",1).animate({"margin-top":"15px"}),$(".main").css("opacity",1).animate({top:"0"},function(){0<$(".b3-solo-list li").length&&1e3<$(window).width()&&$(".sidebar-toggle").click()})})}),$(".logo-line-after i").animate({right:"0"})},500),$("body").on("click",".article-body img",function(){window.open(this.src)})})},initArticle:function(){if(0<$(".b3-solo-list li").length&&1e3<$(window).width()){$(".sidebar-toggle").addClass("has-toc");var i='
  • '+Label.tocLabel+'
  • '+Label.siteViewLabel+"
";$(".sidebar").prepend(i);var t=$(".sidebar section:first").html($(".b3-solo-list")),a=$(".sidebar section:last");t.height($(window).height()-90),$(".sidebar > ul > li").click(function(){"toc"===$(this).data("tab")?a.animate({opacity:"0",top:"-50px"},300,function(){t.show().css("top","-50px"),t.animate({opacity:"1",top:"0"},300)}):t.animate({opacity:"0",top:"-50px"},300,function(){t.hide().css("top","-50px"),a.animate({opacity:"1",top:"0"},300)}),$(".sidebar > ul > li").removeClass("current"),$(this).addClass("current")}),this.initToc()}},initToc:function(){var s=$(".article-body [id^=b3_solo_h]"),l=$(".b3-solo-list");$(window).scroll(function(i){if(0===$(".b3-solo-list li").length)return!1;var t=[];s.each(function(i){t.push({id:this.id,offsetTop:this.offsetTop})});for(var a=$(window).scrollTop(),o=0,e=t.length;o=t[t.length-1].offsetTop+200&&(l.find("li").removeClass("current"),l.find("li:last").addClass("current"))}),$(window).scroll()}};NexT.init(); \ No newline at end of file +var NexT={init:function(){$(".sidebar-toggle").click(function(){var i=$(".sidebar");$(this).hasClass("sidebar-active")?($(this).removeClass("sidebar-active"),$("body").animate({"padding-right":0}),i.animate({right:-320}),i.find("section").css("opacity",0)):($(this).addClass("sidebar-active"),$("body").animate({"padding-right":320}),i.animate({right:0},function(){i.find("section:first").animate({opacity:1})}))}),$(".site-nav-toggle").click(function(){$(".site-nav").slideToggle()}),$(document).ready(function(){setTimeout(function(){$(".logo-wrap").css("opacity",1),$(".logo-line-before i").animate({left:"0"},function(){$(".site-title").css("opacity",1).animate({top:0},function(){$(".menu").css("opacity",1).animate({"margin-top":"15px"}),$(".main").css("opacity",1).animate({top:"0"},function(){0<$(".b3-solo-list li").length&&1e3<$(window).width()&&$(".sidebar-toggle").click()})})}),$(".logo-line-after i").animate({right:"0"})},500),$("body").on("click",".content-reset img",function(){window.open(this.src)})})},initArticle:function(){if(0<$(".b3-solo-list li").length&&1e3<$(window).width()){$(".sidebar-toggle").addClass("has-toc");var i='
  • '+Label.tocLabel+'
  • '+Label.siteViewLabel+"
";$(".sidebar").prepend(i);var t=$(".sidebar section:first").html($(".b3-solo-list")),e=$(".sidebar section:last");t.height($(window).height()-90),$(".sidebar > ul > li").click(function(){"toc"===$(this).data("tab")?e.animate({opacity:"0",top:"-50px"},300,function(){t.show().css("top","-50px"),t.animate({opacity:"1",top:"0"},300)}):t.animate({opacity:"0",top:"-50px"},300,function(){t.hide().css("top","-50px"),e.animate({opacity:"1",top:"0"},300)}),$(".sidebar > ul > li").removeClass("current"),$(this).addClass("current")}),this.initToc()}},initToc:function(){var s=$(".content-reset [id^=b3_solo_h]"),c=$(".b3-solo-list");$(window).scroll(function(i){if(0===$(".b3-solo-list li").length)return!1;var t=[];s.each(function(i){t.push({id:this.id,offsetTop:this.offsetTop})});for(var e=$(window).scrollTop(),a=0,o=t.length;a=t[t.length-1].offsetTop+200&&(c.find("li").removeClass("current"),c.find("li:last").addClass("current"))}),$(window).scroll()}};NexT.init(); \ No newline at end of file diff --git a/next/lang/lang_zh_CN.properties b/next/lang/lang_zh_CN.properties index c77e96f..a8d7e48 100644 --- a/next/lang/lang_zh_CN.properties +++ b/next/lang/lang_zh_CN.properties @@ -198,7 +198,6 @@ goTopLabel=\u9876\u90E8 permalink1Label=\u94FE\u63A5\uFF1A permalinkLabel=\u94FE\u63A5 b3logLabel=B3LOG -killBrowserLabel=

\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01

\u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002

\u60A8\u53EF\u4EE5\u4E0B\u8F7D readmoreLabel=\u9605\u8BFB\u66F4\u591A\u00BB readmore2Label=\u9605\u8BFB\u66F4\u591A replyLabel=\u56DE\u590D\u00BB diff --git a/next/macro-head.ftl b/next/macro-head.ftl index 8717414..a39d5b9 100644 --- a/next/macro-head.ftl +++ b/next/macro-head.ftl @@ -28,7 +28,7 @@ - + diff --git a/next/page.ftl b/next/page.ftl index 48ef44c..9234e61 100644 --- a/next/page.ftl +++ b/next/page.ftl @@ -33,7 +33,7 @@
-
+
${page.pageContent}
<@comments commentList=pageComments article=page> diff --git a/nijigen/css/base.css b/nijigen/css/base.css index d6e7b35..6ef60a4 100644 --- a/nijigen/css/base.css +++ b/nijigen/css/base.css @@ -15,1267 +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"; -/** - * Solo - A small and beautiful blogging system written in Java. - * Copyright (c) 2010-2018, b3log.org & hacpai.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -/* - * skin style - * - * @author Liyuan Li - * @version 0.4.0.0, Dec 17, 2018 -*/ -/* - * Symphony - A modern community (forum/BBS/SNS/blog) platform written in Java. - * Copyright (C) 2012-2018, b3log.org & hacpai.com - * - * ๆœฌๆ–‡ไปถๅฑžไบŽ Sym ๅ•†ไธš็‰ˆ็š„ไธ€้ƒจๅˆ†๏ผŒ่ฏทไป”็ป†้˜…่ฏป้กน็›ฎๆ นๆ–‡ไปถๅคน็š„ LICENSE ๅนถไธฅๆ ผ้ตๅฎˆ็›ธๅ…ณ็บฆๅฎš - */ -/** - * Common style for reset - * - * @author Liyuan Li - * @version 0.2.0.1, Arp 17, 2018 - */ -html { - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; - height: 100%; } - -body { - margin: 0; - font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif; - font-size: 14px; - background-color: #fff; - -webkit-font-smoothing: antialiased; - -webkit-overflow-scrolling: touch; } - -::-moz-selection { - text-shadow: none; - background: rgba(65, 131, 196, 0.4); } - -::selection { - text-shadow: none; - background: rgba(66, 133, 244, 0.4); } - -ul, -ol { - margin: 0; - padding: 0; } - -h1, -h2, -h3, -h4, -h5, -h6, -dl, -dd, -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 { - outline: 0; - text-decoration: none; } - -a:hover { - text-decoration: underline; } - -sub, -sup { - position: relative; - font-size: 75%; - line-height: 0; - vertical-align: baseline; } - -sup { - top: -0.5em; } - -sub { - bottom: -0.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 { - margin: 0; - font-size: 100%; - vertical-align: middle; - font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif; - outline: none; } - -button, -input { - line-height: normal; } - -button::-moz-focus-inner, -input::-moz-focus-inner { - padding: 0; - border: 0; } - -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-decoration, -input[type="search"]::-webkit-search-cancel-button { - -webkit-appearance: none; } - -textarea { - overflow: auto; - resize: vertical; } - -svg { - fill: currentColor; - display: inline-block; - stroke-width: 0; - stroke: currentColor; - width: 14px; - height: 14px; } - -blockquote { - margin: 0; } - -/* - * Symphony - A modern community (forum/BBS/SNS/blog) platform written in Java. - * Copyright (C) 2012-2018, b3log.org & hacpai.com - * - * ๆœฌๆ–‡ไปถๅฑžไบŽ Sym ๅ•†ไธš็‰ˆ็š„ไธ€้ƒจๅˆ†๏ผŒ่ฏทไป”็ป†้˜…่ฏป้กน็›ฎๆ นๆ–‡ไปถๅคน็š„ LICENSE ๅนถไธฅๆ ผ้ตๅฎˆ็›ธๅ…ณ็บฆๅฎš - */ -/** - * Article reset style - * - * @author Liyuan Li - * @version 0.2.1.0, Jan 4, 2019 - */ -.content-reset { - word-wrap: break-word; - overflow: auto; - line-height: 1.65; - font-size: 16px; - word-break: break-word; } - .content-reset ul, - .content-reset ol { - padding-left: 2em; - margin-top: 0; - margin-bottom: 16px; } - .content-reset li { - margin-top: 0.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 { - padding-bottom: 0.3em; - font-size: 1.7em; - border-bottom: 1px solid #eee; } - .content-reset h2 { - padding-bottom: 0.3em; - font-size: 1.5em; - border-bottom: 1px solid #eee; } - .content-reset h3 { - font-size: 1.25em; } - .content-reset h4 { - font-size: 1em; } - .content-reset h5 { - font-size: 0.875em; } - .content-reset h6 { - font-size: 0.85em; } - .content-reset hr { - height: 0.15em; - 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: 0.25em solid #ddd; - margin-bottom: 16px; } - .content-reset blockquote p { - margin: 0; } - .content-reset ins > iframe { - border: 0; } - .content-reset iframe { - border: 1px solid rgba(0, 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: bold; - text-align: center !important; - background: rgba(158, 188, 226, 0.2); } - .content-reset tbody tr:nth-child(2n) { - background: rgba(158, 188, 226, 0.12); } - .content-reset tr:hover { - background: #efefef; } - .content-reset code { - padding: 0.2em 0.4em; - margin: 0; - font-size: 85%; - background-color: rgba(252, 41, 41, 0.12); - border-radius: 3px; - word-break: break-word; } - .content-reset pre { - position: relative; } - .content-reset pre textarea { - position: absolute; - top: -100000px; } - .content-reset pre > code { - padding: 0.5em; - background-color: rgba(0, 0, 0, 0.04); - background-size: 20px 20px; - border-radius: 5px; - display: block; } - .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: solid 1px rgba(0, 0, 0, 0.38); - border-bottom-color: #bbb; - border-radius: 3px; - box-shadow: inset 0 -1px 0 #bbb; } - .content-reset__task, - .content-reset .task-list-item { - list-style: none; - margin-left: -1em; } - -.img-preview { - width: 100%; - height: 100%; - top: 0; - z-index: 211; - overflow: auto; - cursor: zoom-out; - transition: background-color .2s ease-in-out; } - .img-preview img { - max-width: inherit; - transition: transform .3s ease-in-out; } - -/* - * Symphony - A modern community (forum/BBS/SNS/blog) platform written in Java. - * Copyright (C) 2012-2018, b3log.org & hacpai.com - * - * ๆœฌๆ–‡ไปถๅฑžไบŽ Sym ๅ•†ไธš็‰ˆ็š„ไธ€้ƒจๅˆ†๏ผŒ่ฏทไป”็ป†้˜…่ฏป้กน็›ฎๆ นๆ–‡ไปถๅคน็š„ LICENSE ๅนถไธฅๆ ผ้ตๅฎˆ็›ธๅ…ณ็บฆๅฎš - */ -/** - * Function and font text style - * - * @author Liyuan Li - * @version 0.2.0.0, Arp 29, 2018 - */ -.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__pointer { - cursor: pointer; } - -.fn__clear:before, .fn__clear:after { - 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; - white-space: nowrap; - word-wrap: normal; } - -.ft__13 { - font-size: 13px; } - -.ft__smaller { - font-size: 12px; } - -.ft__center { - text-align: center; } - -.ft__nowrap { - white-space: nowrap; } - -/* - * Symphony - A modern community (forum/BBS/SNS/blog) platform written in Java. - * Copyright (C) 2012-2018, b3log.org & hacpai.com - * - * ๆœฌๆ–‡ไปถๅฑžไบŽ Sym ๅ•†ไธš็‰ˆ็š„ไธ€้ƒจๅˆ†๏ผŒ่ฏทไป”็ป†้˜…่ฏป้กน็›ฎๆ นๆ–‡ไปถๅคน็š„ LICENSE ๅนถไธฅๆ ผ้ตๅฎˆ็›ธๅ…ณ็บฆๅฎš - */ -/** - * tool tip. - * - * @author Liyuan Li - * @version 0.1.0.0, Apr 18, 2018 - */ -@-webkit-keyframes tooltip-appear { - from { - opacity: 0; } - to { - opacity: 1; } } - -@keyframes tooltip-appear { - from { - opacity: 0; } - to { - opacity: 1; } } - -.tooltipped { - position: relative; - cursor: pointer; } - .tooltipped::after { - position: absolute; - z-index: 1000000; - display: none; - padding: 5px 8px; - font-size: 11px; - font-weight: normal; - -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, 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, 0.8); - pointer-events: none; - content: ""; - border: 5px solid transparent; - opacity: 0; } - .tooltipped--hover::before, .tooltipped--hover::after, .tooltipped:hover::before, .tooltipped:hover::after, .tooltipped:active::before, .tooltipped:active::after, .tooltipped:focus::before, .tooltipped:focus::after { - display: inline-block; - text-decoration: none; - animation-name: tooltip-appear; - animation-duration: 0.1s; - animation-fill-mode: forwards; - animation-timing-function: ease-in; - animation-delay: 0.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, 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, 0.8); } - .tooltipped__ne::after { - right: auto; - left: 50%; - margin-left: -15px; } - .tooltipped__nw::after { - margin-right: -15px; } - .tooltipped__s::after, .tooltipped__n::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, 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, 0.8); } - -/* - * Symphony - A modern community (forum/BBS/SNS/blog) platform written in Java. - * Copyright (C) 2012-2018, b3log.org & hacpai.com - * - * ๆœฌๆ–‡ไปถๅฑžไบŽ Sym ๅ•†ไธš็‰ˆ็š„ไธ€้ƒจๅˆ†๏ผŒ่ฏทไป”็ป†้˜…่ฏป้กน็›ฎๆ นๆ–‡ไปถๅคน็š„ LICENSE ๅนถไธฅๆ ผ้ตๅฎˆ็›ธๅ…ณ็บฆๅฎš - */ -/** - * comment - * - * @author Liyuan Li - * @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; - 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; } - -/* Make clicks pass-through */ -#nprogress { - pointer-events: none; } - -#nprogress .bar { - background: #d23f31; - position: fixed; - z-index: 1031; - top: 0; - left: 0; - width: 100%; - height: 2px; } - -/* Fancy blur effect */ -#nprogress .peg { - display: block; - position: absolute; - right: 0px; - width: 100px; - height: 100%; - box-shadow: 0 0 10px #d23f31, 0 0 5px #d23f31; - opacity: 1.0; - -webkit-transform: rotate(3deg) translate(0px, -4px); - -ms-transform: rotate(3deg) translate(0px, -4px); - transform: rotate(3deg) translate(0px, -4px); } - -/* Remove these to get rid of the spinner */ -#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: solid 2px transparent; - border-top-color: #d23f31; - border-left-color: #d23f31; - border-radius: 50%; - -webkit-animation: nprogress-spinner 400ms linear infinite; - animation: nprogress-spinner 400ms linear infinite; } - -.nprogress-custom-parent { - overflow: hidden; - position: relative; } - -.nprogress-custom-parent #nprogress .spinner, -.nprogress-custom-parent #nprogress .bar { - position: absolute; } - -@-webkit-keyframes nprogress-spinner { - 0% { - -webkit-transform: rotate(0deg); } - 100% { - -webkit-transform: rotate(360deg); } } - -@keyframes nprogress-spinner { - 0% { - transform: rotate(0deg); } - 100% { - transform: rotate(360deg); } } - -/** - * Solo - A small and beautiful blogging system written in Java. - * Copyright (c) 2010-2018, b3log.org & hacpai.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -/* - * icon font - * - * @author Liyuan Li - * @version 0.2.0.1, Jan 2, 2019 -*/ -@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: normal; - font-style: normal; } - -[class^="icon__"], [class*=" icon__"] { - /* use !important to prevent issues with browser extensions that change fonts */ - font-family: 'icomoon' !important; - speak: none; - font-style: normal; - font-weight: normal; - font-variant: normal; - text-transform: none; - line-height: 1; - /* Better Font Rendering =========== */ - -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"; } - -.icon__more:before { - content: "\e902"; } - -body { - cursor: url(../images/cursor.cur), url(../images/cursor.cur), auto; } - -a { - transition: all .3s; - 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, 0.2); - transition: all .3s; } - .module.item { - transform: translateY(30px); - transition: transform 2s cubic-bezier(0.175, 0.885, 0.32, 1.275); } - .module.item--active { - transform: translate(0); } - .module:hover { - box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.8); } - .module__content { - background-color: rgba(255, 255, 255, 0.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, 0.7); - padding: 15px; - color: #fff; } - .module__header a { - color: #fff; } - .module__header:hover { - background-color: rgba(10, 10, 0, 0.9); } - .module__list li { - border-bottom: 1px solid #ddd; - background-color: rgba(255, 255, 255, 0.8); - line-height: 20px; } - .module__list li a { - padding: 15px 15px; - display: block; - color: #3d4450; } - .module__list li a:hover { - text-decoration: none; - color: #b94a48; - background-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(0deg); } - 25% { - opacity: 0; - transform: scale(1.1) rotate(0deg); } - 100% { - opacity: 0; } } - -.header { - background-color: rgba(10, 10, 0, 0.7); - height: 50px; - line-height: 50px; - color: #fff; - transition: all .3s; - box-shadow: 0 0 8px black; } - .header:hover { - background-color: rgba(10, 10, 0, 0.9); } - .header a { - color: #fff; - padding: 0 15px; - display: inline-block; } - .header a.current, .header a:hover { - text-decoration: none; - background-color: rgba(102, 88, 184, 0.8); } - .header__logo { - position: absolute; - left: 30px; } - .header__nav { - text-align: center; } - .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; - border-radius: 5px; } - .side::-webkit-scrollbar { - display: none; } - .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: 0 auto; - margin-bottom: 15px; - transition: transform .3s; - margin-top: 10px; } - .side__avatar:hover { - transform: rotate(360deg) scale(1.2); - border: 5px solid rgba(114, 102, 186, 0.36); - margin-top: 0; } - -.tag { - float: left; - color: #fff; - padding: 2px 5px; - border: 1px solid transparent; - height: 20px; - white-space: nowrap; - word-wrap: normal; - background-color: rgba(10, 10, 0, 0.7); - border-radius: 3px 3px 3px 3px; - line-height: 21px; - margin: 0 15px 15px 0; } - .tag a { - color: #fff; } - .tag:hover { - background-color: #b94a48; - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); - text-decoration: none; } - -.breadcrumb { - color: #7266BA !important; } - .breadcrumb:hover { - color: #3d4450 !important; } - -.footer { - text-align: center; - color: #fff; - padding: 15px; - margin-bottom: 30px; } - .footer a { - color: #7266BA; } - -.article-list .item { - border-radius: 5px; - margin-bottom: 30px; - box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.2); - padding: 15px; - background-color: rgba(255, 255, 255, 0.8); - position: relative; - transition: all 0.3s, transform 1s cubic-bezier(0.175, 0.885, 0.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: 0px 0px 20px 0px rgba(0, 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, 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; - text-align: center; - 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, 0.58); } - .pagination__item--text { - background-color: rgba(255, 255, 255, 0.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; - list-style: none; - margin-bottom: 30px; - box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.2); - transition: all .3s; } - .comments__item:hover { - box-shadow: 0px 0px 20px 0px rgba(0, 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 { - background-color: #d9edf7; } - .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, 0.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, 0.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, 0.6); } - -.comment-body-ref { - right: 0; - position: absolute; - left: 64px; } - .comment-body-ref .breadcrumb { - display: none; } - -.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; - bottom: 30px; - right: 30px; - color: #fff; - background-color: rgba(114, 102, 186, 0.8); - height: 30px; - width: 30px; - line-height: 28px; - border-radius: 15px; - cursor: pointer; - display: none; - text-align: center; } - .icon__up:hover { - background-color: #6658b8; } - -.content .b3-solo-list { - display: none !important; } - -.b3-solo-list { - margin: 0 !important; - font-size: 14px !important; } - -.b3-solo-list-h1 { - margin: 0 !important; } - -.b3-solo-list-h2 { - margin: 0 !important; } - .b3-solo-list-h2 a { - padding-left: 30px !important; } - -.b3-solo-list-h3 { - margin: 0 !important; } - .b3-solo-list-h3 a { - padding-left: 45px !important; } - -.b3-solo-list-h4 { - margin: 0 !important; } - .b3-solo-list-h4 a { - padding-left: 60px !important; } - -.b3-solo-list-h5 { - margin: 0 !important; } - .b3-solo-list-h5 a { - padding-left: 75px !important; } - -.article__relevant { - margin-bottom: 30px; } - .article__relevant .module { - height: 100%; - background-color: rgba(255, 255, 255, 0.8); - margin-bottom: 0; } - -@media (max-width: 768px) { - .mobile__hidden { - display: none; } - .mobile__hidden.fn__none { - display: block; } - .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 { - display: none; } - .article-list .item, - .module, - .comments__item { - margin-bottom: 15px; } - .footer { - margin: 0 15px 15px; - background-color: rgba(255, 255, 255, 0.8); - border-radius: 5px; - color: #3d4450; - line-height: 20px; } - .footer a { - text-decoration: underline; } - .footer .fn__none--m { - display: none; } - .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__more, - .header__m .icon__list { - position: absolute; - top: -35px; - right: 15px; - font-size: 20px; - color: #fff; } - .header__m .icon__list { - right: 50px; } - .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; } - .article__relevant { - display: block; - margin-bottom: 0; } - .article__relevant .module { - margin-bottom: 15px; } - .article__near a { - display: block; - float: none; } } +html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;height:100%}body{margin:0;font-family:"Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif;font-size:14px;background-color:#fff;-webkit-font-smoothing:antialiased;-webkit-overflow-scrolling:touch}::-moz-selection{text-shadow:none;background:rgba(65,131,196,0.4)}::selection{text-shadow:none;background:rgba(66,133,244,0.4)}ul,ol{margin:0;padding:0}h1,h2,h3,h4,h5,h6,dl,dd,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{outline:0;text-decoration:none}a:hover{text-decoration:underline}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.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{margin:0;font-size:100%;vertical-align:middle;font-family:"Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif;outline:none}button,input{line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}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-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;resize:vertical}svg{fill:currentColor;display:inline-block;stroke-width:0;stroke:currentColor;width:14px;height:14px}blockquote{margin:0}.content-reset{word-wrap:break-word;overflow:auto;line-height:1.65;font-size:16px;word-break:break-word}.content-reset ul,.content-reset ol{padding-left:2em;margin-top:0;margin-bottom:16px}.content-reset li{margin-top:0.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{padding-bottom:0.3em;font-size:1.7em;border-bottom:1px solid #eee}.content-reset h2{padding-bottom:0.3em;font-size:1.5em;border-bottom:1px solid #eee}.content-reset h3{font-size:1.25em}.content-reset h4{font-size:1em}.content-reset h5{font-size:0.875em}.content-reset h6{font-size:0.85em}.content-reset hr{height:0.15em;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:0.25em solid #ddd;margin-bottom:16px}.content-reset blockquote p{margin:0}.content-reset ins>iframe{border:0}.content-reset iframe{border:1px solid rgba(0,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:bold;text-align:center !important;background:rgba(158,188,226,0.2)}.content-reset tbody tr:nth-child(2n){background:rgba(158,188,226,0.12)}.content-reset tr:hover{background:#efefef}.content-reset code{padding:0.2em 0.4em;margin:0;font-size:85%;background-color:rgba(252,41,41,0.12);border-radius:3px;word-break:break-word}.content-reset pre{position:relative}.content-reset pre textarea{position:absolute;top:-100000px}.content-reset pre>code{padding:0.5em;background-color:rgba(0,0,0,0.04);background-size:20px 20px;border-radius:5px;display:block}.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:solid 1px rgba(0,0,0,0.38);border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.content-reset__task,.content-reset .task-list-item{list-style:none;margin-left:-1em}.img-preview{width:100%;height:100%;top:0;z-index:211;overflow:auto;cursor:zoom-out;transition:background-color .2s ease-in-out}.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__pointer{cursor:pointer}.fn__clear:before,.fn__clear:after{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;white-space:nowrap;word-wrap:normal}.ft__13{font-size:13px}.ft__smaller{font-size:12px}.ft__center{text-align:center}.ft__nowrap{white-space:nowrap}@-webkit-keyframes tooltip-appear{from{opacity:0}to{opacity:1}}@keyframes tooltip-appear{from{opacity:0}to{opacity:1}}.tooltipped{position:relative;cursor:pointer}.tooltipped::after{position:absolute;z-index:1000000;display:none;padding:5px 8px;font-size:11px;font-weight:normal;-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,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,0.8);pointer-events:none;content:"";border:5px solid transparent;opacity:0}.tooltipped--hover::before,.tooltipped--hover::after,.tooltipped:hover::before,.tooltipped:hover::after,.tooltipped:active::before,.tooltipped:active::after,.tooltipped:focus::before,.tooltipped:focus::after{display:inline-block;text-decoration:none;animation-name:tooltip-appear;animation-duration:0.1s;animation-fill-mode:forwards;animation-timing-function:ease-in;animation-delay:0.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,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,0.8)}.tooltipped__ne::after{right:auto;left:50%;margin-left:-15px}.tooltipped__nw::after{margin-right:-15px}.tooltipped__s::after,.tooltipped__n::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,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,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:0px;width:100px;height:100%;box-shadow:0 0 10px #d23f31, 0 0 5px #d23f31;opacity:1.0;-webkit-transform:rotate(3deg) translate(0px, -4px);-ms-transform:rotate(3deg) translate(0px, -4px);transform:rotate(3deg) translate(0px, -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:solid 2px transparent;border-top-color:#d23f31;border-left-color:#d23f31;border-radius:50%;-webkit-animation:nprogress-spinner 400ms linear infinite;animation:nprogress-spinner 400ms linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .spinner,.nprogress-custom-parent #nprogress .bar{position:absolute}@-webkit-keyframes nprogress-spinner{0%{-webkit-transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg)}}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}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:normal;font-style:normal}[class^="icon__"],[class*=" icon__"]{font-family:'icomoon' !important;speak:none;font-style:normal;font-weight:normal;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"}.icon__more:before{content:"\e902"}body{cursor:url(../images/cursor.cur),url(../images/cursor.cur),auto}a{transition:all .3s;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,0.2);transition:all .3s}.module.item{transform:translateY(30px);transition:transform 2s cubic-bezier(0.175, 0.885, 0.32, 1.275)}.module.item--active{transform:translate(0)}.module:hover{box-shadow:0px 0px 20px 0px rgba(0,0,0,0.8)}.module__content{background-color:rgba(255,255,255,0.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,0.7);padding:15px;color:#fff}.module__header a{color:#fff}.module__header:hover{background-color:rgba(10,10,0,0.9)}.module__list li{border-bottom:1px solid #ddd;background-color:rgba(255,255,255,0.8);line-height:20px}.module__list li a{padding:15px 15px;display:block;color:#3d4450}.module__list li a:hover{text-decoration:none;color:#b94a48;background-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(0deg)}25%{opacity:0;transform:scale(1.1) rotate(0deg)}100%{opacity:0}}.header{background-color:rgba(10,10,0,0.7);height:50px;line-height:50px;color:#fff;transition:all .3s;box-shadow:0 0 8px black}.header:hover{background-color:rgba(10,10,0,0.9)}.header a{color:#fff;padding:0 15px;display:inline-block}.header a.current,.header a:hover{text-decoration:none;background-color:rgba(102,88,184,0.8)}.header__logo{position:absolute;left:30px}.header__nav{text-align:center}.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;border-radius:5px}.side::-webkit-scrollbar{display:none}.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:0 auto;margin-bottom:15px;transition:transform .3s;margin-top:10px}.side__avatar:hover{transform:rotate(360deg) scale(1.2);border:5px solid rgba(114,102,186,0.36);margin-top:0}.tag{float:left;color:#fff;padding:2px 5px;border:1px solid transparent;height:20px;white-space:nowrap;word-wrap:normal;background-color:rgba(10,10,0,0.7);border-radius:3px 3px 3px 3px;line-height:21px;margin:0 15px 15px 0}.tag a{color:#fff}.tag:hover{background-color:#b94a48;box-shadow:0 1px 1px rgba(0,0,0,0.2);text-decoration:none}.breadcrumb{color:#7266BA !important}.breadcrumb:hover{color:#3d4450 !important}.footer{text-align:center;color:#fff;padding:15px;margin-bottom:30px}.footer a{color:#7266BA}.article-list .item{border-radius:5px;margin-bottom:30px;box-shadow:1px 1px 3px 1px rgba(0,0,0,0.2);padding:15px;background-color:rgba(255,255,255,0.8);position:relative;transition:all 0.3s,transform 1s cubic-bezier(0.175, 0.885, 0.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:0px 0px 20px 0px rgba(0,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,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;text-align:center;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,0.58)}.pagination__item--text{background-color:rgba(255,255,255,0.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;list-style:none;margin-bottom:30px;box-shadow:1px 1px 3px 1px rgba(0,0,0,0.2);transition:all .3s}.comments__item:hover{box-shadow:0px 0px 20px 0px rgba(0,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{background-color:#d9edf7}.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,0.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,0.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,0.6)}.comment-body-ref{right:0;position:absolute;left:64px}.comment-body-ref .breadcrumb{display:none}.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;bottom:30px;right:30px;color:#fff;background-color:rgba(114,102,186,0.8);height:30px;width:30px;line-height:28px;border-radius:15px;cursor:pointer;display:none;text-align:center}.icon__up:hover{background-color:#6658b8}.content .b3-solo-list{display:none !important}.b3-solo-list{margin:0 !important;font-size:14px !important}.b3-solo-list-h1{margin:0 !important}.b3-solo-list-h2{margin:0 !important}.b3-solo-list-h2 a{padding-left:30px !important}.b3-solo-list-h3{margin:0 !important}.b3-solo-list-h3 a{padding-left:45px !important}.b3-solo-list-h4{margin:0 !important}.b3-solo-list-h4 a{padding-left:60px !important}.b3-solo-list-h5{margin:0 !important}.b3-solo-list-h5 a{padding-left:75px !important}.article__relevant{margin-bottom:30px}.article__relevant .module{height:100%;background-color:rgba(255,255,255,0.8);margin-bottom:0}@media (max-width: 768px){.mobile__hidden{display:none}.mobile__hidden.fn__none{display:block}.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{display:none}.article-list .item,.module,.comments__item{margin-bottom:15px}.footer{margin:0 15px 15px;background-color:rgba(255,255,255,0.8);border-radius:5px;color:#3d4450;line-height:20px}.footer a{text-decoration:underline}.footer .fn__none--m{display:none}.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__more,.header__m .icon__list{position:absolute;top:-35px;right:15px;font-size:20px;color:#fff}.header__m .icon__list{right:50px}.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}.article__relevant{display:block;margin-bottom:0}.article__relevant .module{margin-bottom:15px}.article__near a{display:block;float:none}} diff --git a/nijigen/css/base.min.css b/nijigen/css/base.min.css deleted file mode 100644 index a88a10a..0000000 --- a/nijigen/css/base.min.css +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Solo - A small and beautiful blogging system written in Java. - * Copyright (c) 2010-2019, b3log.org & hacpai.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * 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}audio,canvas,svg,video{display:inline-block}.content-reset pre,sub,sup{position:relative}.fn__ellipsis,.ft__nowrap{white-space:nowrap}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: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;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:.15em;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 ins>iframe{border: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;display:block}.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 .task-list-item,.content-reset__task{list-style:none;margin-left:-1em}.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"}.icon__more:before{content:"\e902"}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;border-radius:5px}.side::-webkit-scrollbar{display:none}.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;list-style:none;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}.article__relevant{margin-bottom:30px}.article__relevant .module{height:100%;background-color:rgba(255,255,255,.8);margin-bottom:0}@media (max-width:768px){.mobile__hidden{display:none}.main,.mobile__hidden.fn__none{display:block}.main{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,.header__m .icon__more{position:absolute;top:-35px;right:15px;font-size:20px;color:#fff}.header__m .icon__list{right:50px}.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}.article__relevant{display:block;margin-bottom:0}.article__relevant .module{margin-bottom:15px}.article__near a{display:block;float:none}} \ No newline at end of file diff --git a/nijigen/footer.ftl b/nijigen/footer.ftl index a08b619..ea065b1 100644 --- a/nijigen/footer.ftl +++ b/nijigen/footer.ftl @@ -45,26 +45,11 @@ var Label = { "markedAvailable": ${markedAvailable?c}, - "skinDirName": "${skinDirName}", - "em00Label": "${em00Label}", - "em01Label": "${em01Label}", - "em02Label": "${em02Label}", - "em03Label": "${em03Label}", - "em04Label": "${em04Label}", - "em05Label": "${em05Label}", - "em06Label": "${em06Label}", - "em07Label": "${em07Label}", - "em08Label": "${em08Label}", - "em09Label": "${em09Label}", - "em10Label": "${em10Label}", - "em11Label": "${em11Label}", - "em12Label": "${em12Label}", - "em13Label": "${em13Label}", - "em14Label": "${em14Label}" + "skinDirName": "${skinDirName}" }; Util.initSW(); - Util.parseMarkdown('content-reset'); + Util.parseMarkdown(); Util.killIE(8) ${plugins} diff --git a/nijigen/macro-head.ftl b/nijigen/macro-head.ftl index 3ca058a..a39d5b9 100644 --- a/nijigen/macro-head.ftl +++ b/nijigen/macro-head.ftl @@ -28,7 +28,7 @@ - + diff --git a/owmx-3.0/article-list.ftl b/owmx-3.0/article-list.ftl index b33f7cc..99a864f 100644 --- a/owmx-3.0/article-list.ftl +++ b/owmx-3.0/article-list.ftl @@ -33,7 +33,7 @@ -
${article.articleAbstract}
+
${article.articleAbstract}

${author1Label}${article.authorName} | diff --git a/owmx-3.0/article.ftl b/owmx-3.0/article.ftl index dc4566d..47e8e11 100644 --- a/owmx-3.0/article.ftl +++ b/owmx-3.0/article.ftl @@ -95,7 +95,7 @@

-
+
${article.articleContent} <#if "" != article.articleSign.signHTML?trim>
diff --git a/owmx-3.0/common-comment.ftl b/owmx-3.0/common-comment.ftl index 3535411..6c6a78d 100644 --- a/owmx-3.0/common-comment.ftl +++ b/owmx-3.0/common-comment.ftl @@ -48,7 +48,7 @@
-
+
${comment.commentContent}
diff --git a/owmx-3.0/css/base.css b/owmx-3.0/css/base.css new file mode 100644 index 0000000..4bb0247 --- /dev/null +++ b/owmx-3.0/css/base.css @@ -0,0 +1,18 @@ +/** + * Solo - A small and beautiful blogging system written in Java. + * Copyright (c) 2010-2019, b3log.org & hacpai.com + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +.content-reset{word-wrap:break-word;overflow:auto;line-height:1.65;font-size:16px;word-break:break-word}.content-reset ul,.content-reset ol{padding-left:2em;margin-top:0;margin-bottom:16px}.content-reset li{margin-top:0.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{padding-bottom:0.3em;font-size:1.7em;border-bottom:1px solid #eee}.content-reset h2{padding-bottom:0.3em;font-size:1.5em;border-bottom:1px solid #eee}.content-reset h3{font-size:1.25em}.content-reset h4{font-size:1em}.content-reset h5{font-size:0.875em}.content-reset h6{font-size:0.85em}.content-reset hr{height:0.15em;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:0.25em solid #ddd;margin-bottom:16px}.content-reset blockquote p{margin:0}.content-reset ins>iframe{border:0}.content-reset iframe{border:1px solid rgba(0,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:bold;text-align:center !important;background:rgba(158,188,226,0.2)}.content-reset tbody tr:nth-child(2n){background:rgba(158,188,226,0.12)}.content-reset tr:hover{background:#efefef}.content-reset code{padding:0.2em 0.4em;margin:0;font-size:85%;background-color:rgba(252,41,41,0.12);border-radius:3px;word-break:break-word}.content-reset pre{position:relative}.content-reset pre textarea{position:absolute;top:-100000px}.content-reset pre>code{padding:0.5em;background-color:rgba(0,0,0,0.04);background-size:20px 20px;border-radius:5px;display:block}.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:solid 1px rgba(0,0,0,0.38);border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.content-reset__task,.content-reset .task-list-item{list-style:none;margin-left:-1em}.img-preview{width:100%;height:100%;top:0;z-index:211;overflow:auto;cursor:zoom-out;transition:background-color .2s ease-in-out}.img-preview img{max-width:inherit;transition:transform .3s ease-in-out}.left{float:left}.right{float:right}.clear:before,.clear:after{display:table;content:""}.clear:after{clear:both}.none{display:none}header,footer,article,nav,section,aside,time,hgroup{display:block}html,body,header,footer,article,nav,section,aside,time,h1,h2,h3,p,a,ul,li,dl,dd,dt,table,thead,tfoot,tbody,th,tr,td{border:0;font:12px/22px 'Verdana', 'sans-serif';margin:0;outline:0;padding:0}BODY{background:#DDD;margin:0px 0 0 0;color:#444}img{max-width:100%;vertical-align:middle;border:0;height:auto;overflow:hidden;font-size:12px}A,A:LINK,A:ACTIVE,A:VISITED{color:#016f93;text-decoration:none}A:HOVER{color:#DB0202}a.selected{font-weight:bold;color:#000000}H1,H3,H4,H5,H6{background:url(../images/ai4.png) no-repeat 0 7px;border-bottom:1px solid #CCC;color:#666;font-weight:bold;margin:0 0 10px;padding:0 0 0 25px}H1{background:url(../images/ai4.png) no-repeat 0 6px;font-size:15px}H1 a{font-weight:bold;font-size:15px}H2{font-size:14px;margin:0 0 20px 0}H3{background:url(../images/ai5.png) no-repeat 0 7px}H3,H4,H5,H6{font-size:13px}h4{background-position:0 5px}sup{color:#444;top:-4px}header{border-radius:4px;background:#0098CC url(../images/hd.jpg) no-repeat top left;height:200px;margin:0 0 10px 0;padding:10px 10px;position:relative}header a:link,header a:active,header a:visited{font-weight:bold;color:#FFF;font-size:16px}header a:hover{color:#FFF}header p{border-radius:4px;background:#FFF;bottom:20px;color:#000;font-weight:bold;opacity:0.5;padding:10px;position:absolute;right:20px;width:400px}article{border-radius:4px;background:#FFF;border:1px solid #CCC;float:right;height:auto;padding:20px;width:550px}article h1{color:#666;font-weight:bold;font-size:15px}.highlight-1,.highlight-2,.highlight-3{-moz-border-radius:4px;-webkit-border-radius:4px;padding:5px 10px}.highlight-1{background:#FFCCCC;border:1px dotted #FF9966}.highlight-2{background:#FFFF99;border:1px dotted #FFCC33}.highlight-3{background:#CCFF99;border:1px dotted #CCCC33}cite{border-left:2px solid #0098CC;color:#666;font-size:12px;font-style:normal;font-weight:bold;margin:0;padding:5px 10px}blockquote{border-left:2px solid #0098CC;color:#666;margin:0 0 20px 0;padding:5px 10px}pre{color:#333;font-size:10px;line-height:15px;overflow:hidden;overflow-y:hidden}pre code{background:#EEE;border-left:2px solid #0098CC;margin:0 0 10px 0;padding:5px;display:block}dl.vevent{margin:-20px 0 20px 0;padding:0}.vevent dt{font-size:10px;position:relative;left:0;top:22px;font-weight:bold}.vevent dd{border-left:2px solid #0098CC;font-size:11px;margin:0 0 0 80px;padding:0 0 0 10px}dd.summary{font-weight:bold}.vevent a{font-size:11px}article form{border-radius:4px;background:#DDD;margin:0 0 20px;padding:10px}article label{color:#666;display:block;font-size:10px;font-weight:bold;margin:0 0 0 2px}article input,article textarea{border-radius:4px;border:1px solid #CCC;font-size:11px;padding:4px 5px;width:458px}article ul,aside ul{list-style:none;margin:0 0 20px 0}article ul{margin:0 0 20px 23px}article ul li{background:url(../images/ai2.png) no-repeat 0 8px;padding:0 0 0 17px}aside{background:#EEE;float:left;margin:0 0 20px 0;width:200px;white-space:normal}aside ul.aside-comments img{border-radius:4px;width:32px;height:32px;border:1px solid #999999;padding:1px;margin-top:5px;margin-right:5px}aside ul.aside-comments a{font-weight:bold}aside ul.aside-comments .side-comment{color:#555555;font-weight:normal;overflow:hidden;white-space:nowrap;width:158px;height:18px}aside ul.aside-comments div.left>div>div{display:none}aside ul.aside-comments .side-comment img{border:0px;height:16px;width:16px;padding:0px;margin-right:0px;margin-top:0}aside ul.aside-comments li{padding:2px 0}aside ul.aside-comments li div{width:158px}aside ul.aside-comments li div.left div{height:18px;line-height:18px;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis}aside ul.navi-tags li{padding-left:0px;background-image:none}aside ul.navi-tags li img{margin-bottom:3px;padding-right:6px;height:16px;width:16px}#mostViewCountArticles li,#mostCommentArticles li{overflow:hidden;text-overflow:ellipsis;-o-text-overflow:ellipsis}#mostViewCountArticles a,#mostCommentArticles a{white-space:nowrap}.s{border-radius:4px;margin:0 0 20px 0;padding:10px;width:179px}.s input{border-radius:4px;border:1px solid #AAA;color:#999;font-size:11px;padding:4px 5px;width:168px}nav ul{list-style:none}nav li{background:url(../images/ai1.png) no-repeat 0 8px;padding:0 0 0 15px}nav li ul,aside li ul li ul{margin:0}nav li li a{font-size:11px}nav li li li a{font-size:10px}nav li li li,aside li.active li li{background:url(../images/ai8.png) no-repeat 0 10px}nav li.active,aside li.active li{background:url(../images/ai2.png) no-repeat 0 8px}nav .page-icon{float:left;height:14px;width:14px;margin:4px 4px 0 0}.gallery{list-style:none;margin:0 0 10px}.gallery li{display:inline;margin:0 15px 0 0}.gallery a img{border:1px solid #999;height:50px;opacity:0.8;padding:1px;width:50px}.gallery li:last-child{margin:0 0 10px 0}.gallery a img:hover{opacity:1}.adspace{border-radius:4px;box-shadow:0 2px 2px rgba(0,0,0,0.3);background:#EEE;height:100%;margin:0 0 20px 0;padding:5px 10px;text-align:center;width:178px}.adspace a img{border:none}#tagcloud{overflow:hidden;width:200px}#tagcloud li{display:inline;margin:0 10px 0 0}.tagcloudsize-1 a{font-size:14px}.tagcloudsize-2 a{font-size:16px}.tagcloudsize-3 a{font-size:18px}footer{border-top:1px dotted #B5B3A9;clear:both;margin:20px 0}footer a,footer p{color:#666;display:inline;font-size:12px}footer div{background:url("../images/icons.gif") no-repeat scroll 0 -304px transparent;color:#2A2A2A;cursor:pointer;line-height:18px;margin:5px 17px 0 0;padding-left:16px;width:22px;float:right;white-space:nowrap}footer span{margin:0px}footer img{height:28px}.comments{position:relative;background:none repeat scroll 0 0 #FCFCFC;border-bottom:1px solid #CCCCCC;border-top:1px solid #CCCCCC;margin:15px -15px;padding:0 15px 15px}.comment-title{background-color:#E3E9FF;border-top:1px solid #3366CC;padding:3px 12px 3px 12px;position:relative}.comment-body-ref{border-radius:6px;background-color:#FFFFFF;border:1px solid #CCCCCC;opacity:0.9;padding:6px;position:absolute;width:387px;left:174px}.comment-body-ref .comment-author{width:67px}.comment-body-ref .comment-info{width:300px;border-width:0px}.comment-body{margin-top:15px}.comment-author{float:left;text-align:center;width:81px}.comment-author div{margin-top:10px;padding-right:14px;background:url("../images/commentpoint.png") no-repeat scroll 100% 33% transparent}.comment-author img{border-radius:4px;border:1px solid #999999;padding:1px;width:32px;height:32px}.comment-author a{white-space:nowrap;margin-right:14px;font-weight:bold}.comment-info{border-radius:6px;width:440px;padding:5px 10px;background:#EDEFF0;border:1px dotted #EDEFF0}.comment-content{word-wrap:break-word;overflow:hidden;background:url("../images/comment.gif") no-repeat scroll 100% 100% transparent;line-height:145%;margin:0 -15px;padding:9px 15px 10px;font-size:12px}.comment-form img{cursor:pointer}.comment-form input,.comment-form textarea{height:16px;outline:none;font-family:Helvetica,Arial,sans-serif;color:#555555;background:url("../images/textfield.gif") repeat-x scroll 50% 0 #fff;border:1px solid #A6A6A6;padding:2px 1px;width:200px}.comment-form textarea{width:541px;font-size:12px;height:auto}.comment-form button{background:none repeat scroll 0 0 #B4D666;border-color:#B4D666 #81B840 #81B840 #B4D666;border-style:solid;border-width:1px;color:#2970A6;font-size:12px;padding:0px 6px;height:22px;line-height:22px;border-radius:0px}.comment-form button:hover{background:none repeat scroll 0 0 #98C64C;border-color:#76B33A #98C64C #98C64C #76B33A;color:#074A7E}.error-msg{color:#3366CC}#a,#b{margin:0 auto;position:relative}#a{border-radius:4px;box-shadow:0 2px 2px rgba(0,0,0,0.3);background:#EEE;margin:15px auto;padding:10px 10px 0 10px;width:800px}#b{overflow:hidden}#c,.meta,.s,nav ul{border-radius:4px;box-shadow:0 2px 2px rgba(0,0,0,0.4);background:#CCC}#c{margin:0 0 20px 0;padding:5px 10px;width:178px}#c p,#c a{font-size:11px;line-height:15px}#c p{margin:0 0 10px 0}#c img{border-radius:4px;float:left;margin:4px 10px 2px 0}.meta{margin:10px 0 30px;padding:2px 5px}.meta p,.meta a{font-size:10px;margin:0}nav ul{padding:10px}nav ul ul{border-radius:none;box-shadow:none}.single_page{border-radius:4px;box-shadow:0 2px 2px rgba(0,0,0,0.2);background:#F2F7F8;padding:10px;margin-bottom:25px;width:531px}::-webkit-scrollbar{width:6px}::-webkit-scrollbar-track{background-color:#bbb}::-webkit-scrollbar-thumb{background-color:#eee}::-webkit-scrollbar-thumb:hover{background-color:#888} diff --git a/owmx-3.0/css/owmx-3.0.css b/owmx-3.0/css/base.scss similarity index 97% rename from owmx-3.0/css/owmx-3.0.css rename to owmx-3.0/css/base.scss index fcde063..15837f3 100644 --- a/owmx-3.0/css/owmx-3.0.css +++ b/owmx-3.0/css/base.scss @@ -29,8 +29,30 @@ Update: Dongxu Wang 2011-02-24 /* * skin owmx-3.0 style * @author Liyuan Li - * @version 1.1.0.0, Sep 21 2017 -*/ + * @version 2.0.0.0, Feb 21, 2019 + */ + +@import "../../../scss/reset-content"; +.left { + float: left; +} + +.right { + float: right; +} + +.clear:before, +.clear:after { + display: table; + content: ""; +} + +.clear:after { + clear: both; +} +.none { + display: none; +} /* Reset */ header, footer, article, nav, section, aside, time, hgroup { display : block; diff --git a/owmx-3.0/css/owmx-3.0.min.css b/owmx-3.0/css/owmx-3.0.min.css deleted file mode 100644 index 50b9161..0000000 --- a/owmx-3.0/css/owmx-3.0.min.css +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Solo - A small and beautiful blogging system written in Java. - * Copyright (c) 2010-2019, b3log.org & hacpai.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -@charset "utf-8";a.selected,header p{color:#000}article,img{height:auto}H2,blockquote{margin:0 0 20px}blockquote,cite{padding:5px 10px}article,article label,aside,footer,header,hgroup,nav,pre code,section,time{display:block}#mostCommentArticles li,#mostViewCountArticles li,aside ul.aside-comments li div.left div{text-overflow:ellipsis;-o-text-overflow:ellipsis;overflow:hidden}.comment-form img,footer div{cursor:pointer}#a,.adspace{box-shadow:0 2px 2px rgba(0,0,0,.3)}.gallery,nav ul{list-style:none}a,article,aside,body,dd,dl,dt,footer,h1,h2,h3,header,html,li,nav,p,section,table,tbody,td,tfoot,th,thead,time,tr,ul{border:0;font:12px/22px Verdana,sans-serif;margin:0;outline:0;padding:0}.vevent dt,H1,H1 a,H3,H4,H5,H6,a.selected,article label,aside ul.aside-comments a,cite,dd.summary,header a:active,header a:link,header a:visited,header p{font-weight:700}H1,H3,H4,H5,H6,header,pre code{margin:0 0 10px}BODY{background:#DDD;margin:0;color:#444}img{max-width:100%;vertical-align:middle;border:0;overflow:hidden;font-size:12px}article,header,header p{border-radius:4px}H1,H1 a{font-size:15px}A,A:ACTIVE,A:LINK,A:VISITED{color:#016f93;text-decoration:none}A:HOVER{color:#DB0202}H1,H3,H4,H5,H6{background:url(../images/ai4.png) 0 7px no-repeat;border-bottom:1px solid #CCC;color:#666;padding:0 0 0 25px}H1{background:url(../images/ai4.png) 0 6px no-repeat}H2{font-size:14px}H3{background:url(../images/ai5.png) 0 7px no-repeat}H3,H4,H5,H6{font-size:13px}h4{background-position:0 5px}sup{color:#444;top:-4px}header{background:url(../images/hd.jpg) top left no-repeat #0098CC;height:200px;padding:10px;position:relative}header a:active,header a:link,header a:visited{color:#FFF;font-size:16px}header a:hover{color:#FFF}header p{background:#FFF;bottom:20px;opacity:.5;padding:10px;position:absolute;right:20px;width:400px}.comment-title,.comments,.vevent dt{position:relative}article{background:#FFF;border:1px solid #CCC;float:right;padding:20px;width:550px}article h1{color:#666;font-weight:700;font-size:15px}.highlight-1,.highlight-2,.highlight-3{-moz-border-radius:4px;-webkit-border-radius:4px;padding:5px 10px}.highlight-1{background:#FCC;border:1px dotted #F96}.highlight-2{background:#FF9;border:1px dotted #FC3}.highlight-3{background:#CF9;border:1px dotted #CC3}aside,pre code{background:#EEE}.vevent dd,blockquote,cite,pre code{border-left:2px solid #0098CC}cite{color:#666;font-size:12px;font-style:normal;margin:0}.vevent dt,pre{font-size:10px}blockquote{color:#666}pre{color:#333;line-height:15px;overflow:hidden;overflow-y:hidden}pre code{padding:5px}dl.vevent{margin:-20px 0 20px;padding:0}.vevent dt{left:0;top:22px}.vevent a,.vevent dd{font-size:11px}.vevent dd{margin:0 0 0 80px;padding:0 0 0 10px}article form{border-radius:4px;background:#DDD;margin:0 0 20px;padding:10px}article label{color:#666;font-size:10px;margin:0 0 0 2px}.s input,nav li li a{font-size:11px}article input,article textarea{border-radius:4px;border:1px solid #CCC;font-size:11px;padding:4px 5px;width:458px}article ul,aside ul{list-style:none;margin:0 0 20px}article ul{margin:0 0 20px 23px}article ul li{background:url(../images/ai2.png) 0 8px no-repeat;padding:0 0 0 17px}aside{float:left;margin:0 0 20px;width:200px;white-space:normal}#mostCommentArticles a,#mostViewCountArticles a,.comment-author a,footer div{white-space:nowrap}aside ul.aside-comments img{border-radius:4px;width:32px;height:32px;border:1px solid #999;padding:1px;margin-top:5px;margin-right:5px}aside ul.aside-comments .side-comment{color:#555;font-weight:400;overflow:hidden;white-space:nowrap;width:158px;height:18px}aside ul.aside-comments div.left>div>div{display:none}aside ul.aside-comments .side-comment img{border:0;height:16px;width:16px;padding:0;margin-right:0;margin-top:0}aside ul.aside-comments li{padding:2px 0}aside ul.aside-comments li div{width:158px}aside ul.aside-comments li div.left div{height:18px;line-height:18px}aside ul.navi-tags li{padding-left:0;background-image:none}aside ul.navi-tags li img{margin-bottom:3px;padding-right:6px;height:16px;width:16px}.s{margin:0 0 20px;padding:10px;width:179px}.s input{border-radius:4px;border:1px solid #AAA;color:#999;padding:4px 5px;width:168px}nav li{background:url(../images/ai1.png) 0 8px no-repeat;padding:0 0 0 15px}aside li ul li ul,nav li ul{margin:0}nav li li li a{font-size:10px}aside li.active li li,nav li li li{background:url(../images/ai8.png) 0 10px no-repeat}aside li.active li,nav li.active{background:url(../images/ai2.png) 0 8px no-repeat}nav .page-icon{float:left;height:14px;width:14px;margin:4px 4px 0 0}.gallery{margin:0 0 10px}.gallery li{display:inline;margin:0 15px 0 0}.gallery a img{border:1px solid #999;height:50px;opacity:.8;padding:1px;width:50px}.gallery li:last-child{margin:0 0 10px}.gallery a img:hover{opacity:1}.adspace{border-radius:4px;background:#EEE;height:100%;margin:0 0 20px;padding:5px 10px;text-align:center;width:178px}.adspace a img{border:none}#tagcloud{overflow:hidden;width:200px}#tagcloud li{display:inline;margin:0 10px 0 0}.tagcloudsize-1 a{font-size:14px}.tagcloudsize-2 a{font-size:16px}.tagcloudsize-3 a{font-size:18px}footer{border-top:1px dotted #B5B3A9;clear:both;margin:20px 0}footer a,footer p{color:#666;display:inline;font-size:12px}footer div{background:url(../images/icons.gif) 0 -304px no-repeat;color:#2A2A2A;line-height:18px;margin:5px 17px 0 0;padding-left:16px;width:22px;float:right}footer span{margin:0}footer img{height:28px}.comments{background:#FCFCFC;border-bottom:1px solid #CCC;border-top:1px solid #CCC;margin:15px -15px;padding:0 15px 15px}.comment-title{background-color:#E3E9FF;border-top:1px solid #36C;padding:3px 12px}.comment-body-ref{border-radius:6px;background-color:#FFF;border:1px solid #CCC;opacity:.9;padding:6px;position:absolute;width:387px;left:174px}.comment-body-ref .comment-author{width:67px}.comment-body-ref .comment-info{width:300px;border-width:0}.comment-body{margin-top:15px}.comment-author{float:left;text-align:center;width:81px}.comment-author div{margin-top:10px;padding-right:14px;background:url(../images/commentpoint.png) 100% 33% no-repeat}.comment-author img{border-radius:4px;border:1px solid #999;padding:1px;width:32px;height:32px}.comment-author a{margin-right:14px;font-weight:700}.comment-info{border-radius:6px;width:440px;padding:5px 10px;background:#EDEFF0;border:1px dotted #EDEFF0}.comment-content{word-wrap:break-word;overflow:hidden;background:url(../images/comment.gif) 100% 100% no-repeat;line-height:145%;margin:0 -15px;padding:9px 15px 10px;font-size:12px}.comment-form input,.comment-form textarea{height:16px;outline:0;font-family:Helvetica,Arial,sans-serif;color:#555;background:url(../images/textfield.gif) 50% 0 repeat-x #FFF;border:1px solid #A6A6A6;padding:2px 1px;width:200px}.comment-form textarea{width:541px;font-size:12px;height:auto}.comment-form button{background:#B4D666;border-color:#B4D666 #81B840 #81B840 #B4D666;border-style:solid;border-width:1px;color:#2970A6;font-size:12px;padding:0 6px;height:22px;line-height:22px;border-radius:0}#a,#c img{border-radius:4px}.comment-form button:hover{background:#98C64C;border-color:#76B33A #98C64C #98C64C #76B33A;color:#074A7E}.error-msg{color:#36C}#a,#b{margin:0 auto;position:relative}#a{background:#EEE;margin:15px auto;padding:10px 10px 0;width:800px}#b{overflow:hidden}#c,.meta,.s,nav ul{border-radius:4px;box-shadow:0 2px 2px rgba(0,0,0,.4);background:#CCC}#c{margin:0 0 20px;padding:5px 10px;width:178px}#c a,#c p{font-size:11px;line-height:15px}#c p{margin:0 0 10px}#c img{float:left;margin:4px 10px 2px 0}.meta{margin:10px 0 30px;padding:2px 5px}.meta a,.meta p{font-size:10px;margin:0}nav ul{padding:10px}nav ul ul{border-radius:none;box-shadow:none}.single_page{border-radius:4px;box-shadow:0 2px 2px rgba(0,0,0,.2);background:#F2F7F8;padding:10px;margin-bottom:25px;width:531px}::-webkit-scrollbar{width:6px}::-webkit-scrollbar-track{background-color:#bbb}::-webkit-scrollbar-thumb{background-color:#eee}::-webkit-scrollbar-thumb:hover{background-color:#888} \ No newline at end of file diff --git a/owmx-3.0/footer.ftl b/owmx-3.0/footer.ftl index df4857b..e2ae6ba 100644 --- a/owmx-3.0/footer.ftl +++ b/owmx-3.0/footer.ftl @@ -37,22 +37,7 @@ "markedAvailable": ${markedAvailable?c}, "adminLabel": "${adminLabel}", "logoutLabel": "${logoutLabel}", - "skinDirName": "${skinDirName}", - "em00Label": "${em00Label}", - "em01Label": "${em01Label}", - "em02Label": "${em02Label}", - "em03Label": "${em03Label}", - "em04Label": "${em04Label}", - "em05Label": "${em05Label}", - "em06Label": "${em06Label}", - "em07Label": "${em07Label}", - "em08Label": "${em08Label}", - "em09Label": "${em09Label}", - "em10Label": "${em10Label}", - "em11Label": "${em11Label}", - "em12Label": "${em12Label}", - "em13Label": "${em13Label}", - "em14Label": "${em14Label}" + "skinDirName": "${skinDirName}" }; $(document).ready(function () { Util.init(); diff --git a/owmx-3.0/lang/lang_zh_CN.properties b/owmx-3.0/lang/lang_zh_CN.properties index 7d83afc..42c5f5f 100644 --- a/owmx-3.0/lang/lang_zh_CN.properties +++ b/owmx-3.0/lang/lang_zh_CN.properties @@ -188,7 +188,6 @@ permalink1Label=\u94FE\u63A5\uFF1A permalinkLabel=\u94FE\u63A5 welcomeToSoloLabel=\u6B22\u8FCE\u4F7F\u7528 Solo\uFF01 b3logLabel=B3LOG -killBrowserLabel=

\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01

\u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002

\u60A8\u53EF\u4EE5\u4E0B\u8F7D readmoreLabel=\u9605\u8BFB\u66F4\u591A\u00BB readmore2Label=\u9605\u8BFB\u66F4\u591A replyLabel=\u56DE\u590D\u00BB diff --git a/owmx-3.0/macro-head.ftl b/owmx-3.0/macro-head.ftl index e698ef7..0b439e0 100644 --- a/owmx-3.0/macro-head.ftl +++ b/owmx-3.0/macro-head.ftl @@ -27,8 +27,7 @@ - - + diff --git a/owmx-3.0/page.ftl b/owmx-3.0/page.ftl index f87def8..2747326 100644 --- a/owmx-3.0/page.ftl +++ b/owmx-3.0/page.ftl @@ -34,7 +34,7 @@ <#include "header.ftl">
-
+
${page.pageContent}
<@comments commentList=pageComments article=page> diff --git a/timeline/article-list.ftl b/timeline/article-list.ftl index cc4ee44..9a4216a 100644 --- a/timeline/article-list.ftl +++ b/timeline/article-list.ftl @@ -45,7 +45,7 @@ -
+
${article.articleAbstract}
diff --git a/timeline/article.ftl b/timeline/article.ftl index 62416ab..da633ce 100644 --- a/timeline/article.ftl +++ b/timeline/article.ftl @@ -81,7 +81,7 @@ -
+
${article.articleContent}
<#if "" != article.articleSign.signHTML?trim> diff --git a/timeline/common-comment.ftl b/timeline/common-comment.ftl index eaab747..33c43c5 100644 --- a/timeline/common-comment.ftl +++ b/timeline/common-comment.ftl @@ -39,6 +39,6 @@ ${replyLabel} -
${comment.commentContent}
+
${comment.commentContent}
\ No newline at end of file diff --git a/timeline/css/base.css b/timeline/css/base.css new file mode 100644 index 0000000..295db11 --- /dev/null +++ b/timeline/css/base.css @@ -0,0 +1,18 @@ +/** + * Solo - A small and beautiful blogging system written in Java. + * Copyright (c) 2010-2019, b3log.org & hacpai.com + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +.content-reset{word-wrap:break-word;overflow:auto;line-height:1.65;font-size:16px;word-break:break-word}.content-reset ul,.content-reset ol{padding-left:2em;margin-top:0;margin-bottom:16px}.content-reset li{margin-top:0.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{padding-bottom:0.3em;font-size:1.7em;border-bottom:1px solid #eee}.content-reset h2{padding-bottom:0.3em;font-size:1.5em;border-bottom:1px solid #eee}.content-reset h3{font-size:1.25em}.content-reset h4{font-size:1em}.content-reset h5{font-size:0.875em}.content-reset h6{font-size:0.85em}.content-reset hr{height:0.15em;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:0.25em solid #ddd;margin-bottom:16px}.content-reset blockquote p{margin:0}.content-reset ins>iframe{border:0}.content-reset iframe{border:1px solid rgba(0,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:bold;text-align:center !important;background:rgba(158,188,226,0.2)}.content-reset tbody tr:nth-child(2n){background:rgba(158,188,226,0.12)}.content-reset tr:hover{background:#efefef}.content-reset code{padding:0.2em 0.4em;margin:0;font-size:85%;background-color:rgba(252,41,41,0.12);border-radius:3px;word-break:break-word}.content-reset pre{position:relative}.content-reset pre textarea{position:absolute;top:-100000px}.content-reset pre>code{padding:0.5em;background-color:rgba(0,0,0,0.04);background-size:20px 20px;border-radius:5px;display:block}.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:solid 1px rgba(0,0,0,0.38);border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.content-reset__task,.content-reset .task-list-item{list-style:none;margin-left:-1em}.img-preview{width:100%;height:100%;top:0;z-index:211;overflow:auto;cursor:zoom-out;transition:background-color .2s ease-in-out}.img-preview img{max-width:inherit;transition:transform .3s ease-in-out}html,body{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;margin:0;padding:0;height:100%}body{font:0.81em Verdana, arial, '\5fae\8f6f\96c5\9ed1';color:#666666;background-color:#363A3D;overflow-y:scroll}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;font-family:Verdana, arial,'\5fae\8f6f\96c5\9ed1';outline:none}a{color:#6599C6;outline:medium none;text-decoration:none;transition:color 1s ease 0s}a:hover{color:#000}img{max-width:100%;border:0;vertical-align:middle}::selection{background-color:#D5D5D5;color:#FCFCFC}::-moz-selection{background-color:#D5D5D5;color:#FCFCFC}.left{float:left}.right{float:right}.clear{background-color:transparent;border:0;clear:both;display:block;font-size:0;height:0;line-height:0;overflow:hidden}.none{display:none}.fn-clear:before,.fn-clear:after{display:table;content:""}.fn-clear:after{clear:both}.tags{margin:0}.tags li{float:left;list-style-type:none;height:45px}.tags a{background-color:#FCFCFC;box-shadow:0 0 2px #D5D5D5;display:block;margin:5px 10px;padding:5px 10px}.tags a:hover{text-shadow:0 0 2px;text-decoration:none;box-shadow:0 0 4px #D5D5D5}.tags b{font-size:70%;opacity:0.6;filter:alpha(opacity=60)}.tags1,.tags1:visited{font-size:12px;color:#a7a7a7}.tags2,.tags2:visited{font-size:14px;color:#808080}.tags3,.tags3:visited{font-size:16px;color:#595959}.tags4,.tags4:visited{font-size:18px;color:#323232}.tags5,.tags5:visited{font-size:20px;color:#0a0a0a}.module{background-color:#FFFFFF;border:1px solid #BEC3C7;border-radius:5px 5px 5px 5px;box-shadow:0 1px 1px rgba(0,0,0,0.1);margin-bottom:30px;padding:15px;word-wrap:break-word;position:relative}.module>h3.title{margin:0 0 10px 0;color:#444}.module>ul.list{list-style-type:none;padding-left:0;margin:0;overflow:hidden}.module>ul.list>li{border-top:1px solid #EEEEEE;padding:6px 0}.articles .arrow,.ico-author,.ico-tags,.ico-comment,.ico-top,.ico-view,.ico-reply,.ico-translate,#search{background-repeat:no-repeat;background-image:url("../../timeline/images/icons.png")}.ico-author,.ico-tags,.ico-comment,.ico-view,.ico-reply{padding-left:20px;background-position:-1px -63px;margin-right:10px}.ico-tags{background-position:-1px -83px}.ico-comment{background-position:-1px -41px}.ico-view{background-position:0 -122px}.ico-reply{background-position:0 -162px}.ico-translate{background-position:0 -186px;cursor:pointer;float:right;height:16px;margin-left:10px;width:16px}#search{background-position:5px -138px;border:medium none;border-radius:12px 12px 12px 12px;box-shadow:0 1px 0 rgba(0,0,0,0.4) inset,0 1px 0 rgba(255,255,255,0.1);color:#A5A099;height:22px;margin-top:13px;margin-bottom:10px;padding-left:25px;transition:width 0.7s ease 0s;width:60px}#search:focus{color:#333;width:140px}.ico-top{background-color:#363A3D;background-position:4px -100px;border-radius:20em 20em 20em 20em;bottom:60px;box-shadow:0 -1px 2px rgba(0,0,0,0.3) inset,0 1px 0 rgba(255,255,255,0.15);height:25px;position:fixed;left:90%;width:25px;cursor:pointer}.ico-next,.ico-pre{background-color:#6599C6;border-radius:10em 10em 10em 10em;color:#FFFFFF;display:block;float:left;font:20px/100% "Times New Roman",Times,serif;height:28px;margin:-8px 10px 0 0;padding:4px 0 0;text-align:center;transition:background 1s ease 0s;width:32px}.ico-next{float:right;margin:-8px 0 0 10px}a:hover>.ico-next,a:hover>.ico-pre{background-color:#000}.wrapper{min-width:400px;padding:50px 0;background:url("../../timeline/images/bg.png") repeat scroll 0 0 #DEE4EA}.header{background-color:#BFBFBF;background-image:url("../../timeline/images/nav-bg.png"),linear-gradient(#ccc, #a9a9a9);background-image:url("../../timeline/images/nav-bg.png"),-ms-linear-gradient(#ccc, #a9a9a9);background-image:url("../../timeline/images/nav-bg.png"),-o-linear-gradient(#ccc, #a9a9a9);background-image:url("../../timeline/images/nav-bg.png"),-webkit-linear-gradient(#ccc, #a9a9a9);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#CCCCCC', endColorstr='#A9A9A9');border-bottom:1px solid #898989;box-shadow:0 -1px 0 rgba(255,255,255,0.3) inset,0 1px 1px rgba(0,0,0,0.2)}.container{width:80%;margin:0 auto}.footer{border-top:1px solid #232323;padding:20px 0;color:#ddd;font-size:80%}.footer a{color:#9CC0DE}.footer a:hover{text-decoration:underline}.header .title{font-size:150%;margin:3px 0 0}.header .title a{color:#414141;text-shadow:0 1px 0 rgba(255,255,255,0.7)}.header .sub-title{float:left;max-width:574px;white-space:normal;word-wrap:break-word}.header li a{color:#444;padding:17px;line-height:20px;text-shadow:0 1px 0 rgba(255,255,255,0.7);white-space:nowrap}.header li a.current{border-bottom:2px solid #D26911}.header a:hover{color:#000}.header li{float:left;list-style-type:none}.header>.container>ul,.header>.container>form{height:auto;overflow:visible}.header .page-icon{height:14px;width:14px;margin:-1px 5px 0 0}.articles{position:relative;margin-top:11px}.articles>div.fn-clear{position:relative;margin-bottom:50px}.articles>div.fn-clear>h2{margin:0;text-align:center;height:28px}.articles>.vertical{background-color:#9EB5C6;border-radius:20em 20em 20em 20em;box-shadow:0 0 1px 0 rgba(0,0,0,0.5) inset,0 0 1px 0 rgba(255,255,255,0.6);height:100%;left:50%;margin-left:-3px;position:absolute;top:0;width:6px}.articles article{width:50%;float:left}.articles article.l>div.module{margin-right:30px;left:0}.articles article.r{left:50%}.articles article.r>div{margin-left:30px;position:relative}.articles .dot{background-color:#FFFFFF;border:3px solid #60829F;border-radius:20em 20em 20em 20em;height:6px;position:absolute;right:-37px;top:22px;width:6px}.articles .r .dot{left:-37px;right:inherit}.articles .arrow{height:15px;position:absolute;right:-9px;top:21px;width:9px}.articles .r .arrow{background-position:0 -22px;left:-9px;right:inherit}.articles pre{background-color:#F5F5F5;border:1px solid #ddd;border-radius:4px 4px 4px 4px;padding:9.5px;white-space:pre-wrap;word-wrap:break-word}time.article-time{top:-8px;left:50%;position:absolute}time.article-time>span{background-color:#FFFFFF;border:1px solid #A8A9A9;border-radius:20em 20em 20em 20em;font-size:80%;margin-left:-56px;padding:5px 10px}article .article-title{margin:10px 0 0 0}article .article-title>sup{color:#6599C6;font-size:70%}article .article-title a{color:#000;text-decoration:none}.ico>a{color:#999999;font-size:80%;text-decoration:none}.ico>a:hover{color:#000}.article-more{background-color:#60829F;border-radius:20em 20em 20em 20em;box-shadow:0 1px 0 rgba(0,0,0,0.2) inset,0 1px 0 rgba(255,255,255,0.6);color:#FFFFFF;cursor:pointer;font-weight:bold;height:19px;left:50%;margin-left:-38px;padding:5px 20px;position:absolute;text-align:center;top:100%;width:36px}.article-archive{background-color:#60829F;border-radius:20em 20em 20em 20em;box-shadow:0 1px 0 rgba(0,0,0,0.2) inset,0 1px 0 rgba(255,255,255,0.6);color:#FFFFFF;font-size:80%;font-weight:normal;padding:5px 20px}.dynamic-l{float:left;width:70%}.dynamic-l>div{margin-right:30px}.dynamic-r{float:right;width:30%}.dynamic-r .tags a,.links a{line-height:24px}#comments{margin:30px 0 50px;position:relative}.comments>li>img{height:60px;width:60px;border-radius:30px;float:left;margin-right:15px}.comments .author{font-size:130%;font-style:italic}.comments>li>div>div.content-reset{padding-left:75px;margin:12px 0}.module>ul>li.comment-body-ref{background-color:#FFFFFF;border:1px solid #ddd;left:76px;opacity:0.8;filter:alpha(opacity=80);padding:10px;position:absolute;width:74%;border-radius:10px}.comment-body-ref .ico-reply{display:none}.comment-form{width:100%;margin:30px 0}#commentForm{margin-top:0}.comment-form input[type='text'],.comment-form textarea{background:url("../../timeline/images/bg.png") repeat scroll 0 0 #E5E8EA;border:1px solid #BCBDBE;border-radius:5px 5px 5px 5px;box-shadow:0 1px 2px rgba(0,0,0,0.1) inset;margin:5px 5px 5px 0;padding:6px}.comment-form input[type='text']:focus,.comment-form textarea:focus{background-color:#EFEFEF;outline:medium none}#submitCommentButton,#submitCommentButtonReply{background:none repeat scroll 0 0 #868889;border:1px solid #5D6265;border-radius:10em 10em 10em 10em;box-shadow:0 1px 0 rgba(255,255,255,0.3) inset,0 1px 1px rgba(0,0,0,0.3);color:#FFFFFF;cursor:pointer;padding:5px 20px;text-shadow:0 -1px 0 rgba(0,0,0,0.3)}#submitCommentButton:hover,#submitCommentButtonReply:hover{color:#fff;background-color:#444}.nav-abs{background-color:#6B6B6B;border:1px solid #898989;border-radius:5px 5px 5px 5px;box-shadow:0 1px 3px rgba(0,0,0,0.4) inset,0 1px 0 rgba(255,255,255,0.7),0 -1px 0 rgba(255,255,255,0.6);color:#CCCCCC;padding:5px 10px;position:absolute;right:30px;top:61px;z-index:1;text-align:center;white-space:nowrap}.index-nav-abs{padding:0;position:fixed;max-width:160px}.nav-abs li{background-color:#DEDDDD;border:1px solid #6B6B6B;color:#616161;cursor:pointer;float:left;height:20px;list-style-type:none;padding:3px 5px;width:28px}.nav-abs li.year{background-color:#6B6B6B;clear:both;color:#CCCCCC;float:none;text-shadow:0 -1px 0 rgba(0,0,0,0.5);width:auto;border-width:0}.nav-abs li:hover{background-color:#EFEEEE;color:#000}.nav-abs li.year:hover,.nav-abs li.open{background-color:#353535;color:#fff}@media (max-width: 650px){.wrapper{min-width:200px}#top>.left{display:block;float:none;width:100%}#top>a{display:block;float:none !important}#hideTop{position:absolute;right:0;top:0}#admin{display:block;float:none}#admin>a{border-right-width:0 !important;display:block;float:none !important;line-height:26px !important;margin:0 !important}.container{width:100%}.header .title{height:26px;max-width:72%;overflow:hidden}.header>.container>div.left{float:none;height:50px;margin-left:10px}.header>.container>ul{float:none;padding:0;margin:0}.header>.container li{float:none;padding:3px 10px}.header>.container li>a{padding:0;display:block}.header>.container li:hover{background-color:#FFFFFF;background-image:linear-gradient(#fff, #E5E5E5);background-image:-ms-linear-gradient(#fff, #E5E5E5);background-image:-o-linear-gradient(#fff, #E5E5E5);background-image:-webkit-linear-gradient(#fff, #E5E5E5);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFFFFF', endColorstr='#E5E5E5')}.header>.container>form{float:none;margin:10px}#search{margin:5px 0 10px 10px}#search:focus{width:92%}.ico-list{background-color:#FCFCFC;background-image:url("../../timeline/images/icons.png");background-position:4px -206px;background-repeat:no-repeat;border-radius:1px 0 3px 3px;cursor:pointer;float:right;height:25px;margin-right:35px;margin-top:-29px;width:25px}.ico-list:hover{background-color:#FFF}.footer>.container>.right{float:none;padding:0 10px;line-height:19px}.footer>.container>.right>.left{float:none}.nav-abs{position:inherit !important;padding:0;background-color:transparent;box-shadow:none;border-width:0;max-width:none !important}.index-nav-abs{margin:0}.nav-abs li{float:none;width:auto}.author,.ico-reply{margin-left:75px;display:block}.comments>li>div>div.content-reset{padding-left:0}.dynamic-l,.dynamic-r{float:none;width:auto}.dynamic-l>div{margin-right:0}.articles .arrow,.articles .dot,#admin>span,.ft-next,.ft-pre,.footer>.container>.left{display:none}.header>.container>ul,.header>.container>form{height:0;overflow:hidden;margin:0}.articles{padding-bottom:10px}.articles article{float:none;width:auto}.articles>div.fn-clear>h2{margin-bottom:40px}}@media (max-width: 360px){.ico{display:block;float:none;line-height:19px}.dynamic-r .ico{float:right}#commentForm label,#replyForm label{display:block}.footer>.container>.right>.left>span{display:block}.ico-translate{display:block;float:none;margin-left:0}.ico-top{bottom:114px}} diff --git a/timeline/css/timeline.css b/timeline/css/base.scss similarity index 79% rename from timeline/css/timeline.css rename to timeline/css/base.scss index 11c5a07..4b9e134 100644 --- a/timeline/css/timeline.css +++ b/timeline/css/base.scss @@ -16,11 +16,13 @@ * along with this program. If not, see . */ /* -* timeline skin style. -* -* @author Liyuan Li -* @version 1.2.1.0, Jan 4, 2019 -*/ + * timeline skin style. + * + * @author Liyuan Li + * @version 2.0.0.0, Feb 21, 2019 + */ + +@import "../../../scss/reset-content"; /* start reset */ html, body { -webkit-text-size-adjust: 100%; @@ -76,187 +78,6 @@ img { } /* end reset */ -/* start article-body */ -.article-body { - word-wrap: break-word; - overflow: auto; - line-height: 1.65; - font-size: 16px; - word-break: break-word; -} - -.article-body ul, -.article-body ol { - padding-left: 2em; - margin-top: 0; - margin-bottom: 16px; -} - -.article-body li { - margin-top: 0.25em; -} - -.article-body img { - cursor: zoom-in; -} - -.article-body img.emoji { - cursor: auto; - max-width: 18px; -} - -.article-body h1, -.article-body h2, -.article-body h3, -.article-body h4, -.article-body h5, -.article-body h6 { - margin-top: 24px; - margin-bottom: 16px; - font-weight: 600; - line-height: 1.25; -} - -.article-body h1 { - padding-bottom: 0.3em; - font-size: 1.7em; - border-bottom: 1px solid #eee; -} - -.article-body h2 { - padding-bottom: 0.3em; - font-size: 1.5em; - border-bottom: 1px solid #eee; -} - -.article-body h3 { - font-size: 1.25em; -} - -.article-body h4 { - font-size: 1em; -} - -.article-body h5 { - font-size: 0.875em; -} - -.article-body h6 { - font-size: 0.85em; -} - -.article-body hr { - height: 0.15em; - padding: 0; - margin: 24px 0; - background-color: #e7e7e7; - border: 0; -} - -.article-body p { - margin-top: 0; - margin-bottom: 16px; -} - -.article-body blockquote { - padding: 0 1em; - color: #777; - border-left: 0.25em solid #ddd; - margin-bottom: 16px; -} - -.article-body blockquote p { - margin: 0; -} - -.article-body ins > iframe { - border: 0; -} - -.article-body iframe { - border: 1px solid rgba(0, 0, 0, 0.38); -} - -.article-body table { - width: 100%; - border: 1px solid #dedede; - margin: 15px auto; - border-collapse: collapse; - empty-cells: show; -} - -.article-body thead { - text-align: center; -} - -.article-body td, -.article-body th { - height: 35px; - border: 1px solid #dedede; - padding: 0 10px; -} - -.article-body th { - font-weight: bold; - text-align: center !important; - background: rgba(158, 188, 226, 0.2); -} - -.article-body tbody tr:nth-child(2n) { - background: rgba(158, 188, 226, 0.12); -} - -.article-body tr:hover { - background: #efefef; -} - -.article-body code { - padding: 0.2em 0.4em; - margin: 0; - font-size: 85%; - background-color: rgba(252, 41, 41, 0.12); - border-radius: 3px; - word-break: break-word; -} - -.article-body pre { - position: relative; -} - -.article-body pre textarea { - position: absolute; - top: -100000px; -} - -.article-body pre > code { - padding: 0.5em; - background-color: rgba(0, 0, 0, 0.04); - background-size: 20px 20px; - border-radius: 5px; - display: block; -} - -.article-body 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: solid 1px rgba(0, 0, 0, 0.38); - border-bottom-color: #bbb; - border-radius: 3px; - box-shadow: inset 0 -1px 0 #bbb; -} - -.article-body__task, -.article-body .task-list-item { - list-style: none; - margin-left: -1em; -} -/* end article-body */ - /* start function */ .left { float: left; @@ -291,71 +112,6 @@ img { clear: both; } /* end function */ - -/* start common */ -.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 { - 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 1px; -} -.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; -} - .tags { margin: 0; } @@ -833,7 +589,7 @@ article .article-title a { font-style: italic; } -.comments > li > div > div.article-body { +.comments > li > div > div.content-reset { padding-left: 75px; margin: 12px 0; } @@ -1095,7 +851,7 @@ article .article-title a { display: block; } - .comments > li > div > div.article-body { + .comments > li > div > div.content-reset { padding-left: 0; } diff --git a/timeline/css/timeline.min.css b/timeline/css/timeline.min.css deleted file mode 100644 index 8fc685e..0000000 --- a/timeline/css/timeline.min.css +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Solo - A small and beautiful blogging system written in Java. - * Copyright (c) 2010-2019, b3log.org & hacpai.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -.article-body kbd,img{vertical-align:middle}.tags a:hover,a{text-decoration:none}.article-body,.articles pre,.header .sub-title,.module{word-wrap:break-word}.header li,.module>ul.list,.nav-abs li,.tags li{list-style-type:none}.clear,.fn-clear:after{clear:both}body,html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;margin:0;padding:0;height:100%}body{font:.81em Verdana,arial,'\5fae\8f6f\96c5\9ed1';color:#666;background-color:#363A3D;overflow-y:scroll}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;font-family:Verdana,arial,'\5fae\8f6f\96c5\9ed1';outline:0}a{color:#6599C6;outline:0;transition:color 1s ease 0s}a:hover{color:#000}img{max-width:100%;border:0}.article-body h1,.article-body h2{padding-bottom:.3em;border-bottom:1px solid #eee}::selection{background-color:#D5D5D5;color:#FCFCFC}::-moz-selection{background-color:#D5D5D5;color:#FCFCFC}.article-body{overflow:auto;line-height:1.65;font-size:16px;word-break:break-word}.article-body ol,.article-body ul{padding-left:2em;margin-top:0;margin-bottom:16px}.article-body li{margin-top:.25em}.article-body img{cursor:zoom-in}.article-body img.emoji{cursor:auto;max-width:18px}.article-body h1,.article-body h2,.article-body h3,.article-body h4,.article-body h5,.article-body h6{margin-top:24px;margin-bottom:16px;font-weight:600;line-height:1.25}.article-body h1{font-size:1.7em}.article-body h2{font-size:1.5em}.article-body h3{font-size:1.25em}.article-body h4{font-size:1em}.article-body h5{font-size:.875em}.article-body h6{font-size:.85em}.article-body hr{height:.15em;padding:0;margin:24px 0;background-color:#e7e7e7;border:0}.article-body p{margin-top:0;margin-bottom:16px}.article-body blockquote{padding:0 1em;color:#777;border-left:.25em solid #ddd;margin-bottom:16px}.article-body blockquote p{margin:0}.article-body ins>iframe{border:0}.article-body iframe{border:1px solid rgba(0,0,0,.38)}.article-body table{width:100%;border:1px solid #dedede;margin:15px auto;border-collapse:collapse;empty-cells:show}.article-body thead{text-align:center}.article-body td,.article-body th{height:35px;border:1px solid #dedede;padding:0 10px}.article-body th{font-weight:700;text-align:center!important;background:rgba(158,188,226,.2)}.article-body tbody tr:nth-child(2n){background:rgba(158,188,226,.12)}.article-body tr:hover{background:#efefef}.article-body code{padding:.2em .4em;margin:0;font-size:85%;background-color:rgba(252,41,41,.12);border-radius:3px;word-break:break-word}.article-body pre{position:relative}.article-body pre textarea{position:absolute;top:-100000px}.articles,.module{position:relative}.article-body pre>code{padding:.5em;background-color:rgba(0,0,0,.04);background-size:20px 20px;border-radius:5px;display:block}.article-body kbd{display:inline-block;padding:3px 5px;font:11px Consolas,"Liberation Mono",Menlo,Courier,monospace;line-height:10px;color:#555;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}.article-body .task-list-item,.article-body__task{list-style:none;margin-left:-1em}.left{float:left}.right{float:right}.clear{background-color:transparent;border:0;display:block;font-size:0;height:0;line-height:0;overflow:hidden}.none{display:none}.fn-clear:after,.fn-clear:before{display:table;content:""}.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{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 1px}.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}.tags{margin:0}.tags li{float:left;height:45px}.tags a{background-color:#FCFCFC;box-shadow:0 0 2px #D5D5D5;display:block;margin:5px 10px;padding:5px 10px}.tags a:hover{text-shadow:0 0 2px;box-shadow:0 0 4px #D5D5D5}.header .title a,.header li a{text-shadow:0 1px 0 rgba(255,255,255,.7)}.tags b{font-size:70%;opacity:.6;filter:alpha(opacity=60)}.tags1,.tags1:visited{font-size:12px;color:#a7a7a7}.tags2,.tags2:visited{font-size:14px;color:grey}.tags3,.tags3:visited{font-size:16px;color:#595959}.tags4,.tags4:visited{font-size:18px;color:#323232}.tags5,.tags5:visited{font-size:20px;color:#0a0a0a}.module{background-color:#FFF;border:1px solid #BEC3C7;border-radius:5px;box-shadow:0 1px 1px rgba(0,0,0,.1);margin-bottom:30px;padding:15px}.module>h3.title{margin:0 0 10px;color:#444}.module>ul.list{padding-left:0;margin:0;overflow:hidden}.module>ul.list>li{border-top:1px solid #EEE;padding:6px 0}#search,.articles .arrow,.ico-author,.ico-comment,.ico-reply,.ico-tags,.ico-top,.ico-translate,.ico-view{background-repeat:no-repeat;background-image:url(../images/icons.png)}.ico-author,.ico-comment,.ico-reply,.ico-tags,.ico-view{padding-left:20px;background-position:-1px -63px;margin-right:10px}.ico-tags{background-position:-1px -83px}.ico-comment{background-position:-1px -41px}.ico-view{background-position:0 -122px}.ico-reply{background-position:0 -162px}.ico-translate{background-position:0 -186px;cursor:pointer;float:right;height:16px;margin-left:10px;width:16px}#search{background-position:5px -138px;border:none;border-radius:12px;box-shadow:0 1px 0 rgba(0,0,0,.4) inset,0 1px 0 rgba(255,255,255,.1);color:#A5A099;height:22px;margin-top:13px;margin-bottom:10px;padding-left:25px;transition:width .7s ease 0s;width:60px}#search:focus{color:#333;width:140px}.ico-top{background-color:#363A3D;background-position:4px -100px;border-radius:20em;bottom:60px;box-shadow:0 -1px 2px rgba(0,0,0,.3) inset,0 1px 0 rgba(255,255,255,.15);height:25px;position:fixed;left:90%;width:25px;cursor:pointer}.ico-next,.ico-pre{background-color:#6599C6;border-radius:10em;color:#FFF;display:block;float:left;font:20px/100% "Times New Roman",Times,serif;height:28px;margin:-8px 10px 0 0;padding:4px 0 0;text-align:center;transition:background 1s ease 0s;width:32px}.ico-next{float:right;margin:-8px 0 0 10px}a:hover>.ico-next,a:hover>.ico-pre{background-color:#000}.wrapper{min-width:400px;padding:50px 0;background:url(../images/bg.png) #DEE4EA}.header{background-color:#BFBFBF;background-image:url(../images/nav-bg.png),linear-gradient(#CCC,#A9A9A9);background-image:url(../images/nav-bg.png),-ms-linear-gradient(#CCC,#A9A9A9);background-image:url(../images/nav-bg.png),-o-linear-gradient(#CCC,#A9A9A9);background-image:url(../images/nav-bg.png),-webkit-linear-gradient(#CCC,#A9A9A9);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#CCCCCC', endColorstr='#A9A9A9');border-bottom:1px solid #898989;box-shadow:0 -1px 0 rgba(255,255,255,.3) inset,0 1px 1px rgba(0,0,0,.2)}.container{width:80%;margin:0 auto}.footer{border-top:1px solid #232323;padding:20px 0;color:#ddd;font-size:80%}.footer a{color:#9CC0DE}.footer a:hover{text-decoration:underline}.header .title{font-size:150%;margin:3px 0 0}.header .title a{color:#414141}.header .sub-title{float:left;max-width:574px;white-space:normal}.header li a{color:#444;padding:17px;line-height:20px;white-space:nowrap}.header li a.current{border-bottom:2px solid #D26911}.header a:hover{color:#000}.header li{float:left}.header>.container>form,.header>.container>ul{height:auto;overflow:visible}.header .page-icon{height:14px;width:14px;margin:-1px 5px 0 0}.articles{margin-top:11px}.articles>div.fn-clear{position:relative;margin-bottom:50px}.articles>div.fn-clear>h2{margin:0;text-align:center;height:28px}.articles>.vertical{background-color:#9EB5C6;border-radius:20em;box-shadow:0 0 1px 0 rgba(0,0,0,.5) inset,0 0 1px 0 rgba(255,255,255,.6);height:100%;left:50%;margin-left:-3px;position:absolute;top:0;width:6px}.articles article{width:50%;float:left}.articles article.l>div.module{margin-right:30px;left:0}.articles article.r{left:50%}.articles article.r>div{margin-left:30px;position:relative}.articles .dot{background-color:#FFF;border:3px solid #60829F;border-radius:20em;height:6px;position:absolute;right:-37px;top:22px;width:6px}.articles .r .dot{left:-37px;right:inherit}.articles .arrow{height:15px;position:absolute;right:-9px;top:21px;width:9px}.articles .r .arrow{background-position:0 -22px;left:-9px;right:inherit}.articles pre{background-color:#F5F5F5;border:1px solid #ddd;border-radius:4px;padding:9.5px;white-space:pre-wrap}time.article-time{top:-8px;left:50%;position:absolute}time.article-time>span{background-color:#FFF;border:1px solid #A8A9A9;border-radius:20em;font-size:80%;margin-left:-56px;padding:5px 10px}.article-archive,.article-more{background-color:#60829F;border-radius:20em;box-shadow:0 1px 0 rgba(0,0,0,.2) inset,0 1px 0 rgba(255,255,255,.6);padding:5px 20px}article .article-title{margin:10px 0 0}article .article-title>sup{color:#6599C6;font-size:70%}article .article-title a{color:#000;text-decoration:none}.ico>a{color:#999;font-size:80%;text-decoration:none}.ico>a:hover{color:#000}.article-more{color:#FFF;cursor:pointer;font-weight:700;height:19px;left:50%;margin-left:-38px;position:absolute;text-align:center;top:100%;width:36px}.article-archive{color:#FFF;font-size:80%;font-weight:400}.dynamic-l{float:left;width:70%}.dynamic-l>div{margin-right:30px}.dynamic-r{float:right;width:30%}.dynamic-r .tags a,.links a{line-height:24px}#comments{margin:30px 0 50px;position:relative}.comments>li>img{height:60px;width:60px;border-radius:30px;float:left;margin-right:15px}.comments .author{font-size:130%;font-style:italic}.comments>li>div>div.article-body{padding-left:75px;margin:12px 0}.module>ul>li.comment-body-ref{background-color:#FFF;border:1px solid #ddd;left:76px;opacity:.8;filter:alpha(opacity=80);padding:10px;position:absolute;width:74%;border-radius:10px}.comment-body-ref .ico-reply{display:none}.comment-form{width:100%;margin:30px 0}#commentForm{margin-top:0}.comment-form input[type=text],.comment-form textarea{background:url(../images/bg.png) #E5E8EA;border:1px solid #BCBDBE;border-radius:5px;box-shadow:0 1px 2px rgba(0,0,0,.1) inset;margin:5px 5px 5px 0;padding:6px}.comment-form input[type=text]:focus,.comment-form textarea:focus{background-color:#EFEFEF;outline:0}#submitCommentButton,#submitCommentButtonReply{background:#868889;border:1px solid #5D6265;border-radius:10em;box-shadow:0 1px 0 rgba(255,255,255,.3) inset,0 1px 1px rgba(0,0,0,.3);color:#FFF;cursor:pointer;padding:5px 20px;text-shadow:0 -1px 0 rgba(0,0,0,.3)}#submitCommentButton:hover,#submitCommentButtonReply:hover{color:#fff;background-color:#444}.nav-abs{background-color:#6B6B6B;border:1px solid #898989;border-radius:5px;box-shadow:0 1px 3px rgba(0,0,0,.4) inset,0 1px 0 rgba(255,255,255,.7),0 -1px 0 rgba(255,255,255,.6);color:#CCC;padding:5px 10px;position:absolute;right:30px;top:61px;z-index:1;text-align:center;white-space:nowrap}.index-nav-abs{padding:0;position:fixed;max-width:160px}.nav-abs li{background-color:#DEDDDD;border:1px solid #6B6B6B;color:#616161;cursor:pointer;float:left;height:20px;padding:3px 5px;width:28px}.nav-abs li.year{background-color:#6B6B6B;clear:both;color:#CCC;float:none;text-shadow:0 -1px 0 rgba(0,0,0,.5);width:auto;border-width:0}.nav-abs li:hover{background-color:#EFEEEE;color:#000}.nav-abs li.open,.nav-abs li.year:hover{background-color:#353535;color:#fff}@media (max-width:650px){#top>.left,.container{width:100%}#admin,#admin>a,#top>.left,#top>a,.author,.ico-reply{display:block}.wrapper{min-width:200px}#top>.left{float:none}#top>a{float:none!important}#hideTop{position:absolute;right:0;top:0}#admin{float:none}#admin>a{border-right-width:0!important;float:none!important;line-height:26px!important;margin:0!important}.header .title{height:26px;max-width:72%;overflow:hidden}.header>.container>div.left{float:none;height:50px;margin-left:10px}.header>.container>ul{float:none;padding:0}.header>.container li{float:none;padding:3px 10px}.header>.container li>a{padding:0;display:block}.header>.container li:hover{background-color:#FFF;background-image:linear-gradient(#FFF,#E5E5E5);background-image:-ms-linear-gradient(#FFF,#E5E5E5);background-image:-o-linear-gradient(#FFF,#E5E5E5);background-image:-webkit-linear-gradient(#FFF,#E5E5E5);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFFFFF', endColorstr='#E5E5E5')}.header>.container>form{float:none}#search{margin:5px 0 10px 10px}#search:focus{width:92%}.ico-list{background-color:#FCFCFC;background-image:url(../images/icons.png);background-position:4px -206px;background-repeat:no-repeat;border-radius:1px 0 3px 3px;cursor:pointer;float:right;height:25px;margin-right:35px;margin-top:-29px;width:25px}.articles article,.dynamic-l,.dynamic-r,.nav-abs li{float:none;width:auto}.ico-list:hover{background-color:#FFF}.footer>.container>.right{float:none;padding:0 10px;line-height:19px}.footer>.container>.right>.left{float:none}.nav-abs{position:inherit!important;padding:0;background-color:transparent;box-shadow:none;border-width:0;max-width:none!important}.index-nav-abs{margin:0}.author,.ico-reply{margin-left:75px}.comments>li>div>div.article-body{padding-left:0}.dynamic-l>div{margin-right:0}#admin>span,.articles .arrow,.articles .dot,.footer>.container>.left,.ft-next,.ft-pre{display:none}.header>.container>form,.header>.container>ul{height:0;overflow:hidden;margin:0}.articles{padding-bottom:10px}.articles>div.fn-clear>h2{margin-bottom:40px}}@media (max-width:360px){#commentForm label,#replyForm label,.footer>.container>.right>.left>span,.ico{display:block}.ico{float:none;line-height:19px}.dynamic-r .ico{float:right}.ico-translate{display:block;float:none;margin-left:0}.ico-top{bottom:114px}} \ No newline at end of file diff --git a/timeline/dynamic.ftl b/timeline/dynamic.ftl index 8c1feaf..cbe39e0 100644 --- a/timeline/dynamic.ftl +++ b/timeline/dynamic.ftl @@ -61,7 +61,7 @@ ${viewLabel} -
+
${comment.commentContent}
diff --git a/timeline/footer.ftl b/timeline/footer.ftl index 7748efd..37bcb75 100644 --- a/timeline/footer.ftl +++ b/timeline/footer.ftl @@ -69,21 +69,6 @@ "adminLabel": "${adminLabel}", "logoutLabel": "${logoutLabel}", "skinDirName": "${skinDirName}", - "em00Label": "${em00Label}", - "em01Label": "${em01Label}", - "em02Label": "${em02Label}", - "em03Label": "${em03Label}", - "em04Label": "${em04Label}", - "em05Label": "${em05Label}", - "em06Label": "${em06Label}", - "em07Label": "${em07Label}", - "em08Label": "${em08Label}", - "em09Label": "${em09Label}", - "em10Label": "${em10Label}", - "em11Label": "${em11Label}", - "em12Label": "${em12Label}", - "em13Label": "${em13Label}", - "em14Label": "${em14Label}", "localeString": "${localeString}", "yearLabel": "${yearLabel}", "monthLabel": "${monthLabel}" diff --git a/timeline/index.ftl b/timeline/index.ftl index 5c70693..2022e7b 100644 --- a/timeline/index.ftl +++ b/timeline/index.ftl @@ -85,7 +85,7 @@ -
+
${article.articleAbstract}
diff --git a/timeline/js/timeline.js b/timeline/js/timeline.js index 2da2ca5..64fb32a 100644 --- a/timeline/js/timeline.js +++ b/timeline/js/timeline.js @@ -449,7 +449,7 @@ var timeline = { (function() { Util.init(); - Util.replaceSideEm($(".comments .article-body")); + Util.replaceSideEm($(".comments .content-reset")); Util.buildTags("tagsSide"); timeline.init(); diff --git a/timeline/js/timeline.min.js b/timeline/js/timeline.min.js index 8558fd8..c753c9b 100644 --- a/timeline/js/timeline.min.js +++ b/timeline/js/timeline.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 timeline={_COLHA:0,_COLHB:20,_initArticleList:function(){var e=$(".articles");0===e.length||0<$(".articles > .fn-clear").length||($(window).resize(function(){if("auto"===$("#hideTop").css("top")){var i=[timeline._COLHA,timeline._COLHB];e.find("article").each(function(){var e=$(this),t=i[1]>i[0],a=t?i[0]:i[1];parseInt(e.css("top"))===a&&0!==a||(e.css({top:a+"px",position:"absolute"}),this.className=t?"l":"r"),i[t?"0":"1"]+=parseInt(e.outerHeight(!0))}),e.height(i[0]>i[1]?i[0]:i[1])}else e.find("article").each(function(){$(this).css({position:"inherit",top:"auto"}).removeClass("r l")}),e.css("height","auto")}),$(window).resize(),$(".module img").imagesLoaded(function(){$(window).resize()}))},_initIndexList:function(){var e=$(".articles > .fn-clear");if(0!==e.length){var a=0;$(".nav-abs li").each(function(e){var t=$(this);t.hide(),a!==t.data("year")&&(a=t.data("year"),t.before("
  • "+a+"
    • "))}),$(".article-more").parent().data("count")<=$(".article-more").parent().find("article").length&&$(".article-more").remove(),$(window).resize(function(){e.each(function(){if("auto"===$("#hideTop").css("top")){var i=[timeline._COLHA+60,4*timeline._COLHB];0===(e=$(this).find("article")).length?($(this).find("h2").remove(),$(this).css("margin-bottom",0)):(e.each(function(){var e=$(this),t=i[1]>i[0],a=t?i[0]:i[1];parseInt(e.css("top"))===a&&0!==a||(e.css({top:a+"px",position:"absolute"}),this.className=t?"l":"r"),i[t?"0":"1"]+=parseInt(e.outerHeight(!0))}),$(this).height(i[0]>i[1]?i[0]:i[1]))}else{var e;0===(e=$(this).find("article")).length?($(this).find("h2").remove(),$(this).css("margin-bottom",0)):(e.each(function(){$(this).css({position:"inherit",top:"auto"}).removeClass("r l")}),$(this).css("height","auto"))}})}),$(window).resize(),$(".module img").imagesLoaded(function(){$(window).resize()})}},_setNavCurrent:function(){$(".header li a").each(function(){$(this).prop("href")===location.href.split("#")[0]?this.className="current":this.className=""})},init:function(){$(window).scroll(function(){60<$(window).scrollTop()?$(".ico-top").show():$(".ico-top").hide()}),timeline._initIndexList(),timeline._initArticleList(),timeline._setNavCurrent(),$(".ico-list").click(function(){"0px"===$(".header > .container > form").css("height")?$(".header > .container > ul, .header > .container > form").css({height:"auto"}):$(".header > .container > ul, .header > .container > form").animate({height:"0px"})})},translate:function(){window.open("http://translate.google.com/translate?sl=auto&tl=auto&u="+location.href)},getArchive:function(e,t,a){var i=e+t,s=e+"/"+t;if(window.location.hash="#"+i,0===$("#"+i+" > article").length){var n=e+" "+Label.yearLabel+" "+t+" "+Label.monthLabel;"en"===Label.localeString.substring(0,2)&&(n=a+" "+e);var r='

    '+n+'

    '+Label.moreLabel+"
    ";$("#"+i).html(r).css("margin-bottom","50px"),timeline.getNextPage($("#"+i).find(".article-more")[0],s)}},getNextPage:function(e,t){var l=$(e),c=l.data("page")+1,a="/articles/";if(1===$("#tag").length)a="/articles/tags/"+(i=location.pathname.split("/"))[i.length-1]+"/";else if(1===$("#author").length){var i;a="/articles/authors/"+(i=location.pathname.split("/"))[i.length-1]+"/"}else t&&(a="/articles/archives/"+t+"/");$.ajax({url:latkeConfig.servePath+a+"?p="+c,type:"GET",beforeSend:function(){l.css("background","url("+latkeConfig.staticServePath+"/skins/timeline/images/ajax-loader.gif) no-repeat scroll center center #60829F").text("")},success:function(e,t){if(e.sc)if(0!==e.rslts.articles.length){for(var a="",i=e.rslts.pagination,s=0;s

    '+n.articleTitle+"",n.hasUpdated&&(a+=""+Label.updatedLabel+""),n.articlePutTop&&(a+=""+Label.topArticleLabel+""),a+="

    "+n.articleAbstract+'

    ';for(var r=n.articleTags.split(","),o=0;o'+r[o]+"",o  '+(0===n.articleCommentCount?Label.noCommentLabel:n.articleCommentCount)+' '+n.articleViewCount+"
    "}l.before(a).data("page",c),i.paginationPageCount<=c?l.remove():l.css("background","none #60829F").text(Label.moreLabel),$(window).resize(),$(".module img").imagesLoaded(function(){$(window).resize()})}else l.remove();else l.css("background","none #60829F").text("Error")}})},toggleArchives:function(a,i){$(".nav-abs li").each(function(e){var t=$(this);t.hasClass("year")||(t.hide(),i===t.data("year")&&$(a).hasClass("close")&&t.show())}),$(".nav-abs li.year").each(function(){parseInt($(this).text())===i?$(a).hasClass("close")?a.className="year open":a.className="year close":this.className="year close"})}};!function(u,e){"use strict";var g="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==";u.fn.imagesLoaded=function(a){var i=this,s=u.isFunction(u.Deferred)?u.Deferred():0,n=u.isFunction(s.notify),r=i.find("img").add(i.filter("img")),o=[],l=[],c=[];function h(){var e=u(l),t=u(c);s&&(c.length?s.reject(r,e,t):s.resolve(r)),u.isFunction(a)&&a.call(i,r,e,t)}function d(e){m(e.target,"error"===e.type)}function m(e,t){e.src!==g&&-1===u.inArray(e,o)&&(o.push(e),t?c.push(e):l.push(e),u.data(e,"imagesLoaded",{isBroken:t,src:e.src}),n&&s.notifyWith(u(e),[t,r,u(l),u(c)]),r.length===o.length&&(setTimeout(h),r.unbind(".imagesLoaded",d)))}return u.isPlainObject(a)&&u.each(a,function(e,t){"callback"===e?a=t:s&&s[e](t)}),r.length?r.bind("load.imagesLoaded error.imagesLoaded",d).each(function(e,t){var a=t.src,i=u.data(t,"imagesLoaded");i&&i.src===a?m(t,i.isBroken):t.complete&&void 0!==t.naturalWidth?m(t,0===t.naturalWidth||0===t.naturalHeight):(t.readyState||t.complete)&&(t.src=g,t.src=a)}):h(),s?s.promise(i):i}}(jQuery),Util.init(),Util.replaceSideEm($(".comments .article-body")),Util.buildTags("tagsSide"),timeline.init(); \ No newline at end of file +var timeline={_COLHA:0,_COLHB:20,_initArticleList:function(){var e=$(".articles");0===e.length||0<$(".articles > .fn-clear").length||($(window).resize(function(){if("auto"===$("#hideTop").css("top")){var i=[timeline._COLHA,timeline._COLHB];e.find("article").each(function(){var e=$(this),t=i[1]>i[0],a=t?i[0]:i[1];parseInt(e.css("top"))===a&&0!==a||(e.css({top:a+"px",position:"absolute"}),this.className=t?"l":"r"),i[t?"0":"1"]+=parseInt(e.outerHeight(!0))}),e.height(i[0]>i[1]?i[0]:i[1])}else e.find("article").each(function(){$(this).css({position:"inherit",top:"auto"}).removeClass("r l")}),e.css("height","auto")}),$(window).resize(),$(".module img").imagesLoaded(function(){$(window).resize()}))},_initIndexList:function(){var e=$(".articles > .fn-clear");if(0!==e.length){var a=0;$(".nav-abs li").each(function(e){var t=$(this);t.hide(),a!==t.data("year")&&(a=t.data("year"),t.before("
  • "+a+"
    • "))}),$(".article-more").parent().data("count")<=$(".article-more").parent().find("article").length&&$(".article-more").remove(),$(window).resize(function(){e.each(function(){if("auto"===$("#hideTop").css("top")){var i=[timeline._COLHA+60,4*timeline._COLHB];0===(e=$(this).find("article")).length?($(this).find("h2").remove(),$(this).css("margin-bottom",0)):(e.each(function(){var e=$(this),t=i[1]>i[0],a=t?i[0]:i[1];parseInt(e.css("top"))===a&&0!==a||(e.css({top:a+"px",position:"absolute"}),this.className=t?"l":"r"),i[t?"0":"1"]+=parseInt(e.outerHeight(!0))}),$(this).height(i[0]>i[1]?i[0]:i[1]))}else{var e;0===(e=$(this).find("article")).length?($(this).find("h2").remove(),$(this).css("margin-bottom",0)):(e.each(function(){$(this).css({position:"inherit",top:"auto"}).removeClass("r l")}),$(this).css("height","auto"))}})}),$(window).resize(),$(".module img").imagesLoaded(function(){$(window).resize()})}},_setNavCurrent:function(){$(".header li a").each(function(){$(this).prop("href")===location.href.split("#")[0]?this.className="current":this.className=""})},init:function(){$(window).scroll(function(){60<$(window).scrollTop()?$(".ico-top").show():$(".ico-top").hide()}),timeline._initIndexList(),timeline._initArticleList(),timeline._setNavCurrent(),$(".ico-list").click(function(){"0px"===$(".header > .container > form").css("height")?$(".header > .container > ul, .header > .container > form").css({height:"auto"}):$(".header > .container > ul, .header > .container > form").animate({height:"0px"})})},translate:function(){window.open("http://translate.google.com/translate?sl=auto&tl=auto&u="+location.href)},getArchive:function(e,t,a){var i=e+t,s=e+"/"+t;if(window.location.hash="#"+i,0===$("#"+i+" > article").length){var n=e+" "+Label.yearLabel+" "+t+" "+Label.monthLabel;"en"===Label.localeString.substring(0,2)&&(n=a+" "+e);var r='

    '+n+'

    '+Label.moreLabel+"
    ";$("#"+i).html(r).css("margin-bottom","50px"),timeline.getNextPage($("#"+i).find(".article-more")[0],s)}},getNextPage:function(e,t){var l=$(e),c=l.data("page")+1,a="/articles/";if(1===$("#tag").length)a="/articles/tags/"+(i=location.pathname.split("/"))[i.length-1]+"/";else if(1===$("#author").length){var i;a="/articles/authors/"+(i=location.pathname.split("/"))[i.length-1]+"/"}else t&&(a="/articles/archives/"+t+"/");$.ajax({url:latkeConfig.servePath+a+"?p="+c,type:"GET",beforeSend:function(){l.css("background","url("+latkeConfig.staticServePath+"/skins/timeline/images/ajax-loader.gif) no-repeat scroll center center #60829F").text("")},success:function(e,t){if(e.sc)if(0!==e.rslts.articles.length){for(var a="",i=e.rslts.pagination,s=0;s

    '+n.articleTitle+"",n.hasUpdated&&(a+=""+Label.updatedLabel+""),n.articlePutTop&&(a+=""+Label.topArticleLabel+""),a+="

    "+n.articleAbstract+'

    ';for(var r=n.articleTags.split(","),o=0;o'+r[o]+"",o  '+(0===n.articleCommentCount?Label.noCommentLabel:n.articleCommentCount)+' '+n.articleViewCount+"
    "}l.before(a).data("page",c),i.paginationPageCount<=c?l.remove():l.css("background","none #60829F").text(Label.moreLabel),$(window).resize(),$(".module img").imagesLoaded(function(){$(window).resize()})}else l.remove();else l.css("background","none #60829F").text("Error")}})},toggleArchives:function(a,i){$(".nav-abs li").each(function(e){var t=$(this);t.hasClass("year")||(t.hide(),i===t.data("year")&&$(a).hasClass("close")&&t.show())}),$(".nav-abs li.year").each(function(){parseInt($(this).text())===i?$(a).hasClass("close")?a.className="year open":a.className="year close":this.className="year close"})}};!function(u,e){"use strict";var g="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==";u.fn.imagesLoaded=function(a){var i=this,s=u.isFunction(u.Deferred)?u.Deferred():0,n=u.isFunction(s.notify),r=i.find("img").add(i.filter("img")),o=[],l=[],c=[];function h(){var e=u(l),t=u(c);s&&(c.length?s.reject(r,e,t):s.resolve(r)),u.isFunction(a)&&a.call(i,r,e,t)}function d(e){m(e.target,"error"===e.type)}function m(e,t){e.src!==g&&-1===u.inArray(e,o)&&(o.push(e),t?c.push(e):l.push(e),u.data(e,"imagesLoaded",{isBroken:t,src:e.src}),n&&s.notifyWith(u(e),[t,r,u(l),u(c)]),r.length===o.length&&(setTimeout(h),r.unbind(".imagesLoaded",d)))}return u.isPlainObject(a)&&u.each(a,function(e,t){"callback"===e?a=t:s&&s[e](t)}),r.length?r.bind("load.imagesLoaded error.imagesLoaded",d).each(function(e,t){var a=t.src,i=u.data(t,"imagesLoaded");i&&i.src===a?m(t,i.isBroken):t.complete&&void 0!==t.naturalWidth?m(t,0===t.naturalWidth||0===t.naturalHeight):(t.readyState||t.complete)&&(t.src=g,t.src=a)}):h(),s?s.promise(i):i}}(jQuery),Util.init(),Util.replaceSideEm($(".comments .content-reset")),Util.buildTags("tagsSide"),timeline.init(); \ No newline at end of file diff --git a/timeline/lang/lang_zh_CN.properties b/timeline/lang/lang_zh_CN.properties index a89974b..1e2adf7 100644 --- a/timeline/lang/lang_zh_CN.properties +++ b/timeline/lang/lang_zh_CN.properties @@ -76,4 +76,3 @@ randomArticlesLabel=\u968F\u673A\u9605\u8BFB externalRelevantArticlesLabel=\u7AD9\u5916\u76F8\u5173\u9605\u8BFB captchaErrorLabel=\u9A8C\u8BC1\u7801\u9519\u8BEF b3logLabel=B3LOG -killBrowserLabel=

    \u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01

    \u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002

    \u60A8\u53EF\u4EE5\u4E0B\u8F7D diff --git a/timeline/macro-head.ftl b/timeline/macro-head.ftl index 1591276..410c898 100644 --- a/timeline/macro-head.ftl +++ b/timeline/macro-head.ftl @@ -27,7 +27,7 @@ - + diff --git a/timeline/page.ftl b/timeline/page.ftl index a4d62d0..d12ec6a 100644 --- a/timeline/page.ftl +++ b/timeline/page.ftl @@ -34,7 +34,7 @@
    -
    +
    ${page.pageContent}
    <@comments commentList=pageComments article=page> diff --git a/tree-house/article.ftl b/tree-house/article.ftl index f723af7..e5d2b5e 100644 --- a/tree-house/article.ftl +++ b/tree-house/article.ftl @@ -92,7 +92,7 @@
    -
    +
    ${article.articleContent} <#if "" != article.articleSign.signHTML?trim>
    diff --git a/tree-house/common-comment.ftl b/tree-house/common-comment.ftl index f26cd7a..81f9b3f 100644 --- a/tree-house/common-comment.ftl +++ b/tree-house/common-comment.ftl @@ -45,7 +45,7 @@
    ${comment.commentName} -
    +
    ${comment.commentContent}
    diff --git a/tree-house/css/base.css b/tree-house/css/base.css new file mode 100644 index 0000000..f082961 --- /dev/null +++ b/tree-house/css/base.css @@ -0,0 +1,18 @@ +/** + * Solo - A small and beautiful blogging system written in Java. + * Copyright (c) 2010-2019, b3log.org & hacpai.com + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +.content-reset{word-wrap:break-word;overflow:auto;line-height:1.65;font-size:16px;word-break:break-word}.content-reset ul,.content-reset ol{padding-left:2em;margin-top:0;margin-bottom:16px}.content-reset li{margin-top:0.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{padding-bottom:0.3em;font-size:1.7em;border-bottom:1px solid #eee}.content-reset h2{padding-bottom:0.3em;font-size:1.5em;border-bottom:1px solid #eee}.content-reset h3{font-size:1.25em}.content-reset h4{font-size:1em}.content-reset h5{font-size:0.875em}.content-reset h6{font-size:0.85em}.content-reset hr{height:0.15em;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:0.25em solid #ddd;margin-bottom:16px}.content-reset blockquote p{margin:0}.content-reset ins>iframe{border:0}.content-reset iframe{border:1px solid rgba(0,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:bold;text-align:center !important;background:rgba(158,188,226,0.2)}.content-reset tbody tr:nth-child(2n){background:rgba(158,188,226,0.12)}.content-reset tr:hover{background:#efefef}.content-reset code{padding:0.2em 0.4em;margin:0;font-size:85%;background-color:rgba(252,41,41,0.12);border-radius:3px;word-break:break-word}.content-reset pre{position:relative}.content-reset pre textarea{position:absolute;top:-100000px}.content-reset pre>code{padding:0.5em;background-color:rgba(0,0,0,0.04);background-size:20px 20px;border-radius:5px;display:block}.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:solid 1px rgba(0,0,0,0.38);border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.content-reset__task,.content-reset .task-list-item{list-style:none;margin-left:-1em}.img-preview{width:100%;height:100%;top:0;z-index:211;overflow:auto;cursor:zoom-out;transition:background-color .2s ease-in-out}.img-preview img{max-width:inherit;transition:transform .3s ease-in-out}.left{float:left}.right{float:right}.clear:before,.clear:after{display:table;content:""}.clear:after{clear:both}.none{display:none}html{min-width:948px}body{background:url("../images/bg-tree.jpg") repeat-y scroll 50% 0 #7BCCFF;color:#42423D;min-width:948px}a,a:link,a:visited{color:#FFFFFF;text-decoration:none}a:hover{text-decoration:underline}h5{font-size:12px}img{max-width:100%;vertical-align:middle;border:0;height:auto;-ms-interpolation-mode:bicubic;overflow:hidden;font-size:12px}.wrapper{background:url("../images/bg-header.jpg") no-repeat scroll 50% 0 transparent}.bg-bottom{background:url("../images/bg-footer2.jpg") no-repeat scroll 50% 100% transparent}.content{margin:0 auto;width:948px}.header{height:476px;width:100%}.header-navi{position:relative;z-index:10}.header-navi ul{list-style:none outside none;margin-top:20px}.header-navi li{float:left}.header-navi .page-icon{float:left;height:14px;width:14px;margin:2px 3px 0 0}.header-title{color:#FFFFFF;margin-left:146px;padding-top:222px;position:relative}#logoTitle{color:#FFFFFF;font-size:52px;text-decoration:none}.header-title div{color:DimGray;width:300px}.side{margin:0 0 0 -21px;width:256px}.body{min-height:643px;padding-bottom:682px}.main{width:634px}.footer{color:Lavender;padding:12px;text-align:center}.footer a{font-weight:bold}.article{overflow:hidden;width:553px}.article-header sup{color:red;font-size:12px}.article-header h2{color:#242323;font-weight:bold;margin-left:6px;position:relative}.article-header h2 a{color:#242323;display:block;padding:3px 0 4px 10px;text-decoration:none}.article-header h2 a:hover{background-color:#242323;color:#EC0A8B}.article-info{margin:10px 0 0 9px;width:109px}.article-main{margin:10px 0 0 9px;min-height:150px;width:426px}.article-tags{background-color:#EC0A8B;float:left;font-style:normal;height:21px;line-height:21px;margin:0 10px 10px 0;padding:3px 10px}.article-abstract{color:#42423D;line-height:145%;overflow:hidden;padding:6px 10px 12px 0;text-align:justify;word-wrap:break-word}.main .line{background:url("../images/bg-branch.png") no-repeat scroll 0 0 transparent;height:108px;width:575px}.article-date{background-color:#D4F2FB;border:6px solid #A8D3ED;border-radius:5px;margin-left:16px;padding:6px;width:65px}.article-comment{background:url("../images/bg-comments.png") no-repeat scroll 0 0 transparent;font-size:12px;height:22px;margin:24px 0 0;padding:29px 0 0;text-align:center}.article-comment a{color:#42423D}.main h2.title{color:#FF9000;margin:-34px 0 12px;text-align:center}.main h2 span{color:DimGray;float:right;font-size:12px;margin-top:7px;padding-right:10px}.content-reset{margin:0 12px 12px}.content-reset a,.article-abstract a{color:#242323;text-decoration:underline}.article-footer{margin-right:12px}.article-details-footer a{line-height:16px}.article-details-footer{margin:36px 12px 0 0}.article-details-footer .right a:hover{text-decoration:none}.article-relative{line-height:145%;margin:12px 0}.comments{padding-left:99px;position:relative}.comments-header{background:url("../images/balloons.png") no-repeat scroll 0 0 transparent;height:88px;left:100px;position:relative;top:40px;width:440px;z-index:10}.comment-top{background:url("../images/bg-comments-top.png") no-repeat scroll 0 0 transparent;height:22px}.comment-body{background:url("../images/bg-comments-body.png") repeat-y scroll 0 0 transparent;color:#42423D;margin-left:-1px;overflow:hidden;padding:0 27px 2px 27px;width:401px;word-wrap:break-word}.comment-body a{color:#42423D}.comment-body td{white-space:normal}.comment-bottom{background:url("../images/bg-comments-bottom.png") no-repeat scroll 0 0 transparent;height:23px}.comment-title{padding-bottom:6px}.comment-title a{color:#42423D;font-weight:bold}.comment-body-ref{left:182px;opacity:0.9;position:absolute;top:16px;z-index:16}img.comment-picture{height:60px;padding:0px 6px 4px 0;width:60px}.comment-reply{margin:0 auto 24px auto}#commentURL:focus,#commentURLReply:focus{box-shadow:-3px 1px 2px rgba(0,0,0,0.3) inset}#comment,#commentReply{resize:vertical}.error-msg{color:#EC0A8B;font-weight:bold;white-space:normal}#sideNavi .line{background:url("../images/bg-branch-small.png") no-repeat;height:69px;margin-top:12px}#sideNavi .block{margin-left:64px}#sideNavi h3{background:url("../images/bg-heading.png") no-repeat scroll 0 0 transparent;color:#EC0A8B;font-size:15px;height:30px;padding:38px 0 0 12px}#sideNavi .notice h3{background-image:url("../images/bg-heading-about-us.png")}#sideNavi #recentComments img{height:16px;vertical-align:middle;width:16px}#sideNavi #recentCommentsLabel{background-image:url("../images/bg-heading-portfolio.png")}#sideNavi .mostCommentArticles h3{background-image:url("../images/bg-heading-categories.png")}#sideNavi .mostViewCountArticles h3{background-image:url("../images/bg-heading-resources.png");margin-bottom:6px}#sideNavi .notice>div{margin:12px 12px 12px 17px}#sideNavi ul{margin-left:5px;width:182px;list-style:none}#sideNavi li{border-bottom:1px dotted #FFFFFF;font-size:12px;margin-left:0;overflow:hidden;position:relative;text-overflow:ellipsis;-o-text-overflow:ellipsis;vertical-align:top}#sideNavi li:hover{background:url("../images/bg-menu-active.png") repeat scroll -8px -8px transparent;color:#EC0A8B;font-weight:bold}#sideNavi li:hover a{color:#EC0A8B;padding-left:24px}#sideNavi li>a{color:#42423D;line-height:29px;margin:0;overflow:hidden;padding-left:6px;text-decoration:none;white-space:nowrap;width:167px}#sideNavi li>a sup{margin-right:3px;line-height:12px;color:#EC0A8B}#sideNavi li>div{display:none}#sideNavi li p{display:inline}#sideNavi .popTags li>a{padding-left:40px;width:143px}#sideNavi .popTags li img{cursor:pointer;height:16px;left:19px;position:absolute;top:7px;width:16px}#sideNavi .popTags li:hover a{padding-left:46px;width:137px}#sideNavi .popTags li:hover img{left:25px}#statistic{height:138px;line-height:24px;margin:28px 0 0 80px}.pagination{margin:16px;text-align:center}.pagination a,.pagination a:visited{padding:0 3px}.pagination a.selected{color:#42423D;font-weight:bold}#tagsPanel{width:553px}#tagsPanel .tagPanel{background-color:#EEEEEE;border:2px solid;border-radius:6px;cursor:pointer;float:left;margin:3px}#tagsPanel .tagPanel:hover{background-color:transparent;border:2px dashed}#tagsPanel .tagPanel{text-decoration:none}.error-title{width:553px}.error-panel{padding:24px}.error-title{background-color:#242323;color:#EC0A8B;display:block;padding:3px 10px 4px 10px;position:relative}.goTopIcon{background-position:-128px -32px}.goBottomIcon{background-position:-144px -32px} diff --git a/tree-house/css/tree-house.css b/tree-house/css/base.scss similarity index 96% rename from tree-house/css/tree-house.css rename to tree-house/css/base.scss index aeeabf2..279dadf 100644 --- a/tree-house/css/tree-house.css +++ b/tree-house/css/base.scss @@ -20,8 +20,30 @@ * skin tree-house style * * @author Liyuan Li - * @version 1.2.0.0, Jun 4, 2018 -*/ + * @version 2.0.0.0, Feb 21, 2019 + */ + +@import "../../../scss/reset-content"; +.left { + float: left; +} + +.right { + float: right; +} + +.clear:before, +.clear:after { + display: table; + content: ""; +} + +.clear:after { + clear: both; +} +.none { + display: none; +} html { min-width: 948px; } @@ -202,11 +224,10 @@ img { margin-top: 7px; padding-right: 10px; } -.article-body { - line-height: 145%; +.content-reset { margin: 0 12px 12px; } -.article-body a, .article-abstract a { +.content-reset a, .article-abstract a { color: #242323; text-decoration: underline; } @@ -278,12 +299,6 @@ img { top: 16px; z-index: 16; } -#emotions img, #emotionsReply img { - cursor: pointer; - display: block; - float: left; - margin-right: 2px; -} img.comment-picture { height: 60px; padding: 0px 6px 4px 0; diff --git a/tree-house/css/tree-house.min.css b/tree-house/css/tree-house.min.css deleted file mode 100644 index c4c501b..0000000 --- a/tree-house/css/tree-house.min.css +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Solo - A small and beautiful blogging system written in Java. - * Copyright (c) 2010-2019, b3log.org & hacpai.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -@charset "utf-8";body,html{min-width:948px}h5,img{font-size:12px}.comments-header,.header-navi{position:relative;z-index:10}.article-abstract,.comment-body{word-wrap:break-word;overflow:hidden}.comment-body td,.error-msg{white-space:normal}#sideNavi li,#sideNavi li>a,.article,.comment-body,img{overflow:hidden}body{background:url(../images/bg-tree.jpg) 50% 0 repeat-y #7BCCFF;color:#42423D}a,a:link,a:visited{color:#FFF;text-decoration:none}a:hover{text-decoration:underline}img{max-width:100%;vertical-align:middle;border:0;height:auto;-ms-interpolation-mode:bicubic}.wrapper{background:url(../images/bg-header.jpg) 50% 0 no-repeat}.bg-bottom{background:url(../images/bg-footer2.jpg) 50% 100% no-repeat}.content{margin:0 auto;width:948px}.header{height:476px;width:100%}.header-navi ul{list-style:none;margin-top:20px}.header-navi li{float:left}.header-navi .page-icon{float:left;height:14px;width:14px;margin:2px 3px 0 0}.header-title{color:#FFF;margin-left:146px;padding-top:222px;position:relative}#logoTitle{color:#FFF;font-size:52px;text-decoration:none}.header-title div{color:#696969;width:300px}.side{margin:0 0 0 -21px;width:256px}.body{min-height:643px;padding-bottom:682px}.main{width:634px}.footer{color:#e6e6fa;padding:12px;text-align:center}.footer a{font-weight:700}.article{width:553px}.article-header sup{color:red;font-size:12px}.article-header h2{color:#242323;font-weight:700;margin-left:6px;position:relative}.article-header h2 a{color:#242323;display:block;padding:3px 0 4px 10px;text-decoration:none}.article-header h2 a:hover{background-color:#242323;color:#EC0A8B}.article-info{margin:10px 0 0 9px;width:109px}.article-main{margin:10px 0 0 9px;min-height:150px;width:426px}.article-tags{background-color:#EC0A8B;float:left;font-style:normal;height:21px;line-height:21px;margin:0 10px 10px 0;padding:3px 10px}.article-abstract{color:#42423D;line-height:145%;padding:6px 10px 12px 0;text-align:justify}.main .line{background:url(../images/bg-branch.png) no-repeat;height:108px;width:575px}.article-date{background-color:#D4F2FB;border:6px solid #A8D3ED;border-radius:5px;margin-left:16px;padding:6px;width:65px}.article-comment{background:url(../images/bg-comments.png) no-repeat;font-size:12px;height:22px;margin:24px 0 0;padding:29px 0 0;text-align:center}.article-comment a{color:#42423D}.main h2.title{color:#FF9000;margin:-34px 0 12px;text-align:center}.main h2 span{color:#696969;float:right;font-size:12px;margin-top:7px;padding-right:10px}.article-body{line-height:145%;margin:0 12px 12px}.article-abstract a,.article-body a{color:#242323;text-decoration:underline}.comment-body,.comment-body a{color:#42423D}#sideNavi li>a,#tagsPanel .tagPanel,.article-details-footer .right a:hover{text-decoration:none}.article-footer{margin-right:12px}.article-details-footer a{line-height:16px}.article-details-footer{margin:36px 12px 0 0}.article-relative{line-height:145%;margin:12px 0}.comments{padding-left:99px;position:relative}.comments-header{background:url(../images/balloons.png) no-repeat;height:88px;left:100px;top:40px;width:440px}.comment-top{background:url(../images/bg-comments-top.png) no-repeat;height:22px}.comment-body{background:url(../images/bg-comments-body.png) repeat-y;margin-left:-1px;padding:0 27px 2px;width:401px}.comment-bottom{background:url(../images/bg-comments-bottom.png) no-repeat;height:23px}.comment-title{padding-bottom:6px}.comment-title a{color:#42423D;font-weight:700}.comment-body-ref{left:182px;opacity:.9;position:absolute;top:16px;z-index:16}#emotions img,#emotionsReply img{cursor:pointer;display:block;float:left;margin-right:2px}img.comment-picture{height:60px;padding:0 6px 4px 0;width:60px}.comment-reply{margin:0 auto 24px}#commentURL:focus,#commentURLReply:focus{box-shadow:-3px 1px 2px rgba(0,0,0,.3) inset}#comment,#commentReply{resize:vertical}.error-msg{color:#EC0A8B;font-weight:700}#sideNavi .line{background:url(../images/bg-branch-small.png) no-repeat;height:69px;margin-top:12px}#sideNavi .block{margin-left:64px}#sideNavi h3{background:url(../images/bg-heading.png) no-repeat;color:#EC0A8B;font-size:15px;height:30px;padding:38px 0 0 12px}#sideNavi .notice h3{background-image:url(../images/bg-heading-about-us.png)}#sideNavi #recentComments img{height:16px;vertical-align:middle;width:16px}#sideNavi #recentCommentsLabel{background-image:url(../images/bg-heading-portfolio.png)}#sideNavi .mostCommentArticles h3{background-image:url(../images/bg-heading-categories.png)}#sideNavi .mostViewCountArticles h3{background-image:url(../images/bg-heading-resources.png);margin-bottom:6px}#sideNavi .notice>div{margin:12px 12px 12px 17px}#sideNavi ul{margin-left:5px;width:182px;list-style:none}#sideNavi li{border-bottom:1px dotted #FFF;font-size:12px;margin-left:0;position:relative;text-overflow:ellipsis;-o-text-overflow:ellipsis;vertical-align:top}#sideNavi li:hover{background:url(../images/bg-menu-active.png) -8px -8px;color:#EC0A8B;font-weight:700}#sideNavi li:hover a{color:#EC0A8B;padding-left:24px}#sideNavi li>a{color:#42423D;line-height:29px;margin:0;padding-left:6px;white-space:nowrap;width:167px}#sideNavi li>a sup{margin-right:3px;line-height:12px;color:#EC0A8B}#sideNavi li>div{display:none}#sideNavi li p{display:inline}#sideNavi .popTags li>a{padding-left:40px;width:143px}#sideNavi .popTags li img{cursor:pointer;height:16px;left:19px;position:absolute;top:7px;width:16px}#sideNavi .popTags li:hover a{padding-left:46px;width:137px}#sideNavi .popTags li:hover img{left:25px}#statistic{height:138px;line-height:24px;margin:28px 0 0 80px}.pagination{margin:16px;text-align:center}.pagination a,.pagination a:visited{padding:0 3px}.pagination a.selected{color:#42423D;font-weight:700}#tagsPanel{width:553px}#tagsPanel .tagPanel{background-color:#EEE;border:2px solid;border-radius:6px;cursor:pointer;float:left;margin:3px}#tagsPanel .tagPanel:hover{background-color:transparent;border:2px dashed}.error-panel{padding:24px}.error-title{width:553px;background-color:#242323;color:#EC0A8B;display:block;padding:3px 10px 4px;position:relative}.goTopIcon{background-position:-128px -32px}.goBottomIcon{background-position:-144px -32px} \ No newline at end of file diff --git a/tree-house/footer.ftl b/tree-house/footer.ftl index 851eca3..c9735b8 100644 --- a/tree-house/footer.ftl +++ b/tree-house/footer.ftl @@ -36,22 +36,7 @@ by Vanessa. "markedAvailable": ${markedAvailable?c}, "adminLabel": "${adminLabel}", "logoutLabel": "${logoutLabel}", - "skinDirName": "${skinDirName}", - "em00Label": "${em00Label}", - "em01Label": "${em01Label}", - "em02Label": "${em02Label}", - "em03Label": "${em03Label}", - "em04Label": "${em04Label}", - "em05Label": "${em05Label}", - "em06Label": "${em06Label}", - "em07Label": "${em07Label}", - "em08Label": "${em08Label}", - "em09Label": "${em09Label}", - "em10Label": "${em10Label}", - "em11Label": "${em11Label}", - "em12Label": "${em12Label}", - "em13Label": "${em13Label}", - "em14Label": "${em14Label}" + "skinDirName": "${skinDirName}" }; $(document).ready(function () { diff --git a/tree-house/lang/lang_zh_CN.properties b/tree-house/lang/lang_zh_CN.properties index 7d83afc..42c5f5f 100644 --- a/tree-house/lang/lang_zh_CN.properties +++ b/tree-house/lang/lang_zh_CN.properties @@ -188,7 +188,6 @@ permalink1Label=\u94FE\u63A5\uFF1A permalinkLabel=\u94FE\u63A5 welcomeToSoloLabel=\u6B22\u8FCE\u4F7F\u7528 Solo\uFF01 b3logLabel=B3LOG -killBrowserLabel=

    \u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01

    \u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002

    \u60A8\u53EF\u4EE5\u4E0B\u8F7D readmoreLabel=\u9605\u8BFB\u66F4\u591A\u00BB readmore2Label=\u9605\u8BFB\u66F4\u591A replyLabel=\u56DE\u590D\u00BB diff --git a/tree-house/macro-head.ftl b/tree-house/macro-head.ftl index 50b83dc..410c898 100644 --- a/tree-house/macro-head.ftl +++ b/tree-house/macro-head.ftl @@ -27,8 +27,7 @@ - - + diff --git a/tree-house/page.ftl b/tree-house/page.ftl index 526cb1d..a4622f8 100644 --- a/tree-house/page.ftl +++ b/tree-house/page.ftl @@ -39,7 +39,7 @@
    -
    +
    ${page.pageContent}
    diff --git a/yilia/article-list.ftl b/yilia/article-list.ftl index 0043104..bce6510 100644 --- a/yilia/article-list.ftl +++ b/yilia/article-list.ftl @@ -38,7 +38,7 @@ -
    +
    ${article.articleAbstract}
    -
    +
    ${comment.commentContent}
    diff --git a/yilia/css/base.css b/yilia/css/base.css new file mode 100644 index 0000000..da8f1d8 --- /dev/null +++ b/yilia/css/base.css @@ -0,0 +1,18 @@ +/** + * Solo - A small and beautiful blogging system written in Java. + * Copyright (c) 2010-2019, b3log.org & hacpai.com + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +.content-reset{word-wrap:break-word;overflow:auto;line-height:1.65;font-size:16px;word-break:break-word}.content-reset ul,.content-reset ol{padding-left:2em;margin-top:0;margin-bottom:16px}.content-reset li{margin-top:0.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{padding-bottom:0.3em;font-size:1.7em;border-bottom:1px solid #eee}.content-reset h2{padding-bottom:0.3em;font-size:1.5em;border-bottom:1px solid #eee}.content-reset h3{font-size:1.25em}.content-reset h4{font-size:1em}.content-reset h5{font-size:0.875em}.content-reset h6{font-size:0.85em}.content-reset hr{height:0.15em;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:0.25em solid #ddd;margin-bottom:16px}.content-reset blockquote p{margin:0}.content-reset ins>iframe{border:0}.content-reset iframe{border:1px solid rgba(0,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:bold;text-align:center !important;background:rgba(158,188,226,0.2)}.content-reset tbody tr:nth-child(2n){background:rgba(158,188,226,0.12)}.content-reset tr:hover{background:#efefef}.content-reset code{padding:0.2em 0.4em;margin:0;font-size:85%;background-color:rgba(252,41,41,0.12);border-radius:3px;word-break:break-word}.content-reset pre{position:relative}.content-reset pre textarea{position:absolute;top:-100000px}.content-reset pre>code{padding:0.5em;background-color:rgba(0,0,0,0.04);background-size:20px 20px;border-radius:5px;display:block}.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:solid 1px rgba(0,0,0,0.38);border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.content-reset__task,.content-reset .task-list-item{list-style:none;margin-left:-1em}.img-preview{width:100%;height:100%;top:0;z-index:211;overflow:auto;cursor:zoom-out;transition:background-color .2s ease-in-out}.img-preview img{max-width:inherit;transition:transform .3s ease-in-out}html{height:100%;max-height:100%;font-size:16px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{height:100%;max-height:100%;font-family:"Helvetica Neue","Luxi Sans","DejaVu Sans",Tahoma,"Hiragino Sans GB","Microsoft Yahei",sans-serif;letter-spacing:0.01rem;font-size:100%;line-height:1.75em;color:rgba(0,0,0,0.6);-webkit-font-feature-settings:'kern' 1;-moz-font-feature-settings:'kern' 1;-o-font-feature-settings:'kern' 1;text-rendering:geometricPrecision;margin:0;background-color:#eaeaea}::-moz-selection{background:#D6EDFF}::selection{background:#D6EDFF}a{text-decoration:none;outline-width:0;color:#258fb8;outline:none;transition:all 0.3s ease}h1,h2,h3,h4,h5,h6{-webkit-font-feature-settings:'dlig' 1, 'liga' 1, 'lnum' 1, 'kern' 1;-moz-font-feature-settings:'dlig' 1, 'liga' 1, 'lnum' 1, 'kern' 1;-o-font-feature-settings:'dlig' 1, 'liga' 1, 'lnum' 1, 'kern' 1;color:#666;line-height:1.15em;font-family:"Open Sans", "Helvetica Neue","Luxi Sans","DejaVu Sans",Tahoma,"Hiragino Sans GB","Microsoft Yahei",sans-serif;text-rendering:geometricPrecision}h1{letter-spacing:-2px;text-indent:-3px}h2{letter-spacing:-1px}img{max-width:100%}p,ul,ol,dl{-webkit-font-feature-settings:'liga' 1, 'onum' 1, 'kern' 1;-moz-font-feature-settings:'liga' 1, 'onum' 1, 'kern' 1;-o-font-feature-settings:'liga' 1, 'onum' 1, 'kern' 1;text-rendering:geometricPrecision}ol,ul{padding-left:3rem}ol ol,ul ul,ul ol,ol ul{padding-left:2em}dl dt{float:left;width:180px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap;font-weight:700;margin-bottom:1em}dl dd{margin-left:200px;margin-bottom:1em}li li{margin:0}hr{display:block;height:1px;border:0;border-top:#EFEFEF 1px solid;margin:3.2em 0;padding:0}blockquote{box-sizing:border-box;margin:1.75em 0 1.75em 0;padding:0 0 0 1.75em;border-left:5px solid;transition:all 0.3s ease}blockquote:hover{border-color:#b0a0aa}blockquote p{margin:0.8em 0;font-style:italic}blockquote small{display:inline-block;margin:0.8em 0 0.8em 1.5em;font-size:0.9em;color:#CCC}blockquote small:before{content:"\2014 \00A0"}blockquote cite{font-weight:700}blockquote cite a{font-weight:normal}mark{background-color:#fdffb6}code,tt{padding:1px 3px;font-family:Inconsolata, monospace, "Helvetica Neue","Luxi Sans","DejaVu Sans",Tahoma,"Hiragino Sans GB","Microsoft Yahei",sans-serif;font-size:0.85em;white-space:pre-wrap;border:#E3EDF3 1px solid;background:#F7FAFB;border-radius:2px}pre{font-size:0.9em}pre code,pre tt{font-size:inherit;white-space:pre-wrap;background:transparent;border:none;padding:0}.fn-clear:before,.fn-clear:after{display:table;content:""}.fn-clear:after{clear:both}.fn-left{float:left}.fn-right{float:right}.fn-none{display:none}@font-face{font-family:'icomoon';src:url("fonts/icomoon.eot?3js4w7");src:url("fonts/icomoon.eot?3js4w7#iefix") format("embedded-opentype"),url("fonts/icomoon.ttf?3js4w7") format("truetype"),url("fonts/icomoon.woff?3js4w7") format("woff"),url("fonts/icomoon.svg?3js4w7#icomoon") format("svg");font-weight:normal;font-style:normal}[class^="icon-"],[class*=" icon-"]{font-family:'icomoon';speak:none;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;vertical-align:middle}.icon-tag:before{content:"\e903"}.icon-date:before{content:"\e902"}.icon-github:before{content:"\e900"}.icon-rss:before{content:"\e901"}.icon-register:before{content:"\e600"}.icon-logout:before{content:"\e601"}.icon-setting:before{content:"\e602"}.icon-gplus:before{content:"\e603"}.icon-weibo:before{content:"\e605"}.icon-goup:before{content:"\e60a"}.icon-twitter:before{content:"\e60b"}.icon-t-weibo:before{content:"\e60d"}.icon-login:before{content:"\e611"}.form{width:100%;padding:30px}#captcha,#captchaReply{height:27px;display:inline-block;vertical-align:inherit}.form input,.form textarea,.form button{border:1px solid #CCCCCC;background-color:#FAFAFA;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,0.075) inset;padding:7px 8px;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}.form button:hover{background-color:#b0a0aa;color:#FFF;box-shadow:0 0 0;border-color:#b0a0aa}.form input:focus,.form textarea:focus{background-color:#FFF;box-shadow:0 1px 2px rgba(0,0,0,0.075) inset,0 0 5px rgba(176,160,170,0.5);border:1px solid #b0a0aa}.side{position:fixed;background-color:#FFF;height:100%;width:300px}.side a{color:#696969;font-size:30px}.side a:hover,.side .toc a:hover{color:#b0a0aa}.side .overlay{height:180px;background-color:#000;position:absolute;opacity:0.7;width:100%}.side .content{width:76%;text-align:center;margin:112px auto 0;position:relative;z-index:1}.side .avatar{display:block;border:5px solid #fff;border-radius:50%;width:128px;height:128px;margin:0 auto;transition:all 0.1s ease-in}.side .avatar:hover{border-color:rgba(37,143,184,0.6)}.side hgroup h1{margin:10px 0;line-height:30px}.side .subtitle{color:#999;font-size:14px;line-height:25px}.side nav ul{margin:0;padding:0;list-style:none}.side nav a{font-size:14px}.side nav .page-icon{height:16px;width:16px;margin:0px 3px 0 0;vertical-align:-2px}.side footer{position:absolute;bottom:15px;width:228px;text-align:center;left:50%;margin-left:-114px}.side footer>div{margin-bottom:10px}.side .toc-btn{float:right;margin:0 10px;font-size:14px;display:none}.side .toc{height:100%;width:300px;position:absolute;top:0;left:0;z-index:10;overflow:hidden;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABIAgMAAAAog1vUAAAACVBMVEUAAAABAQETExM20mnVAAAAA3RSTlMOECJvSrphAAABBElEQVR4AWyRwQ3CQAwEJ5/rIVQTyuAfHunmXlRAoaxkMfJJkQ4Dznl3x+G4xlzOxvZ5vZdzMJ7fx3Im+7a2jpNzrINzZ+6r/DnIp7dyg9zsg9Ehel0+bsS1t5KJZOuDSU4Iunz4qC8BU6nLAqZSkgKmUsYCplLxBEylIARMxV8+w/sqoKo+6G0aTGhm5JAM//gARxxHYU3Q3igY0sCIIhYCC49rcUW4PBeJK3bd+CIKsDle8H91N62bwTv5Xxv1QQAAAAQQsH9rAU6DH3CIG9WFbm2Pcyf00PcOn3avFYDDRJgOOcE8fIX8VFCY00r5TlFFPt2NwqXDwFyGjNUlzfBdHo1oSKi9zm79GKMAAAAASUVORK5CYII=) repeat #5d5d5d}.side .toc li{border-bottom:1px solid #717171;border-top:1px solid #5d5d5d}.side .toc a{font-size:14px;color:#e5e5e5;display:block}.side .b3-solo-list{padding:0;margin-top:50px}.abstract .b3-solo-list{display:none}.side .toc .close{color:#fff;float:right;padding:0 10px}main{position:absolute;right:0;min-height:100%;background:#eaeaea;left:300px;width:auto}article{margin:30px;border:1px solid #ddd;background:#fff;position:relative;transition:all 0.2s ease-in;visibility:hidden}article.show{visibility:visible;-webkit-animation:bounce 0.6s;animation:bounce 0.6s}@-webkit-keyframes bounce{0%{opacity:0;-webkit-transform:scale(1)}60%{opacity:1;-webkit-transform:scale(1.02)}100%{-webkit-transform:scale(1)}}@-moz-keyframes bounce{0%{opacity:0;-moz-transform:scale(1)}60%{opacity:1;-moz-transform:scale(1.02)}100%{-moz-transform:scale(1)}}article header{border-left:5px solid;padding:15px 30px 15px 25px}article header:hover{border-color:#b0a0aa}article header h2{margin:0;font-size:26px;padding-right:110px}article header a{color:#696969;margin-left:0px;font-weight:300;line-height:35px}article header a:hover{color:#b0a0aa}article header sup{font-size:14px;font-weight:normal;color:#999}article header time{font-size:14px;position:absolute;right:30px;color:#aaa;top:18px}article .abstract{line-height:1.8em;padding-right:30px;padding-left:30px;overflow:hidden;word-wrap:break-word}article footer{padding:20px 35px 0 0;margin:30px 30px 20px 30px;border-top:1px solid #ddd}.tags .tag:hover,article .abstract a:hover{opacity:0.7}.tags .avatar{width:20px;border-radius:10px;right:30px;position:absolute;bottom:25px;transition:all 0.2s ease-out 0s}.share span{transition:all 0.2s ease-out 0s;cursor:pointer}.tags .avatar:hover,.share span:hover{transform:rotate(360deg);color:#333}.tags .tag{color:#fff;font-size:10px;height:18px;line-height:18px;display:inline-block;padding:0 5px 0px 10px;position:relative;border-radius:0 5px 5px 0;margin:5px 9px 5px 8px;background-color:#7b5d5f;font-family:Menlo, Monaco, "Andale Mono", "lucida console", "Courier New", monospace}.tags .tag:before{content:" ";width:0px;height:0px;position:absolute;top:0;left:-18px;border:9px solid transparent;border-right-color:#7b5d5f}.tags .tag:after{content:" ";width:4px;height:4px;background-color:#fff;border-radius:4px;box-shadow:0px 0px 0px 1px rgba(0,0,0,0.3);position:absolute;top:7px;left:2px}a.color1.tag{background:#ff945c}a.color1.tag:before{border-right-color:#ff945c}a.color2.tag{background:#f5c7b7}a.color2.tag:before{border-right-color:#f5c7b7}a.color3.tag{background:#ba8f6c}a.color3.tag:before{border-right-color:#ba8f6c}a.color4.tag{background:#cfb7c4}a.color4.tag:before{border-right-color:#cfb7c4}nav.pagination{text-align:center;margin-top:30px}nav.pagination .page-num{width:20px;height:20px;background:#4d4d4d;border-radius:50%;display:inline-block;color:#fff;line-height:20px;font-size:12px;margin:0 3px 30px}nav.pagination a.page-num:hover{opacity:0.7}nav.pagination .page-num.current{background:#88acdb}nav.pagination .extend{color:#4d4d4d;margin:0 27px;opacity:0}nav.pagination .extend:hover{color:#b0a0aa}nav.pagination:hover .extend{opacity:1}article.post{visibility:visible}.post .tags .avatar{bottom:inherit;margin-top:4px}.post section.tags{margin:0}.post header{padding-bottom:0}.post .share{padding:10px 0 0 0;margin-top:15px;font-size:14px}.post aside a{color:#DDD}.post aside a>strong{background:#ddd;color:#fff;border-radius:50%;width:16px;height:16px;display:inline-block;transition:background 0.3s;vertical-align:middle;line-height:14px;text-align:center}.post aside a:hover{color:#4d4d4d}.post aside a:hover>strong{background-color:#4d4d4d}.comments{margin:60px 60px 0 50px;padding:0;list-style:none;position:relative}.comments li{margin-bottom:30px;padding-bottom:30px;border-bottom:1px solid #ddd}.comments li time{border-left:1px solid #d5dbde;padding-left:10px;margin-left:10px}.comments .avatar{position:absolute;height:60px;width:60px;border-radius:50%;border:3px solid #FFF}.comments .content{margin-left:80px;min-height:66px}.comments .post-meta{margin-bottom:9px}.comments .content img{vertical-align:sub}.comments li.comment-body-ref{position:absolute;background-color:#FFF;width:80%;margin-left:80px;padding:10px;border:1px solid #ddd}footer.footer{line-height:1rem;font-size:12px;font-family:Menlo, Monaco, "Andale Mono", "lucida console", "Courier New", monospace;text-shadow:0 1px #fff;opacity:0.6;margin:0 30px 30px}footer.footer .icon-goup{position:fixed;bottom:35px;right:5px;-webkit-animation:upbounce 4s 2s infinite;animation:upbounce 4s 2s infinite;z-index:10;font-size:20px;cursor:pointer;color:#b0a0aa;transition:all 0.3s ease}footer.footer .icon-goup:hover{color:#4a4a4a}@-webkit-keyframes upbounce{0%,10%,25%,40%,50%{-webkit-transform:translateY(0);transform:translateY(0)}20%{-webkit-transform:translateY(-10px);transform:translateY(-10px)}30%{-webkit-transform:translateY(-5px);transform:translateY(-5px)}}@keyframes upbounce{0%,20%,50%,80%,100%{-webkit-transform:translateY(0);transform:translateY(0)}40%{-webkit-transform:translateY(-10px);transform:translateY(-10px)}60%{-webkit-transform:translateY(-5px);transform:translateY(-5px)}}.classify li{list-style:none;font-size:20px;float:left;margin:0 30px 20px 0}.classify .tags .tag{font-size:20px;padding:10px}.classify .tags .tag:before{left:-38px;border-width:19px}.classify .tags .tag:after{top:15px;left:-6px;width:8px;height:8px}.classify-name{font-size:18px;margin:30px}.dynamic li{list-style:none}.dynamic .comments li:last-child{border-bottom-width:0}@media only screen and (max-width: 500px){.side{position:relative;height:auto;width:100%}.side .avatar{position:relative}.side .content{margin-top:0;padding-top:20px}.side .overlay{height:100px;z-index:0}.side nav{display:none}.side footer{position:initial;margin:10px auto;padding-bottom:16px}main{position:initial}article{margin:10px}.comments{margin:20px 20px 0 20px}footer.footer{text-align:center}footer.footer .fn-right{float:none;display:block}} diff --git a/yilia/css/yilia.css b/yilia/css/base.scss similarity index 79% rename from yilia/css/yilia.css rename to yilia/css/base.scss index 5a29424..45bcc34 100644 --- a/yilia/css/yilia.css +++ b/yilia/css/base.scss @@ -21,8 +21,10 @@ * * @author Liyuan Li * @author Liang Ding - * @version 1.3.1.0, Jan 4, 2019 -*/ + * @version 2.0.0.0, Feb 21, 2019 + */ + +@import "../../../scss/reset-content"; /* start reset */ html { height: 100%; @@ -332,256 +334,8 @@ pre code, pre tt { box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075) inset, 0 0 5px rgba(176, 160, 170, 0.5); border: 1px solid #b0a0aa; } - -.content-reset { - font-family: "Helvetica Neue","Luxi Sans","DejaVu Sans",Tahoma,"Hiragino Sans GB","Microsoft Yahei",sans-serif; - word-wrap: break-word; - overflow: auto; - line-height: 1.65; - font-size: 16px; - word-break: break-all -} - -.content-reset ul,.content-reset ol { - padding-left: 2em; - margin-top: 0; - margin-bottom: 16px -} - -.content-reset li { - margin-top: 0.25em -} - -.content-reset img { - cursor: zoom-in -} - -.content-reset img.emoji { - cursor: auto; - max-width: 20px; -} - -.editor-panel .content-reset img,img.emoji { - cursor: auto -} - -.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 { - padding-bottom: 0.3em; - font-size: 2em; - border-bottom: 1px solid #eee -} - -.content-reset h2 { - padding-bottom: 0.3em; - font-size: 1.5em; - border-bottom: 1px solid #eee -} - -.content-reset h3 { - font-size: 1.25em -} - -.content-reset h4 { - font-size: 1em -} - -.content-reset h5 { - font-size: 0.875em -} - -.content-reset h6 { - font-size: 0.85em -} - -.content-reset hr { - height: 0.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: 0.25em solid #ddd; - margin-bottom: 16px -} - -.content-reset blockquote p { - margin: 0 -} - -.content-reset iframe { - border: 1px solid rgba(0,0,0,0.38) -} - -.content-reset ins > iframe { - border: 0; -} - -.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: bold; - text-align: center !important; - background: rgba(158,188,226,0.2) -} - -.content-reset tbody tr:nth-child(2n) { - background: rgba(158,188,226,0.12) -} - -.content-reset tr:hover { - background: #efefef -} - -.content-reset code { - padding: 0.2em 0.4em; - margin: 0; - font-size: 85%; - background-color: rgba(252,41,41,0.12); - border-radius: 3px; - color: #d23f31; - font-family: mononoki,Consolas,"Liberation Mono",Menlo,Courier,monospace; - word-break: break-word -} - -.content-reset pre>code { - padding: 0.5em; - color: rgba(0,0,0,0.87); - background-color: rgba(0,0,0,0.04); - background-image: url(../images/code-bg.png); - background-size: 20px 20px; - border-radius: 5px; - display: block; -} - -.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: solid 1px rgba(0,0,0,0.38); - border-bottom-color: #bbb; - border-radius: 3px; - box-shadow: inset 0 -1px 0 #bbb -} - -.content-reset li.task-list-item { - list-style: none -} /* end common */ -/* start emotions */ -.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: 0px -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; -} -/* end emotions */ - /* start side */ .side { position: fixed; diff --git a/yilia/css/yilia.min.css b/yilia/css/yilia.min.css deleted file mode 100644 index 76682f7..0000000 --- a/yilia/css/yilia.min.css +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Solo - A small and beautiful blogging system written in Java. - * Copyright (c) 2010-2019, b3log.org & hacpai.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -@charset "utf-8";body,html{height:100%;max-height:100%}body,dl,h1,h2,h3,h4,h5,h6,ol,p,ul{text-rendering:geometricPrecision}dl dd,dl dt{margin-bottom:1em}body,li li{margin:0}blockquote cite,dl dt{font-weight:700}.fn-left,dl dt{float:left}.form button,a,blockquote{transition:all .3s ease}.classify li,.comments,.content-reset li.task-list-item,.dynamic li,.side nav ul{list-style:none}html{font-size:16px;-webkit-tap-highlight-color:transparent}body{font-family:"Helvetica Neue","Luxi Sans","DejaVu Sans",Tahoma,"Hiragino Sans GB","Microsoft Yahei",sans-serif;letter-spacing:.01rem;font-size:100%;line-height:1.75em;color:rgba(0,0,0,.6);-webkit-font-feature-settings:'kern' 1;-moz-font-feature-settings:'kern' 1;-o-font-feature-settings:'kern' 1;background-color:#eaeaea}::-moz-selection{background:#D6EDFF}::selection{background:#D6EDFF}a{text-decoration:none;color:#258fb8;outline:0}h1,h2,h3,h4,h5,h6{-webkit-font-feature-settings:'dlig' 1,'liga' 1,'lnum' 1,'kern' 1;-moz-font-feature-settings:'dlig' 1,'liga' 1,'lnum' 1,'kern' 1;-o-font-feature-settings:'dlig' 1,'liga' 1,'lnum' 1,'kern' 1;color:#666;line-height:1.15em;font-family:"Open Sans","Helvetica Neue","Luxi Sans","DejaVu Sans",Tahoma,"Hiragino Sans GB","Microsoft Yahei",sans-serif}h1{letter-spacing:-2px;text-indent:-3px}h2{letter-spacing:-1px}img{max-width:100%}dl,ol,p,ul{-webkit-font-feature-settings:'liga' 1,'onum' 1,'kern' 1;-moz-font-feature-settings:'liga' 1,'onum' 1,'kern' 1;-o-font-feature-settings:'liga' 1,'onum' 1,'kern' 1}ol,ul{padding-left:3rem}ol ol,ol ul,ul ol,ul ul{padding-left:2em}dl dt{width:180px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.content-reset thead,.side .content,.side footer,nav.pagination{text-align:center}dl dd{margin-left:200px}hr{display:block;height:1px;border:0;border-top:#EFEFEF 1px solid;margin:3.2em 0;padding:0}blockquote{box-sizing:border-box;margin:1.75em 0;padding:0 0 0 1.75em;border-left:5px solid}blockquote:hover{border-color:#b0a0aa}blockquote p{margin:.8em 0;font-style:italic}blockquote small{display:inline-block;margin:.8em 0 .8em 1.5em;font-size:.9em;color:#CCC}blockquote small:before{content:"\2014 \00A0"}blockquote cite a{font-weight:400}mark{background-color:#fdffb6}code,tt{padding:1px 3px;font-family:Inconsolata,monospace,"Helvetica Neue","Luxi Sans","DejaVu Sans",Tahoma,"Hiragino Sans GB","Microsoft Yahei",sans-serif;font-size:.85em;white-space:pre-wrap;border:1px solid #E3EDF3;background:#F7FAFB;border-radius:2px}pre{font-size:.9em}pre code,pre tt{font-size:inherit;white-space:pre-wrap;background:0 0;border:none;padding:0}.fn-clear:after,.fn-clear:before{display:table;content:""}.fn-clear:after{clear:both}.fn-right{float:right}.fn-none{display:none}@font-face{font-family:icomoon;src:url(fonts/icomoon.eot?3js4w7);src:url(fonts/icomoon.eot?3js4w7#iefix) format('embedded-opentype'),url(fonts/icomoon.ttf?3js4w7) format('truetype'),url(fonts/icomoon.woff?3js4w7) format('woff'),url(fonts/icomoon.svg?3js4w7#icomoon) format('svg');font-weight:400;font-style:normal}[class*=" icon-"],[class^=icon-]{font-family:icomoon;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;vertical-align:middle}.content-reset,.form button,.form input,.form textarea{font-family:"Helvetica Neue","Luxi Sans","DejaVu Sans",Tahoma,"Hiragino Sans GB","Microsoft Yahei",sans-serif}.icon-tag:before{content:"\e903"}.icon-date:before{content:"\e902"}.icon-github:before{content:"\e900"}.icon-rss:before{content:"\e901"}.icon-register:before{content:"\e600"}.icon-logout:before{content:"\e601"}.icon-setting:before{content:"\e602"}.icon-gplus:before{content:"\e603"}.icon-weibo:before{content:"\e605"}.icon-goup:before{content:"\e60a"}.icon-twitter:before{content:"\e60b"}.icon-t-weibo:before{content:"\e60d"}.icon-login:before{content:"\e611"}.form{width:100%;padding:30px}#captcha,#captchaReply{height:27px;display:inline-block;vertical-align:inherit}.form button,.form input,.form textarea{border:1px solid #CCC;background-color:#FAFAFA;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.075) inset;padding:7px 8px;width:100%;box-sizing:border-box;font-size:14px;outline:0}.form button{width:auto;vertical-align:bottom;cursor:pointer}.form button:hover{background-color:#b0a0aa;color:#FFF;box-shadow:0 0 0;border-color:#b0a0aa}.form input:focus,.form textarea:focus{background-color:#FFF;box-shadow:0 1px 2px rgba(0,0,0,.075) inset,0 0 5px rgba(176,160,170,.5);border:1px solid #b0a0aa}.content-reset h1,.content-reset h2{padding-bottom:.3em;border-bottom:1px solid #eee}.content-reset{word-wrap:break-word;overflow:auto;line-height:1.65;font-size:16px;word-break:break-all}.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:20px}.editor-panel .content-reset img,img.emoji{cursor:auto}.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:2em}.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 ins>iframe{border:0}.content-reset table{width:100%;border:1px solid #dedede;margin:15px auto;border-collapse:collapse;empty-cells:show}.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;color:#d23f31;font-family:mononoki,Consolas,"Liberation Mono",Menlo,Courier,monospace;word-break:break-word}.content-reset pre>code{padding:.5em;color:rgba(0,0,0,.87);background-color:rgba(0,0,0,.04);background-image:url(../images/code-bg.png);background-size:20px 20px;border-radius:5px;display:block}.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}.tags .tag,footer.footer{font-family:Menlo,Monaco,"Andale Mono","lucida console","Courier New",monospace}.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}.side{position:fixed;background-color:#FFF;height:100%;width:300px}.side a{color:#696969;font-size:30px}.side .toc a,.side .toc-btn,.side nav a{font-size:14px}.side .toc a:hover,.side a:hover{color:#b0a0aa}.side .overlay{height:180px;background-color:#000;position:absolute;opacity:.7;width:100%}.side .content{width:76%;margin:112px auto 0;position:relative;z-index:1}.side .toc,.side footer,main{position:absolute}.side .avatar{display:block;border:5px solid #fff;border-radius:50%;width:128px;height:128px;margin:0 auto;transition:all .1s ease-in}.side .avatar:hover{border-color:rgba(37,143,184,.6)}.side hgroup h1{margin:10px 0;line-height:30px}.side .subtitle{color:#999;font-size:14px;line-height:25px}.side nav ul{margin:0;padding:0}.side nav .page-icon{height:16px;width:16px;margin:0 3px 0 0;vertical-align:-2px}.side footer{bottom:15px;width:228px;left:50%;margin-left:-114px}.side footer>div{margin-bottom:10px}.side .toc-btn{float:right;margin:0 10px;display:none}.side .toc{height:100%;width:300px;top:0;left:0;z-index:10;overflow:hidden;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABIAgMAAAAog1vUAAAACVBMVEUAAAABAQETExM20mnVAAAAA3RSTlMOECJvSrphAAABBElEQVR4AWyRwQ3CQAwEJ5/rIVQTyuAfHunmXlRAoaxkMfJJkQ4Dznl3x+G4xlzOxvZ5vZdzMJ7fx3Im+7a2jpNzrINzZ+6r/DnIp7dyg9zsg9Ehel0+bsS1t5KJZOuDSU4Iunz4qC8BU6nLAqZSkgKmUsYCplLxBEylIARMxV8+w/sqoKo+6G0aTGhm5JAM//gARxxHYU3Q3igY0sCIIhYCC49rcUW4PBeJK3bd+CIKsDle8H91N62bwTv5Xxv1QQAAAAQQsH9rAU6DH3CIG9WFbm2Pcyf00PcOn3avFYDDRJgOOcE8fIX8VFCY00r5TlFFPt2NwqXDwFyGjNUlzfBdHo1oSKi9zm79GKMAAAAASUVORK5CYII=) #5d5d5d}.side .toc li{border-bottom:1px solid #717171;border-top:1px solid #5d5d5d}.side .toc a{color:#e5e5e5;display:block}.side .b3-solo-list{padding:0;margin-top:50px}.abstract .b3-solo-list{display:none}.side .toc .close{color:#fff;float:right;padding:0 10px}main{right:0;min-height:100%;background:#eaeaea;left:300px;width:auto}article{margin:30px;border:1px solid #ddd;background:#fff;position:relative;transition:all .2s ease-in;visibility:hidden}.share span,.tags .avatar{transition:all .2s ease-out 0s}article.post,article.show{visibility:visible}article.show{-webkit-animation:bounce .6s;animation:bounce .6s}@-webkit-keyframes bounce{0%{opacity:0;-webkit-transform:scale(1)}60%{opacity:1;-webkit-transform:scale(1.02)}100%{-webkit-transform:scale(1)}}@-moz-keyframes bounce{0%{opacity:0;-moz-transform:scale(1)}60%{opacity:1;-moz-transform:scale(1.02)}100%{-moz-transform:scale(1)}}.tags .tag:hover,article .abstract a:hover,nav.pagination a.page-num:hover{opacity:.7}article header{border-left:5px solid;padding:15px 30px 15px 25px}article header:hover{border-color:#b0a0aa}article header h2{margin:0;font-size:26px;padding-right:110px}article header a{color:#696969;margin-left:0;font-weight:300;line-height:35px}article header a:hover{color:#b0a0aa}article header sup{font-size:14px;font-weight:400;color:#999}article header time{font-size:14px;position:absolute;right:30px;color:#aaa;top:18px}article .abstract{line-height:1.8em;padding-right:30px;padding-left:30px;overflow:hidden;word-wrap:break-word}article footer{padding:20px 35px 0 0;margin:30px 30px 20px;border-top:1px solid #ddd}.tags .avatar{width:20px;border-radius:10px;right:30px;position:absolute;bottom:25px}.share span{cursor:pointer}.share span:hover,.tags .avatar:hover{transform:rotate(360deg);color:#333}.tags .tag{color:#fff;font-size:10px;height:18px;line-height:18px;display:inline-block;padding:0 5px 0 10px;position:relative;border-radius:0 5px 5px 0;margin:5px 9px 5px 8px;background-color:#7b5d5f}.tags .tag:after,.tags .tag:before{content:" ";position:absolute}.tags .tag:before{width:0;height:0;top:0;left:-18px;border:9px solid transparent;border-right-color:#7b5d5f}.tags .tag:after{width:4px;height:4px;background-color:#fff;border-radius:4px;box-shadow:0 0 0 1px rgba(0,0,0,.3);top:7px;left:2px}a.color1.tag{background:#ff945c}a.color1.tag:before{border-right-color:#ff945c}a.color2.tag{background:#f5c7b7}a.color2.tag:before{border-right-color:#f5c7b7}a.color3.tag{background:#ba8f6c}a.color3.tag:before{border-right-color:#ba8f6c}a.color4.tag{background:#cfb7c4}a.color4.tag:before{border-right-color:#cfb7c4}nav.pagination{margin-top:30px}nav.pagination .page-num{width:20px;height:20px;background:#4d4d4d;border-radius:50%;display:inline-block;color:#fff;line-height:20px;font-size:12px;margin:0 3px 30px}nav.pagination .page-num.current{background:#88acdb}nav.pagination .extend{color:#4d4d4d;margin:0 27px;opacity:0}nav.pagination .extend:hover{color:#b0a0aa}nav.pagination:hover .extend{opacity:1}.post .tags .avatar{bottom:inherit;margin-top:4px}.post section.tags{margin:0}.post header{padding-bottom:0}.post .share{padding:10px 0 0;margin-top:15px;font-size:14px}.post aside a{color:#DDD}.post aside a>strong{background:#ddd;color:#fff;border-radius:50%;width:16px;height:16px;display:inline-block;transition:background .3s;vertical-align:middle;line-height:14px;text-align:center}.post aside a:hover{color:#4d4d4d}.post aside a:hover>strong{background-color:#4d4d4d}.comments{margin:60px 60px 0 50px;padding:0;position:relative}.comments li{margin-bottom:30px;padding-bottom:30px;border-bottom:1px solid #ddd}.comments li time{border-left:1px solid #d5dbde;padding-left:10px;margin-left:10px}.comments .avatar{position:absolute;height:60px;width:60px;border-radius:50%;border:3px solid #FFF}.comments .content{margin-left:80px;min-height:66px}.comments .post-meta{margin-bottom:9px}.comments .content img{vertical-align:sub}.comments li.comment-body-ref{position:absolute;background-color:#FFF;width:80%;margin-left:80px;padding:10px;border:1px solid #ddd}footer.footer{line-height:1rem;font-size:12px;text-shadow:0 1px #fff;opacity:.6;margin:0 30px 30px}footer.footer .icon-goup{position:fixed;bottom:35px;right:5px;-webkit-animation:upbounce 4s 2s infinite;animation:upbounce 4s 2s infinite;z-index:10;font-size:20px;cursor:pointer;color:#b0a0aa;transition:all .3s ease}footer.footer .icon-goup:hover{color:#4a4a4a}@-webkit-keyframes upbounce{0%,10%,25%,40%,50%{-webkit-transform:translateY(0);transform:translateY(0)}20%{-webkit-transform:translateY(-10px);transform:translateY(-10px)}30%{-webkit-transform:translateY(-5px);transform:translateY(-5px)}}@keyframes upbounce{0%,100%,20%,50%,80%{-webkit-transform:translateY(0);transform:translateY(0)}40%{-webkit-transform:translateY(-10px);transform:translateY(-10px)}60%{-webkit-transform:translateY(-5px);transform:translateY(-5px)}}.classify li{font-size:20px;float:left;margin:0 30px 20px 0}.classify .tags .tag{font-size:20px;padding:10px}.classify .tags .tag:before{left:-38px;border-width:19px}.classify .tags .tag:after{top:15px;left:-6px;width:8px;height:8px}.classify-name{font-size:18px;margin:30px}.dynamic .comments li:last-child{border-bottom-width:0}@media only screen and (max-width:500px){.side,.side .avatar{position:relative}.side{height:auto;width:100%}.side footer,main{position:initial}.side .content{margin-top:0;padding-top:20px}.side .overlay{height:100px;z-index:0}.side nav{display:none}.side footer{margin:10px auto;padding-bottom:16px}article{margin:10px}.comments{margin:20px 20px 0}footer.footer{text-align:center}footer.footer .fn-right{float:none;display:block}} \ No newline at end of file diff --git a/yilia/dynamic.ftl b/yilia/dynamic.ftl index 70ef003..77aeed3 100644 --- a/yilia/dynamic.ftl +++ b/yilia/dynamic.ftl @@ -48,7 +48,7 @@ ${viewLabel}ยป
    -
    +
    ${comment.commentContent}
    diff --git a/yilia/footer.ftl b/yilia/footer.ftl index 46a61d3..0804772 100644 --- a/yilia/footer.ftl +++ b/yilia/footer.ftl @@ -61,22 +61,7 @@ var Label = { "markedAvailable": ${markedAvailable?c}, - "skinDirName": "${skinDirName}", - "em00Label": "${em00Label}", - "em01Label": "${em01Label}", - "em02Label": "${em02Label}", - "em03Label": "${em03Label}", - "em04Label": "${em04Label}", - "em05Label": "${em05Label}", - "em06Label": "${em06Label}", - "em07Label": "${em07Label}", - "em08Label": "${em08Label}", - "em09Label": "${em09Label}", - "em10Label": "${em10Label}", - "em11Label": "${em11Label}", - "em12Label": "${em12Label}", - "em13Label": "${em13Label}", - "em14Label": "${em14Label}" + "skinDirName": "${skinDirName}" }; Util.initSW(); Util.parseMarkdown(); diff --git a/yilia/lang/lang_zh_CN.properties b/yilia/lang/lang_zh_CN.properties index 9bf4b57..5556fde 100644 --- a/yilia/lang/lang_zh_CN.properties +++ b/yilia/lang/lang_zh_CN.properties @@ -190,7 +190,6 @@ goTopLabel=\u9876\u90E8 permalink1Label=\u94FE\u63A5\uFF1A permalinkLabel=\u94FE\u63A5 b3logLabel=B3LOG -killBrowserLabel=

    \u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01

    \u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002

    \u60A8\u53EF\u4EE5\u4E0B\u8F7D readmoreLabel=\u9605\u8BFB\u66F4\u591A\u00BB readmore2Label=\u9605\u8BFB\u66F4\u591A replyLabel=\u56DE\u590D\u00BB diff --git a/yilia/macro-head.ftl b/yilia/macro-head.ftl index 2eb751c..fdb623e 100644 --- a/yilia/macro-head.ftl +++ b/yilia/macro-head.ftl @@ -28,7 +28,7 @@ - + diff --git a/yilia/page.ftl b/yilia/page.ftl index 536cb2a..0652d13 100644 --- a/yilia/page.ftl +++ b/yilia/page.ftl @@ -31,8 +31,8 @@ <#include "side.ftl">
    -
    -
    +
    +
    ${page.pageContent}