diff --git a/owmx-3.0/archives.ftl b/owmx-3.0/archives.ftl
new file mode 100644
index 0000000..f58547e
--- /dev/null
+++ b/owmx-3.0/archives.ftl
@@ -0,0 +1,61 @@
+<#--
+
+ Solo - A small and beautiful blogging system written in Java.
+ Copyright (c) 2010-2019, b3log.org & hacpai.com
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see
+ <#include "header.ftl">
+
+
+ <#if 0 != archiveDates?size>
+
+
+
+ <#include "side.ftl">
+
+
+ <#include "footer.ftl">
+
Liyuan Li
- * @version 2.1.0.1, Mar 16, 2019
+ * @version 2.2.0.0, Mar 22, 2019
*/
-
+@import "../../../scss/toc";
@import "vditor/src/assets/scss/classic";
+
.left {
- float: left;
+ float: left;
}
.right {
- float: right;
+ float: right;
}
.clear:before,
.clear:after {
- display: table;
- content: "";
+ display: table;
+ content: "";
}
.clear:after {
- clear: both;
+ clear: both;
}
+
.none {
- display: none;
+ display: none;
}
+
/* Reset */
header, footer, article, nav, section, aside, time, hgroup {
- display : block;
+ display: block;
}
+
html, body, header, footer, article, nav, section, aside, time, h1, h2, h3, p, a, ul, li, dl, dd, dt, table, thead, tfoot, tbody, th, tr, td {
- border : 0;
- font : 12px/22px 'Verdana', 'sans-serif';
- margin : 0;
- outline : 0;
- padding : 0;
+ border: 0;
+ font: 12px/22px 'Verdana', 'sans-serif';
+ margin: 0;
+ outline: 0;
+ padding: 0;
}
/* BASICS */
BODY {
- background : #DDD;
- margin : 0px 0 0 0;
- color : #444;
+ background: #DDD;
+ margin: 0px 0 0 0;
+ color: #444;
}
img {
- max-width: 100%;
- vertical-align: middle;
- border: 0;
- height: auto;
- overflow: hidden;
- font-size: 12px;
+ max-width: 100%;
+ vertical-align: middle;
+ border: 0;
+ height: auto;
+ overflow: hidden;
+ font-size: 12px;
}
-A, A:LINK, A:ACTIVE, A:VISITED{
- color : #016f93;
- text-decoration : none;
+A, A:LINK, A:ACTIVE, A:VISITED {
+ color: #016f93;
+ text-decoration: none;
}
+
A:HOVER {
- color : #DB0202;
+ color: #DB0202;
}
+
a.selected {
- font-weight: bold;
- color: #000000;
+ font-weight: bold;
+ color: #000000;
}
H1, H3, H4, H5, H6 {
- background : url(../images/ai4.png) no-repeat 0 7px;
- border-bottom : 1px solid #CCC;
- color : #666;
- font-weight : bold;
- margin : 0 0 10px;
- padding : 0 0 0 25px;
+ background: url(../images/ai4.png) no-repeat 0 7px;
+ border-bottom: 1px solid #CCC;
+ color: #666;
+ font-weight: bold;
+ margin: 0 0 10px;
+ padding: 0 0 0 25px;
}
+
H1 {
- background : url(../images/ai4.png) no-repeat 0 6px;
- font-size : 15px;
+ background: url(../images/ai4.png) no-repeat 0 6px;
+ font-size: 15px;
}
-H1 a{
- font-weight : bold;
- font-size : 15px;
+
+H1 a {
+ font-weight: bold;
+ font-size: 15px;
}
+
H2 {
- font-size : 14px;
- margin : 0 0 20px 0;
+ font-size: 14px;
+ margin: 0 0 20px 0;
}
+
H3 {
- background : url(../images/ai5.png) no-repeat 0 7px;
+ background: url(../images/ai5.png) no-repeat 0 7px;
}
+
H3, H4, H5, H6 {
- font-size : 13px;
+ font-size: 13px;
}
h4 {
- background-position: 0 5px;
+ background-position: 0 5px;
}
sup {
- color: #444;
- top : -4px;
+ color: #444;
+ top: -4px;
}
/* Header */
header {
- border-radius : 4px;
- background : #0098CC url(../images/hd.jpg) no-repeat top left;
- height : 200px;
- margin : 0 0 10px 0;
- padding : 10px 10px;
- position : relative;
+ border-radius: 4px;
+ background: #0098CC url(../images/hd.jpg) no-repeat top left;
+ height: 200px;
+ margin: 0 0 10px 0;
+ padding: 10px 10px;
+ position: relative;
}
-header a:link, header a:active, header a:visited{
- font-weight : bold;
- color : #FFF;
- font-size : 16px;
+
+header a:link, header a:active, header a:visited {
+ font-weight: bold;
+ color: #FFF;
+ font-size: 16px;
}
+
header a:hover {
- color : #FFF;
+ color: #FFF;
}
-header p {
- border-radius : 4px;
- background : #FFF;
- bottom : 20px;
- color : #000;
- font-weight : bold;
- opacity : 0.5;
- padding : 10px;
- position : absolute;
- right : 20px;
- width : 400px;
+
+header .user__sites {
+ border-radius: 4px;
+ background: #FFF;
+ bottom: 20px;
+ color: #000;
+ font-weight: bold;
+ opacity: 0.5;
+ padding: 10px;
+ position: absolute;
+ right: 20px;
+ width: 396px;
+ .user__site {
+ float: left;
+ margin-right: 8px;
+ height: 20px;
+ color: #016f93;
+ &:hover {
+ color: #DB0202;
+ }
+ svg {
+ height: 20px;
+ width: 20px;
+ fill: currentColor;
+ }
+ }
}
/* Article */
article {
- border-radius : 4px;
- background : #FFF;
- border: 1px solid #CCC;
- float : right;
- height : auto;
- padding : 20px;
- width : 550px;
+ border-radius: 4px;
+ background: #FFF;
+ border: 1px solid #CCC;
+ float: right;
+ height: auto;
+ padding: 20px;
+ width: 550px;
}
-article h1{
- color : #666;
- font-weight : bold;
- font-size : 15px;
+
+article h1 {
+ color: #666;
+ font-weight: bold;
+ font-size: 15px;
}
+
/* Highlighted Paragraphs */
.highlight-1, .highlight-2, .highlight-3 {
- -moz-border-radius : 4px;
- -webkit-border-radius : 4px;
- padding : 5px 10px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ padding: 5px 10px;
}
+
.highlight-1 {
- background : #FFCCCC;
- border : 1px dotted #FF9966;
+ background: #FFCCCC;
+ border: 1px dotted #FF9966;
}
+
.highlight-2 {
- background : #FFFF99;
- border : 1px dotted #FFCC33;
+ background: #FFFF99;
+ border: 1px dotted #FFCC33;
}
+
.highlight-3 {
- background : #CCFF99;
- border : 1px dotted #CCCC33;
+ background: #CCFF99;
+ border: 1px dotted #CCCC33;
}
/* Citations & Quotes */
cite {
- border-left: 2px solid #0098CC;
- color : #666;
- font-size : 12px;
- font-style : normal;
- font-weight : bold;
- margin : 0;
- padding : 5px 10px;
+ border-left: 2px solid #0098CC;
+ color: #666;
+ font-size: 12px;
+ font-style: normal;
+ font-weight: bold;
+ margin: 0;
+ padding: 5px 10px;
}
blockquote {
- border-left: 2px solid #0098CC;
- color : #666;
- margin : 0 0 20px 0;
- padding : 5px 10px;
+ border-left: 2px solid #0098CC;
+ color: #666;
+ margin: 0 0 20px 0;
+ padding: 5px 10px;
}
/* Pre & Code */
pre {
- color : #333;
- font-size : 10px;
- line-height : 15px; /*--Height of each line of code--*/
- overflow : hidden; /*--If the Code exceeds the width, put "auto" and scrolling is available--*/
- overflow-y : hidden; /*--Hides vertical scroll created by IE--*/
+ color: #333;
+ font-size: 10px;
+ line-height: 15px; /*--Height of each line of code--*/
+ overflow: hidden; /*--If the Code exceeds the width, put "auto" and scrolling is available--*/
+ overflow-y: hidden; /*--Hides vertical scroll created by IE--*/
}
+
pre code {
- background : #EEE;
- border-left : 2px solid #0098CC;
- margin : 0 0 10px 0;
- padding : 5px;
- display : block;
+ background: #EEE;
+ border-left: 2px solid #0098CC;
+ margin: 0 0 10px 0;
+ padding: 5px;
+ display: block;
}
/* Calendar */
dl.vevent {
- margin : -20px 0 20px 0;
- padding : 0;
+ margin: -20px 0 20px 0;
+ padding: 0;
}
+
.vevent dt {
- font-size : 10px;
- position : relative;
- left : 0;
- top : 22px;
- font-weight : bold;
+ font-size: 10px;
+ position: relative;
+ left: 0;
+ top: 22px;
+ font-weight: bold;
}
-.vevent dd
-{
- border-left : 2px solid #0098CC;
- font-size : 11px;
- margin : 0 0 0 80px;
- padding : 0 0 0 10px;
+
+.vevent dd {
+ border-left: 2px solid #0098CC;
+ font-size: 11px;
+ margin: 0 0 0 80px;
+ padding: 0 0 0 10px;
}
+
dd.summary {
- font-weight : bold;
+ font-weight: bold;
}
+
.vevent a {
- font-size : 11px;
+ font-size: 11px;
}
/* Forms */
article form {
- border-radius: 4px;
- background : #DDD;
- margin : 0 0 20px;
- padding : 10px;
+ border-radius: 4px;
+ background: #DDD;
+ margin: 0 0 20px;
+ padding: 10px;
}
+
article label {
- color : #666;
- display : block;
- font-size : 10px;
- font-weight : bold;
- margin : 0 0 0 2px;
+ color: #666;
+ display: block;
+ font-size: 10px;
+ font-weight: bold;
+ margin: 0 0 0 2px;
}
+
article input, article textarea {
- border-radius : 4px;
- border : 1px solid #CCC;
- font-size : 11px;
- padding : 4px 5px;
- width: 100%;
- box-sizing: border-box;
+ border-radius: 4px;
+ border: 1px solid #CCC;
+ font-size: 11px;
+ padding: 4px 5px;
+ width: 100%;
+ box-sizing: border-box;
}
/* Lists */
article ul, aside ul {
- list-style : none;
- margin : 0 0 20px 0;
+ list-style: none;
+ margin: 0 0 20px 0;
}
+
article ul {
- margin : 0 0 20px 23px;
+ margin: 0 0 20px 23px;
}
+
article ul li {
- background : url(../images/ai2.png) no-repeat 0 8px;
- padding : 0 0 0 17px;
+ background: url(../images/ai2.png) no-repeat 0 8px;
+ padding: 0 0 0 17px;
}
/* Sidebar */
aside {
- background : #EEE;
- float : left;
- margin : 0 0 20px 0;
- width : 200px;
- white-space:normal;
+ background: #EEE;
+ float: left;
+ margin: 0 0 20px 0;
+ width: 200px;
+ white-space: normal;
}
-aside ul.aside-comments img{
- border-radius : 4px;
- width:32px;height:32px;
- border:1px solid #999999;
- padding:1px;
- margin-top:5px;
- margin-right:5px;
+
+aside ul.aside-comments img {
+ border-radius: 4px;
+ width: 32px;
+ height: 32px;
+ border: 1px solid #999999;
+ padding: 1px;
+ margin-top: 5px;
+ margin-right: 5px;
}
-aside ul.aside-comments a{
- font-weight:bold;
+
+aside ul.aside-comments a {
+ font-weight: bold;
}
-aside ul.aside-comments .side-comment{
- color: #555555;
- font-weight: normal;
- overflow: hidden;
- white-space: nowrap;
- width: 158px;
- height: 18px;
+
+aside ul.aside-comments .side-comment {
+ color: #555555;
+ font-weight: normal;
+ overflow: hidden;
+ white-space: nowrap;
+ width: 158px;
+ height: 18px;
}
-aside ul.aside-comments div.left>div>div {
- display: none;
+
+aside ul.aside-comments div.left > div > div {
+ display: none;
}
-aside ul.aside-comments .side-comment img{
- border:0px;height:16px;width:16px;padding:0px;margin-right: 0px;
- margin-top: 0;
+
+aside ul.aside-comments .side-comment img {
+ border: 0px;
+ height: 16px;
+ width: 16px;
+ padding: 0px;
+ margin-right: 0px;
+ margin-top: 0;
}
+
aside ul.aside-comments li {
- padding:2px 0;
+ padding: 2px 0;
}
-aside ul.aside-comments li div{
- width:158px;
+
+aside ul.aside-comments li div {
+ width: 158px;
}
+
aside ul.aside-comments li div.left div {
- height: 18px;
- line-height: 18px;
- overflow: hidden;
- -o-text-overflow: ellipsis;
- text-overflow: ellipsis;
+ height: 18px;
+ line-height: 18px;
+ overflow: hidden;
+ -o-text-overflow: ellipsis;
+ text-overflow: ellipsis;
+}
+
+aside ul.navi-tags li {
+ padding-left: 0px;
+ background-image: none;
+}
+
+aside ul.navi-tags li img {
+ margin-bottom: 3px;
+ padding-right: 6px;
+ height: 16px;
+ width: 16px;
}
-aside ul.navi-tags li{padding-left:0px;background-image:none;}
-aside ul.navi-tags li img{ margin-bottom:3px;padding-right:6px;height:16px;width:16px;}
#mostViewCountArticles li, #mostCommentArticles li {
- overflow: hidden;
- text-overflow: ellipsis;
- -o-text-overflow: ellipsis;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ -o-text-overflow: ellipsis;
}
#mostViewCountArticles a, #mostCommentArticles a {
- white-space: nowrap;
+ white-space: nowrap;
}
+
/* Search Box */
.s {
- border-radius : 4px;
- margin : 0 0 20px 0;
- padding : 10px;
- width : 179px;
+ border-radius: 4px;
+ margin: 0 0 20px 0;
+ padding: 10px;
+ width: 179px;
}
+
.s input {
- border-radius: 4px;
- border : 1px solid #AAA;
- color : #999;
- font-size : 11px;
- padding : 4px 5px;
- width : 168px;
+ border-radius: 4px;
+ border: 1px solid #AAA;
+ color: #999;
+ font-size: 11px;
+ padding: 4px 5px;
+ width: 168px;
}
/* Navigation & Menu */
nav ul {
- list-style : none;
+ list-style: none;
}
+
nav li {
- background : url(../images/ai1.png) no-repeat 0 8px;
- padding : 0 0 0 15px;
+ background: url(../images/ai1.png) no-repeat 0 8px;
+ padding: 0 0 0 15px;
}
+
nav li ul, aside li ul li ul {
- margin : 0;
+ margin: 0;
}
+
nav li li a {
- font-size : 11px;
+ font-size: 11px;
}
+
nav li li li a {
- font-size : 10px;
+ font-size: 10px;
}
+
nav li li li, aside li.active li li {
- background : url(../images/ai8.png) no-repeat 0 10px;
+ background: url(../images/ai8.png) no-repeat 0 10px;
}
+
nav li.active, aside li.active li {
- background : url(../images/ai2.png) no-repeat 0 8px;
+ background: url(../images/ai2.png) no-repeat 0 8px;
}
nav .page-icon {
- float: left;
- height: 14px;
- width: 14px;
- margin: 4px 4px 0 0;
+ float: left;
+ height: 14px;
+ width: 14px;
+ margin: 4px 4px 0 0;
}
+
/* Gallery */
-.gallery {
- list-style : none;
- margin : 0 0 10px;
+.gallery {
+ list-style: none;
+ margin: 0 0 10px;
}
+
.gallery li {
- display: inline;
- margin : 0 15px 0 0;
+ display: inline;
+ margin: 0 15px 0 0;
}
+
.gallery a img {
- border : 1px solid #999;
- height : 50px;
- opacity: 0.8;
- padding : 1px;
- width : 50px;
+ border: 1px solid #999;
+ height: 50px;
+ opacity: 0.8;
+ padding: 1px;
+ width: 50px;
}
+
.gallery li:last-child {
- margin : 0 0 10px 0;
+ margin: 0 0 10px 0;
}
-.gallery a img:hover{
- opacity: 1;
+
+.gallery a img:hover {
+ opacity: 1;
}
/* Ad Space */
.adspace {
- border-radius : 4px;
- box-shadow : 0 2px 2px rgba(0,0,0,0.3);
- background : #EEE;
- height : 100%;
- margin : 0 0 20px 0;
- padding : 5px 10px;
- text-align : center;
- width : 178px;
+ border-radius: 4px;
+ box-shadow: 0 2px 2px rgba(0, 0, 0, 0.3);
+ background: #EEE;
+ height: 100%;
+ margin: 0 0 20px 0;
+ padding: 5px 10px;
+ text-align: center;
+ width: 178px;
}
+
.adspace a img {
- border : none;
+ border: none;
}
/* Tag Cloud */
#tagcloud {
- overflow : hidden;
- width : 200px;
+ overflow: hidden;
+ width: 200px;
}
+
#tagcloud li {
- display : inline;
- margin : 0 10px 0 0;
+ display: inline;
+ margin: 0 10px 0 0;
}
+
.tagcloudsize-1 a {
- font-size : 14px;
+ font-size: 14px;
}
+
.tagcloudsize-2 a {
- font-size : 16px;
+ font-size: 16px;
}
+
.tagcloudsize-3 a {
- font-size : 18px;
+ font-size: 18px;
}
/* Footer */
footer {
- border-top : 1px dotted #B5B3A9;
- clear : both;
- margin : 20px 0;
-}
-footer a, footer p {
- color : #666;
- display : inline;
- font-size : 12px;
-}
-footer div{
- background:url("../images/icons.gif") no-repeat scroll 0 -304px transparent;
- color:#2A2A2A;
- cursor:pointer;
- line-height:18px;
- margin:5px 17px 0 0;
- padding-left:16px;
- width:22px;
- float : right;
- white-space :nowrap;
-}
-footer span{
- margin:0px;
-}
-footer img{
- height : 28px;
+ border-top: 1px dotted #B5B3A9;
+ clear: both;
+ margin: 20px 0;
+ line-height: 30px;
}
+footer a, footer p {
+ color: #666;
+ display: inline;
+ font-size: 12px;
+}
+
+footer div {
+ background: url("../images/icons.gif") no-repeat scroll 0 -304px transparent;
+ color: #2A2A2A;
+ cursor: pointer;
+ line-height: 18px;
+ margin: 5px 17px 0 0;
+ padding-left: 16px;
+ width: 22px;
+ float: right;
+ white-space: nowrap;
+}
+
+footer span {
+ margin: 0px;
+}
+
+footer img {
+ height: 28px;
+}
/* Comments */
-.comments{position:relative;background:none repeat scroll 0 0 #FCFCFC;border-bottom:1px solid #CCCCCC;border-top:1px solid #CCCCCC;margin:15px -15px;padding:0 15px 15px;}
-.comment-title{background-color:#E3E9FF;border-top:1px solid #3366CC;padding:3px 12px 3px 12px;position:relative;}
+.comments {
+ position: relative;
+ background: none repeat scroll 0 0 #FCFCFC;
+ border-bottom: 1px solid #CCCCCC;
+ border-top: 1px solid #CCCCCC;
+ margin: 15px -15px;
+ padding: 0 15px 15px;
+}
+
+.comment-title {
+ background-color: #E3E9FF;
+ border-top: 1px solid #3366CC;
+ padding: 3px 12px 3px 12px;
+ position: relative;
+}
+
.comment-body-ref {
- border-radius: 6px;
- background-color: #FFFFFF;
- border: 1px solid #CCCCCC;
- opacity: 0.9;
- padding: 6px;
- position: absolute;
- width: 387px;
- left: 174px;
+ border-radius: 6px;
+ background-color: #FFFFFF;
+ border: 1px solid #CCCCCC;
+ opacity: 0.9;
+ padding: 6px;
+ position: absolute;
+ width: 387px;
+ left: 174px;
}
.comment-body-ref .comment-author {
- width: 67px;
+ width: 67px;
}
.comment-body-ref .comment-info {
- width: 300px;
- border-width: 0px;
-}
-.comment-body{margin-top:15px;}
-.comment-author{float:left;text-align:center;width:81px;}
-.comment-author div{margin-top:10px;padding-right:14px;background:url("../images/commentpoint.png") no-repeat scroll 100% 33% transparent;}
-.comment-author img{border-radius : 4px;border:1px solid #999999;padding:1px;width:32px;height:32px;}
-.comment-author a{white-space: nowrap;margin-right:14px;font-weight:bold;}
-.comment-info{border-radius : 6px;width : 440px;padding : 5px 10px;background : #EDEFF0;border : 1px dotted #EDEFF0;}
-.comment-content{word-wrap:break-word;overflow: hidden;background:url("../images/comment.gif") no-repeat scroll 100% 100% transparent;line-height:145%;margin:0 -15px;padding:9px 15px 10px;font-size:12px;}
-.comment-form img{cursor:pointer;}
-.comment-form input, .comment-form textarea{height: 16px;outline:none;font-family:Helvetica,Arial,sans-serif;color:#555555;background:url("../images/textfield.gif") repeat-x scroll 50% 0 #FFFFFF;border:1px solid #A6A6A6;padding:2px 1px;width:200px;}
-.comment-form textarea{width:541px;font-size: 12px;height: auto;}
-.comment-form button{background:none repeat scroll 0 0 #B4D666;border-color:#B4D666 #81B840 #81B840 #B4D666;border-style:solid;border-width:1px;color:#2970A6;font-size:12px;padding:0px 6px;height:22px;line-height:22px;border-radius:0px;}
-.comment-form button:hover{background:none repeat scroll 0 0 #98C64C;border-color:#76B33A #98C64C #98C64C #76B33A;color:#074A7E;}
-.error-msg{color:#3366CC;}
+ width: 300px;
+ border-width: 0px;
+}
+
+.comment-body {
+ margin-top: 15px;
+}
+
+.comment-author {
+ float: left;
+ text-align: center;
+ width: 81px;
+}
+
+.comment-author div {
+ margin-top: 10px;
+ padding-right: 14px;
+ background: url("../images/commentpoint.png") no-repeat scroll 100% 33% transparent;
+}
+
+.comment-author img {
+ border-radius: 4px;
+ border: 1px solid #999999;
+ padding: 1px;
+ width: 32px;
+ height: 32px;
+}
+
+.comment-author a {
+ white-space: nowrap;
+ margin-right: 14px;
+ font-weight: bold;
+}
+
+.comment-info {
+ border-radius: 6px;
+ width: 440px;
+ padding: 5px 10px;
+ background: #EDEFF0;
+ border: 1px dotted #EDEFF0;
+}
+
+.comment-content {
+ word-wrap: break-word;
+ overflow: hidden;
+ background: url("../images/comment.gif") no-repeat scroll 100% 100% transparent;
+ line-height: 145%;
+ margin: 0 -15px;
+ padding: 9px 15px 10px;
+ font-size: 12px;
+}
+
+.comment-form img {
+ cursor: pointer;
+}
+
+.comment-form input, .comment-form textarea {
+ height: 16px;
+ outline: none;
+ font-family: Helvetica, Arial, sans-serif;
+ color: #555555;
+ background: url("../images/textfield.gif") repeat-x scroll 50% 0 #FFFFFF;
+ border: 1px solid #A6A6A6;
+ padding: 2px 1px;
+ width: 200px;
+}
+
+.comment-form textarea {
+ width: 541px;
+ font-size: 12px;
+ height: auto;
+}
+
+.comment-form button {
+ background: none repeat scroll 0 0 #B4D666;
+ border-color: #B4D666 #81B840 #81B840 #B4D666;
+ border-style: solid;
+ border-width: 1px;
+ color: #2970A6;
+ font-size: 12px;
+ padding: 0px 6px;
+ height: 22px;
+ line-height: 22px;
+ border-radius: 0px;
+}
+
+.comment-form button:hover {
+ background: none repeat scroll 0 0 #98C64C;
+ border-color: #76B33A #98C64C #98C64C #76B33A;
+ color: #074A7E;
+}
+
+.error-msg {
+ color: #3366CC;
+}
+
/* Wrappers */
#a, #b {
- margin : 0 auto;
- position : relative;
+ margin: 0 auto;
+ position: relative;
}
+
#a {
- border-radius : 4px;
- box-shadow : 0 2px 2px rgba(0,0,0,0.3);
- background : #EEE;
- margin : 15px auto;
- padding : 10px 10px 0 10px;
- width : 800px;
+ border-radius: 4px;
+ box-shadow: 0 2px 2px rgba(0, 0, 0, 0.3);
+ background: #EEE;
+ margin: 15px auto;
+ padding: 10px 10px 0 10px;
+ width: 800px;
}
+
#b {
- overflow : hidden;
+ overflow: hidden;
}
/* Shadow-Boxes*/
#c, .meta, .s, nav ul {
- border-radius : 4px;
- box-shadow : 0 2px 2px rgba(0,0,0,0.4);
- background : #CCC;
-}
-#c {
- margin : 0 0 20px 0;
- padding : 5px 10px;
- width : 178px;
-}
-#c p, #c a {
- font-size : 11px;
- line-height : 15px;
-}
-#c p {
- margin : 0 0 10px 0;
-}
-#c img {
- border-radius : 4px;
- float : left;
- margin : 4px 10px 2px 0;
-}
-.meta {
- margin: 10px 0 30px;
- padding: 2px 5px;
-}
-.meta p, .meta a {
- font-size : 10px;
- margin : 0;
-}
-nav ul {
- padding : 10px;
-}
-nav ul ul {
- border-radius : none;
- box-shadow : none;
+ border-radius: 4px;
+ background: rgb(221, 221, 221);
}
-.single_page {
- border-radius : 4px;
- box-shadow : 0 2px 2px rgba(0,0,0,0.2);
- background : #F2F7F8;
- padding : 10px;
- margin-bottom : 25px;
- width : 531px;
+#c {
+ margin: 0 0 20px 0;
+ padding: 5px 10px;
+ width: 178px;
+}
+
+#c p, #c a {
+ font-size: 11px;
+ line-height: 15px;
+}
+
+#c p {
+ margin: 0 0 10px 0;
+}
+
+#c img {
+ border-radius: 4px;
+ float: left;
+ margin: 4px 10px 2px 0;
+}
+
+.meta {
+ margin: 10px 0 30px;
+ padding: 2px 5px;
+}
+
+.meta p, .meta a {
+ font-size: 10px;
+ margin: 0;
+}
+
+nav ul {
+ padding: 10px;
+}
+
+nav ul ul {
+ border-radius: none;
+ box-shadow: none;
+}
+
+.single_page {
+ border-radius: 4px;
+ box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
+ background: #F2F7F8;
+ padding: 10px;
+ margin-bottom: 25px;
+ width: 531px;
}
/* Scrollbar */
::-webkit-scrollbar {
- width: 6px;
+ width: 6px;
}
+
::-webkit-scrollbar-track {
- background-color: #bbb;
+ background-color: #bbb;
}
+
::-webkit-scrollbar-thumb {
- background-color: #eee;
+ background-color: #eee;
}
+
::-webkit-scrollbar-thumb:hover {
- background-color: #888;
+ background-color: #888;
}
diff --git a/owmx-3.0/header.ftl b/owmx-3.0/header.ftl
index c368c3e..0c96ab2 100644
--- a/owmx-3.0/header.ftl
+++ b/owmx-3.0/header.ftl
@@ -19,5 +19,9 @@
-->
\ No newline at end of file
diff --git a/owmx-3.0/side.ftl b/owmx-3.0/side.ftl
index e32fc7c..565a5a5 100644
--- a/owmx-3.0/side.ftl
+++ b/owmx-3.0/side.ftl
@@ -60,118 +60,124 @@
- <#if 0 != recentComments?size>
- ${recentCommentsLabel}
-
-
- <#if 0 != mostCommentArticles?size>
- ${mostCommentArticlesLabel}
-
-
- <#if 0 != mostViewCountArticles?size>
- ${mostViewCountArticlesLabel}
-
-
- <#if 0 != mostUsedCategories?size>
- ${categoryLabel}
-
- <#list mostUsedCategories as category>
-
-
- ${category.categoryTitle} (${category.categoryTagCnt})
-
+ <#if article?? && article.articleToC?? && article.articleToC?size > 0>
+ <#include "../../common-template/toc.ftl"/>
+ <#else>
+
+ <#if 0 != recentComments?size>
+ ${recentCommentsLabel}
+
-
-
- <#if 0 != mostUsedTags?size>
- ${tagsLabel}
-
-
- <#if 0 != links?size>
- ${linkLabel}
-
-
- <#if 0 != archiveDates?size>
- ${archiveLabel}
-
- <#list archiveDates as archiveDate>
- <#if archiveDate_index < 10>
+
+ <#if 0 != mostCommentArticles?size>
+ ${mostCommentArticlesLabel}
+
+
+
+
+ <#if 0 != mostViewCountArticles?size>
+ ${mostViewCountArticlesLabel}
+
+
+
+ <#if 0 != mostUsedCategories?size>
+ ${categoryLabel}
+
+
+
+ <#if 0 != mostUsedTags?size>
+ ${tagsLabel}
+
+
+ <#if 0 != links?size>
+ ${linkLabel}
+
+
+ <#if 0 != archiveDates?size>
+
+
+
\ No newline at end of file