From 9f7b1a6a07ec9558119cd50fbc8c6249a306f92d Mon Sep 17 00:00:00 2001 From: Van Date: Thu, 31 Aug 2017 00:43:25 +0800 Subject: [PATCH] https://github.com/b3log/solo/issues/12343 --- {andrea => Andrea1}/archive-articles.ftl | 0 {andrea => Andrea1}/article-list.ftl | 0 {andrea => Andrea1}/article.ftl | 0 {andrea => Andrea1}/author-articles.ftl | 0 {andrea => Andrea1}/category-articles.ftl | 0 {andrea => Andrea1}/common-comment.ftl | 0 .../css/andrea.css => Andrea1/css/Andrea.css | 1236 +++++------ .../css/Andrea.min.css | 0 {andrea => Andrea1}/footer.ftl | 174 +- {andrea => Andrea1}/header.ftl | 0 {andrea => Andrea1}/images/bg-blue.jpg | Bin {andrea => Andrea1}/images/bg-brown.jpg | Bin {andrea => Andrea1}/images/bg-grey.jpg | Bin {andrea => Andrea1}/images/bg-transparent.png | Bin {andrea => Andrea1}/images/bgs.png | Bin {andrea => Andrea1}/images/footer.png | Bin {andrea => Andrea1}/images/icon.png | Bin {andrea => Andrea1}/images/paint.png | Bin {andrea => Andrea1}/index.ftl | 0 .../lang/lang_en_US.properties | 0 .../lang/lang_zh_CN.properties | 0 {andrea => Andrea1}/macro-comments.ftl | 238 +-- {andrea => Andrea1}/macro-head.ftl | 0 {andrea => Andrea1}/page.ftl | 0 {andrea => Andrea1}/preview.png | Bin {andrea => Andrea1}/side-tool.ftl | 0 {andrea => Andrea1}/side.ftl | 0 {andrea => Andrea1}/skin.properties | 0 {andrea => Andrea1}/tag-articles.ftl | 0 {andrea => Andrea1}/tags.ftl | 0 {bruce => Bruce1}/archive-articles.ftl | 0 {bruce => Bruce1}/archives.ftl | 0 {bruce => Bruce1}/article-list.ftl | 0 {bruce => Bruce1}/article.ftl | 0 {bruce => Bruce1}/category-articles.ftl | 0 {bruce => Bruce1}/common-comment.ftl | 0 bruce/css/bruce.css => Bruce1/css/Bruce.css | 0 .../bruce.min.css => Bruce1/css/Bruce.min.css | 0 {bruce => Bruce1}/css/bootstrap-theme.css | 0 {bruce => Bruce1}/css/bootstrap-theme.css.map | 0 {bruce => Bruce1}/css/bootstrap-theme.min.css | 0 {bruce => Bruce1}/css/bootstrap.css | 0 {bruce => Bruce1}/css/bootstrap.css.map | 0 {bruce => Bruce1}/css/bootstrap.min.css | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin {bruce => Bruce1}/footer.ftl | 0 {bruce => Bruce1}/header.ftl | 0 {bruce => Bruce1}/index.ftl | 0 {bruce => Bruce1}/js/bootstrap.js | 0 {bruce => Bruce1}/js/bootstrap.min.js | 0 {bruce => Bruce1}/lang/lang_en_US.properties | 0 {bruce => Bruce1}/lang/lang_zh_CN.properties | 0 {bruce => Bruce1}/links.ftl | 0 {bruce => Bruce1}/macro-comments.ftl | 0 {bruce => Bruce1}/macro-head.ftl | 0 {bruce => Bruce1}/page.ftl | 0 {bruce => Bruce1}/preview.png | Bin {bruce => Bruce1}/skin.properties | 0 {bruce => Bruce1}/tag-articles.ftl | 0 {bruce => Bruce1}/tags.ftl | 0 .../archive-articles.ftl | 0 {community => Community1}/article-list.ftl | 0 {community => Community1}/article.ftl | 0 {community => Community1}/author-articles.ftl | 0 .../category-articles.ftl | 0 {community => Community1}/common-comment.ftl | 0 .../css/Community.css | 1432 ++++++------- .../css/Community.min.css | 0 {community => Community1}/footer.ftl | 210 +- {community => Community1}/header.ftl | 0 .../images/author-header.png | Bin {community => Community1}/images/icon.png | Bin .../images/indentline-light.png | Bin .../images/indentline.png | Bin {community => Community1}/index.ftl | 0 .../lang/lang_en_US.properties | 0 .../lang/lang_zh_CN.properties | 0 {community => Community1}/macro-comments.ftl | 272 +-- {community => Community1}/macro-head.ftl | 0 {community => Community1}/page.ftl | 0 {community => Community1}/preview.png | Bin {community => Community1}/side.ftl | 0 {community => Community1}/skin.properties | 0 {community => Community1}/tag-articles.ftl | 0 {community => Community1}/tags.ftl | 0 {finding => Finding1}/archive-articles.ftl | 0 {finding => Finding1}/archives.ftl | 0 {finding => Finding1}/article-list.ftl | 0 {finding => Finding1}/article.ftl | 0 {finding => Finding1}/author-articles.ftl | 0 {finding => Finding1}/category-articles.ftl | 0 {finding => Finding1}/category.ftl | 0 {finding => Finding1}/common-comment.ftl | 0 .../finding.css => Finding1/css/Finding.css | 0 .../css/Finding.min.css | 0 {finding => Finding1}/css/fonts/icomoon.eot | Bin {finding => Finding1}/css/fonts/icomoon.svg | 0 {finding => Finding1}/css/fonts/icomoon.ttf | Bin {finding => Finding1}/css/fonts/icomoon.woff | Bin .../css/fonts/selection.json | 0 {finding => Finding1}/dynamic.ftl | 0 {finding => Finding1}/footer.ftl | 0 {finding => Finding1}/header.ftl | 0 {finding => Finding1}/images/header-bg.jpg | Bin {finding => Finding1}/images/next.jpg | Bin {finding => Finding1}/images/preview.jpg | Bin {finding => Finding1}/index.ftl | 0 .../js/finding.js => Finding1/js/Finding.js | 0 .../js/Finding.min.js | 0 .../lang/lang_en_US.properties | 0 .../lang/lang_zh_CN.properties | 0 {finding => Finding1}/links.ftl | 0 {finding => Finding1}/macro-comments.ftl | 0 {finding => Finding1}/macro-head.ftl | 0 {finding => Finding1}/page.ftl | 0 {finding => Finding1}/preview.png | Bin {finding => Finding1}/side.ftl | 0 {finding => Finding1}/skin.properties | 0 {finding => Finding1}/tag-articles.ftl | 0 {finding => Finding1}/tags.ftl | 0 {neoease => NeoEase1}/archive-articles.ftl | 0 {neoease => NeoEase1}/article-list.ftl | 0 {neoease => NeoEase1}/article.ftl | 0 {neoease => NeoEase1}/author-articles.ftl | 0 {neoease => NeoEase1}/category-articles.ftl | 0 {neoease => NeoEase1}/common-comment.ftl | 0 .../neoease.css => NeoEase1/css/NeoEase.css | 1824 ++++++++--------- .../css/NeoEase.min.css | 0 {neoease => NeoEase1}/footer.ftl | 88 +- {neoease => NeoEase1}/header.ftl | 120 +- {neoease => NeoEase1}/images/404.png | Bin {neoease => NeoEase1}/images/ajax-loader.gif | Bin {neoease => NeoEase1}/images/icons.png | Bin {neoease => NeoEase1}/index.ftl | 0 .../js/neoease.js => NeoEase1/js/NeoEase.js | 0 .../js/NeoEase.min.js | 0 .../lang/lang_en_US.properties | 0 .../lang/lang_zh_CN.properties | 0 {neoease => NeoEase1}/macro-comments.ftl | 230 +-- {neoease => NeoEase1}/macro-head.ftl | 0 {neoease => NeoEase1}/page.ftl | 0 {neoease => NeoEase1}/preview.png | Bin {neoease => NeoEase1}/side.ftl | 0 {neoease => NeoEase1}/skin.properties | 0 {neoease => NeoEase1}/tag-articles.ftl | 0 {neoease => NeoEase1}/tags.ftl | 0 skin-preview/{andrea.jpg => Andrea.jpg} | Bin skin-preview/{bruce.jpg => Bruce.jpg} | Bin skin-preview/{community.jpg => Community.jpg} | Bin skin-preview/{finding.jpg => Finding.jpg} | Bin skin-preview/{neoease.jpg => NeoEase.jpg} | Bin 154 files changed, 2912 insertions(+), 2912 deletions(-) rename {andrea => Andrea1}/archive-articles.ftl (100%) rename {andrea => Andrea1}/article-list.ftl (100%) rename {andrea => Andrea1}/article.ftl (100%) rename {andrea => Andrea1}/author-articles.ftl (100%) rename {andrea => Andrea1}/category-articles.ftl (100%) rename {andrea => Andrea1}/common-comment.ftl (100%) rename andrea/css/andrea.css => Andrea1/css/Andrea.css (94%) rename andrea/css/andrea.min.css => Andrea1/css/Andrea.min.css (100%) rename {andrea => Andrea1}/footer.ftl (97%) rename {andrea => Andrea1}/header.ftl (100%) rename {andrea => Andrea1}/images/bg-blue.jpg (100%) rename {andrea => Andrea1}/images/bg-brown.jpg (100%) rename {andrea => Andrea1}/images/bg-grey.jpg (100%) rename {andrea => Andrea1}/images/bg-transparent.png (100%) rename {andrea => Andrea1}/images/bgs.png (100%) rename {andrea => Andrea1}/images/footer.png (100%) rename {andrea => Andrea1}/images/icon.png (100%) rename {andrea => Andrea1}/images/paint.png (100%) rename {andrea => Andrea1}/index.ftl (100%) rename {andrea => Andrea1}/lang/lang_en_US.properties (100%) rename {andrea => Andrea1}/lang/lang_zh_CN.properties (100%) rename {andrea => Andrea1}/macro-comments.ftl (97%) rename {andrea => Andrea1}/macro-head.ftl (100%) rename {andrea => Andrea1}/page.ftl (100%) rename {andrea => Andrea1}/preview.png (100%) rename {andrea => Andrea1}/side-tool.ftl (100%) rename {andrea => Andrea1}/side.ftl (100%) rename {andrea => Andrea1}/skin.properties (100%) rename {andrea => Andrea1}/tag-articles.ftl (100%) rename {andrea => Andrea1}/tags.ftl (100%) rename {bruce => Bruce1}/archive-articles.ftl (100%) rename {bruce => Bruce1}/archives.ftl (100%) rename {bruce => Bruce1}/article-list.ftl (100%) rename {bruce => Bruce1}/article.ftl (100%) rename {bruce => Bruce1}/category-articles.ftl (100%) rename {bruce => Bruce1}/common-comment.ftl (100%) rename bruce/css/bruce.css => Bruce1/css/Bruce.css (100%) rename bruce/css/bruce.min.css => Bruce1/css/Bruce.min.css (100%) rename {bruce => Bruce1}/css/bootstrap-theme.css (100%) rename {bruce => Bruce1}/css/bootstrap-theme.css.map (100%) rename {bruce => Bruce1}/css/bootstrap-theme.min.css (100%) rename {bruce => Bruce1}/css/bootstrap.css (100%) rename {bruce => Bruce1}/css/bootstrap.css.map (100%) rename {bruce => Bruce1}/css/bootstrap.min.css (100%) rename {bruce => Bruce1}/fonts/glyphicons-halflings-regular.eot (100%) rename {bruce => Bruce1}/fonts/glyphicons-halflings-regular.svg (100%) rename {bruce => Bruce1}/fonts/glyphicons-halflings-regular.ttf (100%) rename {bruce => Bruce1}/fonts/glyphicons-halflings-regular.woff (100%) rename {bruce => Bruce1}/footer.ftl (100%) rename {bruce => Bruce1}/header.ftl (100%) rename {bruce => Bruce1}/index.ftl (100%) rename {bruce => Bruce1}/js/bootstrap.js (100%) rename {bruce => Bruce1}/js/bootstrap.min.js (100%) rename {bruce => Bruce1}/lang/lang_en_US.properties (100%) rename {bruce => Bruce1}/lang/lang_zh_CN.properties (100%) rename {bruce => Bruce1}/links.ftl (100%) rename {bruce => Bruce1}/macro-comments.ftl (100%) rename {bruce => Bruce1}/macro-head.ftl (100%) rename {bruce => Bruce1}/page.ftl (100%) rename {bruce => Bruce1}/preview.png (100%) rename {bruce => Bruce1}/skin.properties (100%) rename {bruce => Bruce1}/tag-articles.ftl (100%) rename {bruce => Bruce1}/tags.ftl (100%) rename {community => Community1}/archive-articles.ftl (100%) rename {community => Community1}/article-list.ftl (100%) rename {community => Community1}/article.ftl (100%) rename {community => Community1}/author-articles.ftl (100%) rename {community => Community1}/category-articles.ftl (100%) rename {community => Community1}/common-comment.ftl (100%) rename community/css/community.css => Community1/css/Community.css (95%) rename community/css/community.min.css => Community1/css/Community.min.css (100%) rename {community => Community1}/footer.ftl (97%) rename {community => Community1}/header.ftl (100%) rename {community => Community1}/images/author-header.png (100%) rename {community => Community1}/images/icon.png (100%) rename {community => Community1}/images/indentline-light.png (100%) rename {community => Community1}/images/indentline.png (100%) rename {community => Community1}/index.ftl (100%) rename {community => Community1}/lang/lang_en_US.properties (100%) rename {community => Community1}/lang/lang_zh_CN.properties (100%) rename {community => Community1}/macro-comments.ftl (97%) rename {community => Community1}/macro-head.ftl (100%) rename {community => Community1}/page.ftl (100%) rename {community => Community1}/preview.png (100%) rename {community => Community1}/side.ftl (100%) rename {community => Community1}/skin.properties (100%) rename {community => Community1}/tag-articles.ftl (100%) rename {community => Community1}/tags.ftl (100%) rename {finding => Finding1}/archive-articles.ftl (100%) rename {finding => Finding1}/archives.ftl (100%) rename {finding => Finding1}/article-list.ftl (100%) rename {finding => Finding1}/article.ftl (100%) rename {finding => Finding1}/author-articles.ftl (100%) rename {finding => Finding1}/category-articles.ftl (100%) rename {finding => Finding1}/category.ftl (100%) rename {finding => Finding1}/common-comment.ftl (100%) rename finding/css/finding.css => Finding1/css/Finding.css (100%) rename finding/css/finding.min.css => Finding1/css/Finding.min.css (100%) rename {finding => Finding1}/css/fonts/icomoon.eot (100%) rename {finding => Finding1}/css/fonts/icomoon.svg (100%) rename {finding => Finding1}/css/fonts/icomoon.ttf (100%) rename {finding => Finding1}/css/fonts/icomoon.woff (100%) rename {finding => Finding1}/css/fonts/selection.json (100%) rename {finding => Finding1}/dynamic.ftl (100%) rename {finding => Finding1}/footer.ftl (100%) rename {finding => Finding1}/header.ftl (100%) rename {finding => Finding1}/images/header-bg.jpg (100%) rename {finding => Finding1}/images/next.jpg (100%) rename {finding => Finding1}/images/preview.jpg (100%) rename {finding => Finding1}/index.ftl (100%) rename finding/js/finding.js => Finding1/js/Finding.js (100%) rename finding/js/finding.min.js => Finding1/js/Finding.min.js (100%) rename {finding => Finding1}/lang/lang_en_US.properties (100%) rename {finding => Finding1}/lang/lang_zh_CN.properties (100%) rename {finding => Finding1}/links.ftl (100%) rename {finding => Finding1}/macro-comments.ftl (100%) rename {finding => Finding1}/macro-head.ftl (100%) rename {finding => Finding1}/page.ftl (100%) rename {finding => Finding1}/preview.png (100%) rename {finding => Finding1}/side.ftl (100%) rename {finding => Finding1}/skin.properties (100%) rename {finding => Finding1}/tag-articles.ftl (100%) rename {finding => Finding1}/tags.ftl (100%) rename {neoease => NeoEase1}/archive-articles.ftl (100%) rename {neoease => NeoEase1}/article-list.ftl (100%) rename {neoease => NeoEase1}/article.ftl (100%) rename {neoease => NeoEase1}/author-articles.ftl (100%) rename {neoease => NeoEase1}/category-articles.ftl (100%) rename {neoease => NeoEase1}/common-comment.ftl (100%) rename neoease/css/neoease.css => NeoEase1/css/NeoEase.css (94%) rename neoease/css/neoease.min.css => NeoEase1/css/NeoEase.min.css (100%) rename {neoease => NeoEase1}/footer.ftl (97%) rename {neoease => NeoEase1}/header.ftl (97%) rename {neoease => NeoEase1}/images/404.png (100%) rename {neoease => NeoEase1}/images/ajax-loader.gif (100%) rename {neoease => NeoEase1}/images/icons.png (100%) rename {neoease => NeoEase1}/index.ftl (100%) rename neoease/js/neoease.js => NeoEase1/js/NeoEase.js (100%) rename neoease/js/neoease.min.js => NeoEase1/js/NeoEase.min.js (100%) rename {neoease => NeoEase1}/lang/lang_en_US.properties (100%) rename {neoease => NeoEase1}/lang/lang_zh_CN.properties (100%) rename {neoease => NeoEase1}/macro-comments.ftl (97%) rename {neoease => NeoEase1}/macro-head.ftl (100%) rename {neoease => NeoEase1}/page.ftl (100%) rename {neoease => NeoEase1}/preview.png (100%) rename {neoease => NeoEase1}/side.ftl (100%) rename {neoease => NeoEase1}/skin.properties (100%) rename {neoease => NeoEase1}/tag-articles.ftl (100%) rename {neoease => NeoEase1}/tags.ftl (100%) rename skin-preview/{andrea.jpg => Andrea.jpg} (100%) rename skin-preview/{bruce.jpg => Bruce.jpg} (100%) rename skin-preview/{community.jpg => Community.jpg} (100%) rename skin-preview/{finding.jpg => Finding.jpg} (100%) rename skin-preview/{neoease.jpg => NeoEase.jpg} (100%) diff --git a/andrea/archive-articles.ftl b/Andrea1/archive-articles.ftl similarity index 100% rename from andrea/archive-articles.ftl rename to Andrea1/archive-articles.ftl diff --git a/andrea/article-list.ftl b/Andrea1/article-list.ftl similarity index 100% rename from andrea/article-list.ftl rename to Andrea1/article-list.ftl diff --git a/andrea/article.ftl b/Andrea1/article.ftl similarity index 100% rename from andrea/article.ftl rename to Andrea1/article.ftl diff --git a/andrea/author-articles.ftl b/Andrea1/author-articles.ftl similarity index 100% rename from andrea/author-articles.ftl rename to Andrea1/author-articles.ftl diff --git a/andrea/category-articles.ftl b/Andrea1/category-articles.ftl similarity index 100% rename from andrea/category-articles.ftl rename to Andrea1/category-articles.ftl diff --git a/andrea/common-comment.ftl b/Andrea1/common-comment.ftl similarity index 100% rename from andrea/common-comment.ftl rename to Andrea1/common-comment.ftl diff --git a/andrea/css/andrea.css b/Andrea1/css/Andrea.css similarity index 94% rename from andrea/css/andrea.css rename to Andrea1/css/Andrea.css index a206b32..656efd7 100644 --- a/andrea/css/andrea.css +++ b/Andrea1/css/Andrea.css @@ -1,619 +1,619 @@ -/** - * Copyright (c) 2010-2017, b3log.org & hacpai.com - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - * skin andrea style - * - * @author Liyuan Li - * @version 1.0.0.9, May 15, 2012 -*/ -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); -} - -/* common */ -.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'); -} - -/* frame */ -.wrapper { - width: 910px; - margin: 0 auto; - position: relative; -} - -.main { - float: left; - width: 627px; -} - -.side-navi { - float: left; - width: 282px; -} - -/* header */ -.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: 45px; - text-decoration: none; - font-weight: bold; -} - -.header .right li a:hover { - color: #DDDDDD; - font-family: 'sans-serif'; -} - -/* main */ -.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; -} - -/* common articles */ -.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 */ -.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 */ -.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 */ -.side-tool { - position: fixed; - top: 30px; - left: 0px; -} - -.side-tool li { - margin-left: 0px; -} - -.side-tool ul { - list-style-type: none; -} - -#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; -} - -/* article */ -.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: 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 */ -#comments { - position: relative; -} - -#comments, .comment-form { - padding-bottom: 30px; -} - -.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-right: 4px; -} - -.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; -} - -/* others */ -#tagsPanel { - min-height: 1px; -} - -#tagsPanel a { - display: block; - float: left; - border: 1px solid #D4D4D4; -} - -#tagsPanel a:hover { - border: 1px solid #BE0700; +/** + * Copyright (c) 2010-2017, b3log.org & hacpai.com + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/* + * skin andrea style + * + * @author Liyuan Li + * @version 1.0.0.9, May 15, 2012 +*/ +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); +} + +/* common */ +.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'); +} + +/* frame */ +.wrapper { + width: 910px; + margin: 0 auto; + position: relative; +} + +.main { + float: left; + width: 627px; +} + +.side-navi { + float: left; + width: 282px; +} + +/* header */ +.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: 45px; + text-decoration: none; + font-weight: bold; +} + +.header .right li a:hover { + color: #DDDDDD; + font-family: 'sans-serif'; +} + +/* main */ +.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; +} + +/* common articles */ +.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 */ +.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 */ +.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 */ +.side-tool { + position: fixed; + top: 30px; + left: 0px; +} + +.side-tool li { + margin-left: 0px; +} + +.side-tool ul { + list-style-type: none; +} + +#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; +} + +/* article */ +.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: 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 */ +#comments { + position: relative; +} + +#comments, .comment-form { + padding-bottom: 30px; +} + +.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-right: 4px; +} + +.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; +} + +/* others */ +#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/andrea.min.css b/Andrea1/css/Andrea.min.css similarity index 100% rename from andrea/css/andrea.min.css rename to Andrea1/css/Andrea.min.css diff --git a/andrea/footer.ftl b/Andrea1/footer.ftl similarity index 97% rename from andrea/footer.ftl rename to Andrea1/footer.ftl index 31a4a0c..e0cea9b 100644 --- a/andrea/footer.ftl +++ b/Andrea1/footer.ftl @@ -1,88 +1,88 @@ -
- © ${year} - ${blogTitle}${footerContent}
- Powered by B3log 开源 • Solo ${version}
- Theme by Andrea & Vanessa. -
- - - +
+ © ${year} - ${blogTitle}${footerContent}
+ Powered by B3log 开源 • Solo ${version}
+ Theme by Andrea & Vanessa. +
+ + + ${plugins} \ No newline at end of file diff --git a/andrea/header.ftl b/Andrea1/header.ftl similarity index 100% rename from andrea/header.ftl rename to Andrea1/header.ftl diff --git a/andrea/images/bg-blue.jpg b/Andrea1/images/bg-blue.jpg similarity index 100% rename from andrea/images/bg-blue.jpg rename to Andrea1/images/bg-blue.jpg diff --git a/andrea/images/bg-brown.jpg b/Andrea1/images/bg-brown.jpg similarity index 100% rename from andrea/images/bg-brown.jpg rename to Andrea1/images/bg-brown.jpg diff --git a/andrea/images/bg-grey.jpg b/Andrea1/images/bg-grey.jpg similarity index 100% rename from andrea/images/bg-grey.jpg rename to Andrea1/images/bg-grey.jpg diff --git a/andrea/images/bg-transparent.png b/Andrea1/images/bg-transparent.png similarity index 100% rename from andrea/images/bg-transparent.png rename to Andrea1/images/bg-transparent.png diff --git a/andrea/images/bgs.png b/Andrea1/images/bgs.png similarity index 100% rename from andrea/images/bgs.png rename to Andrea1/images/bgs.png diff --git a/andrea/images/footer.png b/Andrea1/images/footer.png similarity index 100% rename from andrea/images/footer.png rename to Andrea1/images/footer.png diff --git a/andrea/images/icon.png b/Andrea1/images/icon.png similarity index 100% rename from andrea/images/icon.png rename to Andrea1/images/icon.png diff --git a/andrea/images/paint.png b/Andrea1/images/paint.png similarity index 100% rename from andrea/images/paint.png rename to Andrea1/images/paint.png diff --git a/andrea/index.ftl b/Andrea1/index.ftl similarity index 100% rename from andrea/index.ftl rename to Andrea1/index.ftl diff --git a/andrea/lang/lang_en_US.properties b/Andrea1/lang/lang_en_US.properties similarity index 100% rename from andrea/lang/lang_en_US.properties rename to Andrea1/lang/lang_en_US.properties diff --git a/andrea/lang/lang_zh_CN.properties b/Andrea1/lang/lang_zh_CN.properties similarity index 100% rename from andrea/lang/lang_zh_CN.properties rename to Andrea1/lang/lang_zh_CN.properties diff --git a/andrea/macro-comments.ftl b/Andrea1/macro-comments.ftl similarity index 97% rename from andrea/macro-comments.ftl rename to Andrea1/macro-comments.ftl index 9b895f0..567227e 100644 --- a/andrea/macro-comments.ftl +++ b/Andrea1/macro-comments.ftl @@ -1,120 +1,120 @@ -<#macro comments commentList article> -

${commentLabel}

-
- <#list commentList as comment> - <#include "common-comment.ftl"/> - -
-<#if article.commentable> - - - <#if !isLoggedIn> - - - - - - - - - - - - - - - - - - - - - - <#if !isLoggedIn> - - - - - - - - - -
- ${commentNameLabel} - - -
- ${commentEmailLabel} - - -
- ${commentURLLabel} - - -
- ${commentEmotionsLabel} - - - - - - - - - - - - - - - - -
- ${commentContentLabel} - - -
- ${captchaLabel} - - - validate -
- - -
- - - -<#macro comment_script oId> - - +<#macro comments commentList article> +

${commentLabel}

+
+ <#list commentList as comment> + <#include "common-comment.ftl"/> + +
+<#if article.commentable> + + + <#if !isLoggedIn> + + + + + + + + + + + + + + + + + + + + + + <#if !isLoggedIn> + + + + + + + + + +
+ ${commentNameLabel} + + +
+ ${commentEmailLabel} + + +
+ ${commentURLLabel} + + +
+ ${commentEmotionsLabel} + + + + + + + + + + + + + + + + +
+ ${commentContentLabel} + + +
+ ${captchaLabel} + + + validate +
+ + +
+ + + +<#macro comment_script oId> + + \ No newline at end of file diff --git a/andrea/macro-head.ftl b/Andrea1/macro-head.ftl similarity index 100% rename from andrea/macro-head.ftl rename to Andrea1/macro-head.ftl diff --git a/andrea/page.ftl b/Andrea1/page.ftl similarity index 100% rename from andrea/page.ftl rename to Andrea1/page.ftl diff --git a/andrea/preview.png b/Andrea1/preview.png similarity index 100% rename from andrea/preview.png rename to Andrea1/preview.png diff --git a/andrea/side-tool.ftl b/Andrea1/side-tool.ftl similarity index 100% rename from andrea/side-tool.ftl rename to Andrea1/side-tool.ftl diff --git a/andrea/side.ftl b/Andrea1/side.ftl similarity index 100% rename from andrea/side.ftl rename to Andrea1/side.ftl diff --git a/andrea/skin.properties b/Andrea1/skin.properties similarity index 100% rename from andrea/skin.properties rename to Andrea1/skin.properties diff --git a/andrea/tag-articles.ftl b/Andrea1/tag-articles.ftl similarity index 100% rename from andrea/tag-articles.ftl rename to Andrea1/tag-articles.ftl diff --git a/andrea/tags.ftl b/Andrea1/tags.ftl similarity index 100% rename from andrea/tags.ftl rename to Andrea1/tags.ftl diff --git a/bruce/archive-articles.ftl b/Bruce1/archive-articles.ftl similarity index 100% rename from bruce/archive-articles.ftl rename to Bruce1/archive-articles.ftl diff --git a/bruce/archives.ftl b/Bruce1/archives.ftl similarity index 100% rename from bruce/archives.ftl rename to Bruce1/archives.ftl diff --git a/bruce/article-list.ftl b/Bruce1/article-list.ftl similarity index 100% rename from bruce/article-list.ftl rename to Bruce1/article-list.ftl diff --git a/bruce/article.ftl b/Bruce1/article.ftl similarity index 100% rename from bruce/article.ftl rename to Bruce1/article.ftl diff --git a/bruce/category-articles.ftl b/Bruce1/category-articles.ftl similarity index 100% rename from bruce/category-articles.ftl rename to Bruce1/category-articles.ftl diff --git a/bruce/common-comment.ftl b/Bruce1/common-comment.ftl similarity index 100% rename from bruce/common-comment.ftl rename to Bruce1/common-comment.ftl diff --git a/bruce/css/bruce.css b/Bruce1/css/Bruce.css similarity index 100% rename from bruce/css/bruce.css rename to Bruce1/css/Bruce.css diff --git a/bruce/css/bruce.min.css b/Bruce1/css/Bruce.min.css similarity index 100% rename from bruce/css/bruce.min.css rename to Bruce1/css/Bruce.min.css diff --git a/bruce/css/bootstrap-theme.css b/Bruce1/css/bootstrap-theme.css similarity index 100% rename from bruce/css/bootstrap-theme.css rename to Bruce1/css/bootstrap-theme.css diff --git a/bruce/css/bootstrap-theme.css.map b/Bruce1/css/bootstrap-theme.css.map similarity index 100% rename from bruce/css/bootstrap-theme.css.map rename to Bruce1/css/bootstrap-theme.css.map diff --git a/bruce/css/bootstrap-theme.min.css b/Bruce1/css/bootstrap-theme.min.css similarity index 100% rename from bruce/css/bootstrap-theme.min.css rename to Bruce1/css/bootstrap-theme.min.css diff --git a/bruce/css/bootstrap.css b/Bruce1/css/bootstrap.css similarity index 100% rename from bruce/css/bootstrap.css rename to Bruce1/css/bootstrap.css diff --git a/bruce/css/bootstrap.css.map b/Bruce1/css/bootstrap.css.map similarity index 100% rename from bruce/css/bootstrap.css.map rename to Bruce1/css/bootstrap.css.map diff --git a/bruce/css/bootstrap.min.css b/Bruce1/css/bootstrap.min.css similarity index 100% rename from bruce/css/bootstrap.min.css rename to Bruce1/css/bootstrap.min.css diff --git a/bruce/fonts/glyphicons-halflings-regular.eot b/Bruce1/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from bruce/fonts/glyphicons-halflings-regular.eot rename to Bruce1/fonts/glyphicons-halflings-regular.eot diff --git a/bruce/fonts/glyphicons-halflings-regular.svg b/Bruce1/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from bruce/fonts/glyphicons-halflings-regular.svg rename to Bruce1/fonts/glyphicons-halflings-regular.svg diff --git a/bruce/fonts/glyphicons-halflings-regular.ttf b/Bruce1/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from bruce/fonts/glyphicons-halflings-regular.ttf rename to Bruce1/fonts/glyphicons-halflings-regular.ttf diff --git a/bruce/fonts/glyphicons-halflings-regular.woff b/Bruce1/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from bruce/fonts/glyphicons-halflings-regular.woff rename to Bruce1/fonts/glyphicons-halflings-regular.woff diff --git a/bruce/footer.ftl b/Bruce1/footer.ftl similarity index 100% rename from bruce/footer.ftl rename to Bruce1/footer.ftl diff --git a/bruce/header.ftl b/Bruce1/header.ftl similarity index 100% rename from bruce/header.ftl rename to Bruce1/header.ftl diff --git a/bruce/index.ftl b/Bruce1/index.ftl similarity index 100% rename from bruce/index.ftl rename to Bruce1/index.ftl diff --git a/bruce/js/bootstrap.js b/Bruce1/js/bootstrap.js similarity index 100% rename from bruce/js/bootstrap.js rename to Bruce1/js/bootstrap.js diff --git a/bruce/js/bootstrap.min.js b/Bruce1/js/bootstrap.min.js similarity index 100% rename from bruce/js/bootstrap.min.js rename to Bruce1/js/bootstrap.min.js diff --git a/bruce/lang/lang_en_US.properties b/Bruce1/lang/lang_en_US.properties similarity index 100% rename from bruce/lang/lang_en_US.properties rename to Bruce1/lang/lang_en_US.properties diff --git a/bruce/lang/lang_zh_CN.properties b/Bruce1/lang/lang_zh_CN.properties similarity index 100% rename from bruce/lang/lang_zh_CN.properties rename to Bruce1/lang/lang_zh_CN.properties diff --git a/bruce/links.ftl b/Bruce1/links.ftl similarity index 100% rename from bruce/links.ftl rename to Bruce1/links.ftl diff --git a/bruce/macro-comments.ftl b/Bruce1/macro-comments.ftl similarity index 100% rename from bruce/macro-comments.ftl rename to Bruce1/macro-comments.ftl diff --git a/bruce/macro-head.ftl b/Bruce1/macro-head.ftl similarity index 100% rename from bruce/macro-head.ftl rename to Bruce1/macro-head.ftl diff --git a/bruce/page.ftl b/Bruce1/page.ftl similarity index 100% rename from bruce/page.ftl rename to Bruce1/page.ftl diff --git a/bruce/preview.png b/Bruce1/preview.png similarity index 100% rename from bruce/preview.png rename to Bruce1/preview.png diff --git a/bruce/skin.properties b/Bruce1/skin.properties similarity index 100% rename from bruce/skin.properties rename to Bruce1/skin.properties diff --git a/bruce/tag-articles.ftl b/Bruce1/tag-articles.ftl similarity index 100% rename from bruce/tag-articles.ftl rename to Bruce1/tag-articles.ftl diff --git a/bruce/tags.ftl b/Bruce1/tags.ftl similarity index 100% rename from bruce/tags.ftl rename to Bruce1/tags.ftl diff --git a/community/archive-articles.ftl b/Community1/archive-articles.ftl similarity index 100% rename from community/archive-articles.ftl rename to Community1/archive-articles.ftl diff --git a/community/article-list.ftl b/Community1/article-list.ftl similarity index 100% rename from community/article-list.ftl rename to Community1/article-list.ftl diff --git a/community/article.ftl b/Community1/article.ftl similarity index 100% rename from community/article.ftl rename to Community1/article.ftl diff --git a/community/author-articles.ftl b/Community1/author-articles.ftl similarity index 100% rename from community/author-articles.ftl rename to Community1/author-articles.ftl diff --git a/community/category-articles.ftl b/Community1/category-articles.ftl similarity index 100% rename from community/category-articles.ftl rename to Community1/category-articles.ftl diff --git a/community/common-comment.ftl b/Community1/common-comment.ftl similarity index 100% rename from community/common-comment.ftl rename to Community1/common-comment.ftl diff --git a/community/css/community.css b/Community1/css/Community.css similarity index 95% rename from community/css/community.css rename to Community1/css/Community.css index b5fff4e..9b0a4f0 100644 --- a/community/css/community.css +++ b/Community1/css/Community.css @@ -1,717 +1,717 @@ -/** - * Copyright (c) 2010-2017, b3log.org & hacpai.com - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -@charset "utf-8"; -/* - * skin community style - * - * @author Liyuan Li - * @version 1.0.0.7, May 15, 2012 -*/ -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; -} - -.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,#333333,#000000); - background-image: -moz-linear-gradient(top,#333333,#000000); - background-image: -ms-linear-gradient(top,#333333,#000000); - background-image: -o-linear-gradient(top,#333333,#000000); - background-image: -webkit-gradient(linear,left top,left bottom,from(#333333),to(#000000)); - 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,#333333,#212121); - background-image: -moz-linear-gradient(top,#333333,#212121); - background-image: -ms-linear-gradient(top,#333333,#212121); - background-image: -o-linear-gradient(top,#333333,#212121); - background-image: -webkit-gradient(linear,left top,left bottom,from(#333333),to(#212121)); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#212121'); -} - -.marginBottom40 { - margin-bottom: 40px; -} - -/* header */ -.header-user { - background-color: #DEDEDE; - padding-top: 1px; -} - -.header-navi { - background: url("../images/icon.png") 0px -130px repeat-x #333333; - 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; -} - -.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: 0 16px; - line-height: 42px; - font-size: 14px; -} - -.header-navi-main .sub-tab:hover { - background-color: #76A0AA; -} - -/* article list */ -.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; -} - -.article-body { - line-height: 145%; -} - -.article-body a { - color: #075181; -} - -.article-body 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 */ -.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; -} - -.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; - 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 */ -.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: 5px 3px 0 0; -} - -.footer-block li:hover { - background: url("../images/icon.png") repeat-x 0px -34px; -} - -/* footer copyright */ -.footer { - background: url("../images/indentline-light.png") repeat-x scroll left top #DEDEDE; - text-align: left; -} - -.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 */ -.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; -} - -/* icon */ -.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; +/** + * Copyright (c) 2010-2017, b3log.org & hacpai.com + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +@charset "utf-8"; +/* + * skin community style + * + * @author Liyuan Li + * @version 1.0.0.7, May 15, 2012 +*/ +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; +} + +.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,#333333,#000000); + background-image: -moz-linear-gradient(top,#333333,#000000); + background-image: -ms-linear-gradient(top,#333333,#000000); + background-image: -o-linear-gradient(top,#333333,#000000); + background-image: -webkit-gradient(linear,left top,left bottom,from(#333333),to(#000000)); + 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,#333333,#212121); + background-image: -moz-linear-gradient(top,#333333,#212121); + background-image: -ms-linear-gradient(top,#333333,#212121); + background-image: -o-linear-gradient(top,#333333,#212121); + background-image: -webkit-gradient(linear,left top,left bottom,from(#333333),to(#212121)); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#212121'); +} + +.marginBottom40 { + margin-bottom: 40px; +} + +/* header */ +.header-user { + background-color: #DEDEDE; + padding-top: 1px; +} + +.header-navi { + background: url("../images/icon.png") 0px -130px repeat-x #333333; + 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; +} + +.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: 0 16px; + line-height: 42px; + font-size: 14px; +} + +.header-navi-main .sub-tab:hover { + background-color: #76A0AA; +} + +/* article list */ +.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; +} + +.article-body { + line-height: 145%; +} + +.article-body a { + color: #075181; +} + +.article-body 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 */ +.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; +} + +.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; + 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 */ +.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: 5px 3px 0 0; +} + +.footer-block li:hover { + background: url("../images/icon.png") repeat-x 0px -34px; +} + +/* footer copyright */ +.footer { + background: url("../images/indentline-light.png") repeat-x scroll left top #DEDEDE; + text-align: left; +} + +.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 */ +.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; +} + +/* icon */ +.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; } \ No newline at end of file diff --git a/community/css/community.min.css b/Community1/css/Community.min.css similarity index 100% rename from community/css/community.min.css rename to Community1/css/Community.min.css diff --git a/community/footer.ftl b/Community1/footer.ftl similarity index 97% rename from community/footer.ftl rename to Community1/footer.ftl index f61bf12..0f926e8 100644 --- a/community/footer.ftl +++ b/Community1/footer.ftl @@ -1,106 +1,106 @@ -
-
-
- © ${year} - ${blogTitle}${footerContent} -
- Powered by B3log 开源 • Solo ${version}   - Theme by Vanessa & Skeptical. -
-
-
${goTopLabel}
-
-
- ${viewCount1Label} - - ${statistic.statisticBlogViewCount} - -    - ${articleCount1Label} - - ${statistic.statisticPublishedBlogArticleCount} - -    - ${commentCount1Label} - - ${statistic.statisticPublishedBlogCommentCount} - -
-
-
-
- - - +
+
+
+ © ${year} - ${blogTitle}${footerContent} +
+ Powered by B3log 开源 • Solo ${version}   + Theme by Vanessa & Skeptical. +
+
+
${goTopLabel}
+
+
+ ${viewCount1Label} + + ${statistic.statisticBlogViewCount} + +    + ${articleCount1Label} + + ${statistic.statisticPublishedBlogArticleCount} + +    + ${commentCount1Label} + + ${statistic.statisticPublishedBlogCommentCount} + +
+
+
+
+ + + ${plugins} \ No newline at end of file diff --git a/community/header.ftl b/Community1/header.ftl similarity index 100% rename from community/header.ftl rename to Community1/header.ftl diff --git a/community/images/author-header.png b/Community1/images/author-header.png similarity index 100% rename from community/images/author-header.png rename to Community1/images/author-header.png diff --git a/community/images/icon.png b/Community1/images/icon.png similarity index 100% rename from community/images/icon.png rename to Community1/images/icon.png diff --git a/community/images/indentline-light.png b/Community1/images/indentline-light.png similarity index 100% rename from community/images/indentline-light.png rename to Community1/images/indentline-light.png diff --git a/community/images/indentline.png b/Community1/images/indentline.png similarity index 100% rename from community/images/indentline.png rename to Community1/images/indentline.png diff --git a/community/index.ftl b/Community1/index.ftl similarity index 100% rename from community/index.ftl rename to Community1/index.ftl diff --git a/community/lang/lang_en_US.properties b/Community1/lang/lang_en_US.properties similarity index 100% rename from community/lang/lang_en_US.properties rename to Community1/lang/lang_en_US.properties diff --git a/community/lang/lang_zh_CN.properties b/Community1/lang/lang_zh_CN.properties similarity index 100% rename from community/lang/lang_zh_CN.properties rename to Community1/lang/lang_zh_CN.properties diff --git a/community/macro-comments.ftl b/Community1/macro-comments.ftl similarity index 97% rename from community/macro-comments.ftl rename to Community1/macro-comments.ftl index e53f59e..e027cfe 100644 --- a/community/macro-comments.ftl +++ b/Community1/macro-comments.ftl @@ -1,137 +1,137 @@ -<#macro comments commentList article> -
- <#list commentList as comment> - <#include "common-comment.ftl"/> - -
-<#if article.commentable> -
- ${postCommentsLabel} -
- - - <#if !isLoggedIn> - - - - - - - - - - - - - - - - - - - - - - <#if !isLoggedIn> - - - - - - - - - -
- - ${commentNameLabel} - - - - -
- - ${commentEmailLabel} - - - - -
- - ${commentURLLabel} - - - - -
- - ${commentEmotionsLabel} - - - - - - - - - - - - - - - - - - -
- - ${commentContentLabel} - - - - -
- - ${captchaLabel} - - - - - validate -
- - -
- - - -<#macro comment_script oId> - - +<#macro comments commentList article> +
+ <#list commentList as comment> + <#include "common-comment.ftl"/> + +
+<#if article.commentable> +
+ ${postCommentsLabel} +
+ + + <#if !isLoggedIn> + + + + + + + + + + + + + + + + + + + + + + <#if !isLoggedIn> + + + + + + + + + +
+ + ${commentNameLabel} + + + + +
+ + ${commentEmailLabel} + + + + +
+ + ${commentURLLabel} + + + + +
+ + ${commentEmotionsLabel} + + + + + + + + + + + + + + + + + + +
+ + ${commentContentLabel} + + + + +
+ + ${captchaLabel} + + + + + validate +
+ + +
+ + + +<#macro comment_script oId> + + \ No newline at end of file diff --git a/community/macro-head.ftl b/Community1/macro-head.ftl similarity index 100% rename from community/macro-head.ftl rename to Community1/macro-head.ftl diff --git a/community/page.ftl b/Community1/page.ftl similarity index 100% rename from community/page.ftl rename to Community1/page.ftl diff --git a/community/preview.png b/Community1/preview.png similarity index 100% rename from community/preview.png rename to Community1/preview.png diff --git a/community/side.ftl b/Community1/side.ftl similarity index 100% rename from community/side.ftl rename to Community1/side.ftl diff --git a/community/skin.properties b/Community1/skin.properties similarity index 100% rename from community/skin.properties rename to Community1/skin.properties diff --git a/community/tag-articles.ftl b/Community1/tag-articles.ftl similarity index 100% rename from community/tag-articles.ftl rename to Community1/tag-articles.ftl diff --git a/community/tags.ftl b/Community1/tags.ftl similarity index 100% rename from community/tags.ftl rename to Community1/tags.ftl diff --git a/finding/archive-articles.ftl b/Finding1/archive-articles.ftl similarity index 100% rename from finding/archive-articles.ftl rename to Finding1/archive-articles.ftl diff --git a/finding/archives.ftl b/Finding1/archives.ftl similarity index 100% rename from finding/archives.ftl rename to Finding1/archives.ftl diff --git a/finding/article-list.ftl b/Finding1/article-list.ftl similarity index 100% rename from finding/article-list.ftl rename to Finding1/article-list.ftl diff --git a/finding/article.ftl b/Finding1/article.ftl similarity index 100% rename from finding/article.ftl rename to Finding1/article.ftl diff --git a/finding/author-articles.ftl b/Finding1/author-articles.ftl similarity index 100% rename from finding/author-articles.ftl rename to Finding1/author-articles.ftl diff --git a/finding/category-articles.ftl b/Finding1/category-articles.ftl similarity index 100% rename from finding/category-articles.ftl rename to Finding1/category-articles.ftl diff --git a/finding/category.ftl b/Finding1/category.ftl similarity index 100% rename from finding/category.ftl rename to Finding1/category.ftl diff --git a/finding/common-comment.ftl b/Finding1/common-comment.ftl similarity index 100% rename from finding/common-comment.ftl rename to Finding1/common-comment.ftl diff --git a/finding/css/finding.css b/Finding1/css/Finding.css similarity index 100% rename from finding/css/finding.css rename to Finding1/css/Finding.css diff --git a/finding/css/finding.min.css b/Finding1/css/Finding.min.css similarity index 100% rename from finding/css/finding.min.css rename to Finding1/css/Finding.min.css diff --git a/finding/css/fonts/icomoon.eot b/Finding1/css/fonts/icomoon.eot similarity index 100% rename from finding/css/fonts/icomoon.eot rename to Finding1/css/fonts/icomoon.eot diff --git a/finding/css/fonts/icomoon.svg b/Finding1/css/fonts/icomoon.svg similarity index 100% rename from finding/css/fonts/icomoon.svg rename to Finding1/css/fonts/icomoon.svg diff --git a/finding/css/fonts/icomoon.ttf b/Finding1/css/fonts/icomoon.ttf similarity index 100% rename from finding/css/fonts/icomoon.ttf rename to Finding1/css/fonts/icomoon.ttf diff --git a/finding/css/fonts/icomoon.woff b/Finding1/css/fonts/icomoon.woff similarity index 100% rename from finding/css/fonts/icomoon.woff rename to Finding1/css/fonts/icomoon.woff diff --git a/finding/css/fonts/selection.json b/Finding1/css/fonts/selection.json similarity index 100% rename from finding/css/fonts/selection.json rename to Finding1/css/fonts/selection.json diff --git a/finding/dynamic.ftl b/Finding1/dynamic.ftl similarity index 100% rename from finding/dynamic.ftl rename to Finding1/dynamic.ftl diff --git a/finding/footer.ftl b/Finding1/footer.ftl similarity index 100% rename from finding/footer.ftl rename to Finding1/footer.ftl diff --git a/finding/header.ftl b/Finding1/header.ftl similarity index 100% rename from finding/header.ftl rename to Finding1/header.ftl diff --git a/finding/images/header-bg.jpg b/Finding1/images/header-bg.jpg similarity index 100% rename from finding/images/header-bg.jpg rename to Finding1/images/header-bg.jpg diff --git a/finding/images/next.jpg b/Finding1/images/next.jpg similarity index 100% rename from finding/images/next.jpg rename to Finding1/images/next.jpg diff --git a/finding/images/preview.jpg b/Finding1/images/preview.jpg similarity index 100% rename from finding/images/preview.jpg rename to Finding1/images/preview.jpg diff --git a/finding/index.ftl b/Finding1/index.ftl similarity index 100% rename from finding/index.ftl rename to Finding1/index.ftl diff --git a/finding/js/finding.js b/Finding1/js/Finding.js similarity index 100% rename from finding/js/finding.js rename to Finding1/js/Finding.js diff --git a/finding/js/finding.min.js b/Finding1/js/Finding.min.js similarity index 100% rename from finding/js/finding.min.js rename to Finding1/js/Finding.min.js diff --git a/finding/lang/lang_en_US.properties b/Finding1/lang/lang_en_US.properties similarity index 100% rename from finding/lang/lang_en_US.properties rename to Finding1/lang/lang_en_US.properties diff --git a/finding/lang/lang_zh_CN.properties b/Finding1/lang/lang_zh_CN.properties similarity index 100% rename from finding/lang/lang_zh_CN.properties rename to Finding1/lang/lang_zh_CN.properties diff --git a/finding/links.ftl b/Finding1/links.ftl similarity index 100% rename from finding/links.ftl rename to Finding1/links.ftl diff --git a/finding/macro-comments.ftl b/Finding1/macro-comments.ftl similarity index 100% rename from finding/macro-comments.ftl rename to Finding1/macro-comments.ftl diff --git a/finding/macro-head.ftl b/Finding1/macro-head.ftl similarity index 100% rename from finding/macro-head.ftl rename to Finding1/macro-head.ftl diff --git a/finding/page.ftl b/Finding1/page.ftl similarity index 100% rename from finding/page.ftl rename to Finding1/page.ftl diff --git a/finding/preview.png b/Finding1/preview.png similarity index 100% rename from finding/preview.png rename to Finding1/preview.png diff --git a/finding/side.ftl b/Finding1/side.ftl similarity index 100% rename from finding/side.ftl rename to Finding1/side.ftl diff --git a/finding/skin.properties b/Finding1/skin.properties similarity index 100% rename from finding/skin.properties rename to Finding1/skin.properties diff --git a/finding/tag-articles.ftl b/Finding1/tag-articles.ftl similarity index 100% rename from finding/tag-articles.ftl rename to Finding1/tag-articles.ftl diff --git a/finding/tags.ftl b/Finding1/tags.ftl similarity index 100% rename from finding/tags.ftl rename to Finding1/tags.ftl diff --git a/neoease/archive-articles.ftl b/NeoEase1/archive-articles.ftl similarity index 100% rename from neoease/archive-articles.ftl rename to NeoEase1/archive-articles.ftl diff --git a/neoease/article-list.ftl b/NeoEase1/article-list.ftl similarity index 100% rename from neoease/article-list.ftl rename to NeoEase1/article-list.ftl diff --git a/neoease/article.ftl b/NeoEase1/article.ftl similarity index 100% rename from neoease/article.ftl rename to NeoEase1/article.ftl diff --git a/neoease/author-articles.ftl b/NeoEase1/author-articles.ftl similarity index 100% rename from neoease/author-articles.ftl rename to NeoEase1/author-articles.ftl diff --git a/neoease/category-articles.ftl b/NeoEase1/category-articles.ftl similarity index 100% rename from neoease/category-articles.ftl rename to NeoEase1/category-articles.ftl diff --git a/neoease/common-comment.ftl b/NeoEase1/common-comment.ftl similarity index 100% rename from neoease/common-comment.ftl rename to NeoEase1/common-comment.ftl diff --git a/neoease/css/neoease.css b/NeoEase1/css/NeoEase.css similarity index 94% rename from neoease/css/neoease.css rename to NeoEase1/css/NeoEase.css index cd5cf62..6892bdd 100644 --- a/neoease/css/neoease.css +++ b/NeoEase1/css/NeoEase.css @@ -1,912 +1,912 @@ -/** - * Copyright (c) 2010-2017, b3log.org & hacpai.com - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * skin neoease style - * - * @author Liyuan Li - * @version 1.0.2.9, Aug 30, 2017 -*/ -/* start base */ -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; -} - -.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; -} - -.em-br { - line-height: 24px; -} -/* end base */ - -/* start ico */ -.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; -} -/* end ico */ - -/* start frame */ -.wrapper { - margin: 0 auto; - width: 960px; -} - -.body { - border-top: 2px solid #DDD; -} - -.main { - float: left; - margin: 16px 0 50px; - overflow: hidden; - width: 667px; -} -/* end frame */ - -/* start header */ -.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; -} - -#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; -} -/* end header */ - -/* start footer */ -.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; -} -/* end footer*/ - -/* start side */ -.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; -} -/* end side */ - -/* start article list */ -.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; -} - -.article-body { - line-height: 145%; - overflow: hidden; - word-wrap: break-word; -} - -.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 ol, .article-body ul { - margin-left: 40px; -} - -.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; -} - -.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; -} -/* end article list */ - -/* start article */ -.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 .article-body { - 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; -} -/* end article*/ - -/* start tags */ -#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; -} -/* end tags */ - -/* start others */ -.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; -} -/* end others */ +/** + * Copyright (c) 2010-2017, b3log.org & hacpai.com + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/** + * skin neoease style + * + * @author Liyuan Li + * @version 1.0.2.9, Aug 30, 2017 +*/ +/* start base */ +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; +} + +.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; +} + +.em-br { + line-height: 24px; +} +/* end base */ + +/* start ico */ +.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; +} +/* end ico */ + +/* start frame */ +.wrapper { + margin: 0 auto; + width: 960px; +} + +.body { + border-top: 2px solid #DDD; +} + +.main { + float: left; + margin: 16px 0 50px; + overflow: hidden; + width: 667px; +} +/* end frame */ + +/* start header */ +.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; +} + +#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; +} +/* end header */ + +/* start footer */ +.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; +} +/* end footer*/ + +/* start side */ +.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; +} +/* end side */ + +/* start article list */ +.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; +} + +.article-body { + line-height: 145%; + overflow: hidden; + word-wrap: break-word; +} + +.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 ol, .article-body ul { + margin-left: 40px; +} + +.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; +} + +.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; +} +/* end article list */ + +/* start article */ +.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 .article-body { + 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; +} +/* end article*/ + +/* start tags */ +#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; +} +/* end tags */ + +/* start others */ +.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; +} +/* end others */ diff --git a/neoease/css/neoease.min.css b/NeoEase1/css/NeoEase.min.css similarity index 100% rename from neoease/css/neoease.min.css rename to NeoEase1/css/NeoEase.min.css diff --git a/neoease/footer.ftl b/NeoEase1/footer.ftl similarity index 97% rename from neoease/footer.ftl rename to NeoEase1/footer.ftl index 5b15447..16b5888 100644 --- a/neoease/footer.ftl +++ b/NeoEase1/footer.ftl @@ -1,44 +1,44 @@ -
-
-
- © ${year} - ${blogTitle}${footerContent}
- Powered by B3log 开源 • Solo ${version}   - Theme by NeoEase - & Vanessa. -
-
-
-
-
TOP
- - - - -${plugins} +
+
+
+ © ${year} - ${blogTitle}${footerContent}
+ Powered by B3log 开源 • Solo ${version}   + Theme by NeoEase + & Vanessa. +
+
+
+
+
TOP
+ + + + +${plugins} diff --git a/neoease/header.ftl b/NeoEase1/header.ftl similarity index 97% rename from neoease/header.ftl rename to NeoEase1/header.ftl index 970cbb2..5073bbd 100644 --- a/neoease/header.ftl +++ b/NeoEase1/header.ftl @@ -1,60 +1,60 @@ -
-
-
-

- - ${blogTitle} - -

- ${blogSubtitle} -
- <#-- -
- - - -
- --> -
-
-
-
-
- -
- -
- ${viewCount1Label} - - ${statistic.statisticBlogViewCount} - -    - ${articleCount1Label} - - ${statistic.statisticPublishedBlogArticleCount} - -    - ${commentCount1Label} - - ${statistic.statisticPublishedBlogCommentCount} - -
-
-
-
-
+
+
+
+

+ + ${blogTitle} + +

+ ${blogSubtitle} +
+ <#-- +
+ + + +
+ --> +
+
+
+
+
+ +
+ +
+ ${viewCount1Label} + + ${statistic.statisticBlogViewCount} + +    + ${articleCount1Label} + + ${statistic.statisticPublishedBlogArticleCount} + +    + ${commentCount1Label} + + ${statistic.statisticPublishedBlogCommentCount} + +
+
+
+
+
diff --git a/neoease/images/404.png b/NeoEase1/images/404.png similarity index 100% rename from neoease/images/404.png rename to NeoEase1/images/404.png diff --git a/neoease/images/ajax-loader.gif b/NeoEase1/images/ajax-loader.gif similarity index 100% rename from neoease/images/ajax-loader.gif rename to NeoEase1/images/ajax-loader.gif diff --git a/neoease/images/icons.png b/NeoEase1/images/icons.png similarity index 100% rename from neoease/images/icons.png rename to NeoEase1/images/icons.png diff --git a/neoease/index.ftl b/NeoEase1/index.ftl similarity index 100% rename from neoease/index.ftl rename to NeoEase1/index.ftl diff --git a/neoease/js/neoease.js b/NeoEase1/js/NeoEase.js similarity index 100% rename from neoease/js/neoease.js rename to NeoEase1/js/NeoEase.js diff --git a/neoease/js/neoease.min.js b/NeoEase1/js/NeoEase.min.js similarity index 100% rename from neoease/js/neoease.min.js rename to NeoEase1/js/NeoEase.min.js diff --git a/neoease/lang/lang_en_US.properties b/NeoEase1/lang/lang_en_US.properties similarity index 100% rename from neoease/lang/lang_en_US.properties rename to NeoEase1/lang/lang_en_US.properties diff --git a/neoease/lang/lang_zh_CN.properties b/NeoEase1/lang/lang_zh_CN.properties similarity index 100% rename from neoease/lang/lang_zh_CN.properties rename to NeoEase1/lang/lang_zh_CN.properties diff --git a/neoease/macro-comments.ftl b/NeoEase1/macro-comments.ftl similarity index 97% rename from neoease/macro-comments.ftl rename to NeoEase1/macro-comments.ftl index 4f06375..d66ff1b 100644 --- a/neoease/macro-comments.ftl +++ b/NeoEase1/macro-comments.ftl @@ -1,116 +1,116 @@ -<#macro comments commentList article> -
- - -
-
- <#list commentList as comment> - <#include "common-comment.ftl"/> - -
-<#if article.commentable> -
-

${postCommentsLabel}

- - - <#if !isLoggedIn> - - - - - - - - - - - - - - - - - <#if !isLoggedIn> - - - - - - - - -
- - -
- - -
- - -
- - - - - - - - - - - - - - - -
- -
- - validate -
- - -
-
- - - -<#macro comment_script oId> - - +<#macro comments commentList article> +
+ + +
+
+ <#list commentList as comment> + <#include "common-comment.ftl"/> + +
+<#if article.commentable> +
+

${postCommentsLabel}

+ + + <#if !isLoggedIn> + + + + + + + + + + + + + + + + + <#if !isLoggedIn> + + + + + + + + +
+ + +
+ + +
+ + +
+ + + + + + + + + + + + + + + +
+ +
+ + validate +
+ + +
+
+ + + +<#macro comment_script oId> + + \ No newline at end of file diff --git a/neoease/macro-head.ftl b/NeoEase1/macro-head.ftl similarity index 100% rename from neoease/macro-head.ftl rename to NeoEase1/macro-head.ftl diff --git a/neoease/page.ftl b/NeoEase1/page.ftl similarity index 100% rename from neoease/page.ftl rename to NeoEase1/page.ftl diff --git a/neoease/preview.png b/NeoEase1/preview.png similarity index 100% rename from neoease/preview.png rename to NeoEase1/preview.png diff --git a/neoease/side.ftl b/NeoEase1/side.ftl similarity index 100% rename from neoease/side.ftl rename to NeoEase1/side.ftl diff --git a/neoease/skin.properties b/NeoEase1/skin.properties similarity index 100% rename from neoease/skin.properties rename to NeoEase1/skin.properties diff --git a/neoease/tag-articles.ftl b/NeoEase1/tag-articles.ftl similarity index 100% rename from neoease/tag-articles.ftl rename to NeoEase1/tag-articles.ftl diff --git a/neoease/tags.ftl b/NeoEase1/tags.ftl similarity index 100% rename from neoease/tags.ftl rename to NeoEase1/tags.ftl diff --git a/skin-preview/andrea.jpg b/skin-preview/Andrea.jpg similarity index 100% rename from skin-preview/andrea.jpg rename to skin-preview/Andrea.jpg diff --git a/skin-preview/bruce.jpg b/skin-preview/Bruce.jpg similarity index 100% rename from skin-preview/bruce.jpg rename to skin-preview/Bruce.jpg diff --git a/skin-preview/community.jpg b/skin-preview/Community.jpg similarity index 100% rename from skin-preview/community.jpg rename to skin-preview/Community.jpg diff --git a/skin-preview/finding.jpg b/skin-preview/Finding.jpg similarity index 100% rename from skin-preview/finding.jpg rename to skin-preview/Finding.jpg diff --git a/skin-preview/neoease.jpg b/skin-preview/NeoEase.jpg similarity index 100% rename from skin-preview/neoease.jpg rename to skin-preview/NeoEase.jpg