diff --git a/9IPHP/links.ftl b/9IPHP/links.ftl index 677d9fb..a03a9ea 100644 --- a/9IPHP/links.ftl +++ b/9IPHP/links.ftl @@ -21,9 +21,9 @@ - <@head title="${blogTitle}"> - - + <@head title="${linkLabel} - ${blogTitle}"> + + diff --git a/Bruce/links.ftl b/Bruce/links.ftl index d16132c..0829c26 100644 --- a/Bruce/links.ftl +++ b/Bruce/links.ftl @@ -21,7 +21,7 @@ - <@head title="${blogTitle}"> + <@head title="${linkLabel} - ${blogTitle}"> diff --git a/Finding/links.ftl b/Finding/links.ftl index 4b2250c..cc8e0dd 100644 --- a/Finding/links.ftl +++ b/Finding/links.ftl @@ -21,7 +21,7 @@ - <@head title="${blogTitle}"> + <@head title="${linkLabel} - ${blogTitle}"> diff --git a/Jane/archive-articles.ftl b/Jane/archive-articles.ftl index cea11cb..7f8940e 100644 --- a/Jane/archive-articles.ftl +++ b/Jane/archive-articles.ftl @@ -32,27 +32,25 @@ <#include "header.ftl">
<#if pjax> -
-
-

- - - ${archiveLabel} - -

-
- <#if "en" == localeString?substring(0, 2)> - ${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} - <#else> - ${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} - - - ${archiveDate.archiveDatePublishedArticleCount} ${articleLabel} -
+
+

+ + + ${archiveLabel} + +

+
+ <#if "en" == localeString?substring(0, 2)> + ${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} + <#else> + ${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} + + - ${archiveDate.archiveDatePublishedArticleCount} ${articleLabel}
- <#include "article-list.ftl"> -
+
+ <#include "article-list.ftl"> <#if pjax> - <#include "footer.ftl"> + <#include "footer.ftl"> diff --git a/Jane/archives.ftl b/Jane/archives.ftl index fc0fda7..36c6144 100644 --- a/Jane/archives.ftl +++ b/Jane/archives.ftl @@ -37,7 +37,7 @@
${statistic.statisticPublishedBlogArticleCount} ${countLabel}
-
+
<#list archiveDates as archiveDate> <#if "en" == localeString?substring(0, 2)> @@ -55,7 +55,7 @@
<#if pjax> - <#include "footer.ftl"> + <#include "footer.ftl"> diff --git a/Jane/categories.ftl b/Jane/categories.ftl index eb9f755..75107b6 100644 --- a/Jane/categories.ftl +++ b/Jane/categories.ftl @@ -24,32 +24,32 @@ <@head title="${categoryLabel} - ${blogTitle}"> + content="<#list categories as category>${category.categoryTitle}<#if category_has_next>,"/> <#include "header.ftl">
<#if pjax> -
-
-
- - ${blogTitle} -   >   - - ${categoryLabel} -
+
+

+ ${categoryLabel}${articleLabel} +

+
+ ${categories?size} ${cntLabel}${categoryLabel}
- <#list mostUsedCategories as category> - - ${category.categoryTitle} - -
+
+ <#list categories as category> + + ${category.categoryTitle} + (${category.categoryTagCnt} ${tagsLabel}) + + +
+
<#if pjax> - <#include "footer.ftl"> + <#include "footer.ftl"> diff --git a/Jane/category-articles.ftl b/Jane/category-articles.ftl index 6f84f74..a2cdd7b 100644 --- a/Jane/category-articles.ftl +++ b/Jane/category-articles.ftl @@ -29,26 +29,21 @@ <#include "header.ftl"> -
-
- <#if pjax> -
-
-
- - ${blogTitle} -   >   +
+<#if pjax> +
+

+ ${categoryLabel} -   >   - ${category.categoryTitle} -

+ + +
+ ${category.categoryTitle}
- <#include "article-list.ftl"> -
- <#if pjax>
+ <#include "article-list.ftl"> +<#if pjax>
<#include "footer.ftl"> diff --git a/Jane/css/_icon.scss b/Jane/css/_icon.scss index c635b8a..39cff0c 100644 --- a/Jane/css/_icon.scss +++ b/Jane/css/_icon.scss @@ -42,6 +42,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon__page:before { + content: "\e902"; +} + .icon__list:before { content: "\f0ca"; } diff --git a/Jane/css/base.css b/Jane/css/base.css index 8ca04d9..638c6c2 100644 --- a/Jane/css/base.css +++ b/Jane/css/base.css @@ -677,6 +677,9 @@ blockquote { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } +.icon__page:before { + content: "\e902"; } + .icon__list:before { content: "\f0ca"; } @@ -743,6 +746,8 @@ a { .content-reset { color: #555; font-size: 14px; } + .content-reset a { + color: #991a1a; } .header { top: 0; @@ -751,7 +756,9 @@ a { position: fixed; right: 0; height: 100%; - width: 50px; } + width: 50px; + display: flex; + flex-direction: column; } .header a, .header span { color: #fff; padding: 10px 0; @@ -765,10 +772,6 @@ a { .header a.current, .header a:hover, .header span.current, .header span:hover { text-decoration: none; color: #999; } - .header__bottom { - width: 100%; - position: absolute; - bottom: 0; } .wrapper { max-width: 920px; @@ -827,6 +830,9 @@ a { .tags { line-height: 32px; margin: 20px 0 70px; } - .tags a { + .tags--align a { width: 180px; + margin-right: 0 !important; } + .tags a { + margin-right: 20px; float: left; } diff --git a/Jane/css/base.scss b/Jane/css/base.scss index ed3837c..b16f587 100644 --- a/Jane/css/base.scss +++ b/Jane/css/base.scss @@ -54,6 +54,10 @@ a { .content-reset { color: #555; font-size: 14px; + + a { + color: $red; + } } // header @@ -65,6 +69,8 @@ a { right: 0; height: 100%; width: 50px; + display: flex; + flex-direction: column; a, span { color: #fff; @@ -85,12 +91,6 @@ a { color: $gray; } } - - &__bottom { - width: 100%; - position: absolute; - bottom: 0; - } } // framework @@ -174,8 +174,14 @@ a { .tags { line-height: 32px; margin: 20px 0 70px; - a { + + &--align a { width: 180px; + margin-right: 0 !important; + } + + a { + margin-right: 20px; float: left; } } \ No newline at end of file diff --git a/Jane/css/fonts/icomoon.eot b/Jane/css/fonts/icomoon.eot old mode 100644 new mode 100755 index 49c2fa8..31f1563 Binary files a/Jane/css/fonts/icomoon.eot and b/Jane/css/fonts/icomoon.eot differ diff --git a/Jane/css/fonts/icomoon.svg b/Jane/css/fonts/icomoon.svg old mode 100644 new mode 100755 index 19b377d..df3ce79 --- a/Jane/css/fonts/icomoon.svg +++ b/Jane/css/fonts/icomoon.svg @@ -9,6 +9,7 @@ + @@ -22,6 +23,6 @@ - + \ No newline at end of file diff --git a/Jane/css/fonts/icomoon.ttf b/Jane/css/fonts/icomoon.ttf old mode 100644 new mode 100755 index 13145f1..32f7b26 Binary files a/Jane/css/fonts/icomoon.ttf and b/Jane/css/fonts/icomoon.ttf differ diff --git a/Jane/css/fonts/icomoon.woff b/Jane/css/fonts/icomoon.woff old mode 100644 new mode 100755 index 8da4cca..e3f0b2a Binary files a/Jane/css/fonts/icomoon.woff and b/Jane/css/fonts/icomoon.woff differ diff --git a/Jane/css/fonts/selection.json b/Jane/css/fonts/selection.json new file mode 100755 index 0000000..c5c5803 --- /dev/null +++ b/Jane/css/fonts/selection.json @@ -0,0 +1 @@ +{"IcoMoonType":"selection","icons":[{"icon":{"paths":["M917.806 229.076c-22.212-30.292-53.174-65.7-87.178-99.704s-69.412-64.964-99.704-87.178c-51.574-37.82-76.592-42.194-90.924-42.194h-496c-44.112 0-80 35.888-80 80v864c0 44.112 35.888 80 80 80h736c44.112 0 80-35.888 80-80v-624c0-14.332-4.372-39.35-42.194-90.924zM785.374 174.626c30.7 30.7 54.8 58.398 72.58 81.374h-153.954v-153.946c22.984 17.78 50.678 41.878 81.374 72.572zM896 944c0 8.672-7.328 16-16 16h-736c-8.672 0-16-7.328-16-16v-864c0-8.672 7.328-16 16-16 0 0 495.956-0.002 496 0v224c0 17.672 14.326 32 32 32h224v624z","M736 832h-448c-17.672 0-32-14.326-32-32s14.328-32 32-32h448c17.674 0 32 14.326 32 32s-14.326 32-32 32z","M736 704h-448c-17.672 0-32-14.326-32-32s14.328-32 32-32h448c17.674 0 32 14.326 32 32s-14.326 32-32 32z","M736 576h-448c-17.672 0-32-14.326-32-32s14.328-32 32-32h448c17.674 0 32 14.326 32 32s-14.326 32-32 32z"],"attrs":[{},{},{},{}],"isMulticolor":false,"isMulticolor2":false,"tags":["file-text","file","document","list","paper","page"],"grid":16},"attrs":[{},{},{},{}],"properties":{"order":1,"id":0,"name":"page","prevSize":32,"code":59650},"setIdx":0,"setId":1,"iconIdx":0},{"icon":{"paths":["M512 192c-282.784 0-512 320-512 320s229.216 320 512 320 512-320 512-320-229.216-320-512-320zM512 704c-106.016 0-192-85.984-192-192s85.984-192 192-192 192 85.984 192 192-85.984 192-192 192zM512 384c-70.688 0-128 57.312-128 128s57.312 128 128 128 128-57.312 128-128-57.312-128-128-128z"],"isMulticolor":false,"isMulticolor2":false,"tags":["views"],"defaultCode":59648,"grid":0,"attrs":[]},"attrs":[],"properties":{"id":1,"order":2,"ligatures":"","prevSize":32,"code":59648,"name":"views"},"setIdx":1,"setId":0,"iconIdx":0},{"icon":{"paths":["M136.294 750.93c-75.196 0-136.292 61.334-136.292 136.076 0 75.154 61.1 135.802 136.292 135.802 75.466 0 136.494-60.648 136.494-135.802-0.002-74.742-61.024-136.076-136.494-136.076zM0.156 347.93v196.258c127.784 0 247.958 49.972 338.458 140.512 90.384 90.318 140.282 211.036 140.282 339.3h197.122c-0.002-372.82-303.282-676.070-675.862-676.070zM0.388 0v196.356c455.782 0 826.756 371.334 826.756 827.644h196.856c0-564.47-459.254-1024-1023.612-1024z"],"isMulticolor":false,"isMulticolor2":false,"tags":["rss"],"defaultCode":59649,"grid":0,"attrs":[]},"attrs":[],"properties":{"id":2,"order":3,"ligatures":"","prevSize":32,"code":59649,"name":"rss"},"setIdx":1,"setId":0,"iconIdx":1},{"icon":{"paths":["M384 736c0-151.234 95.874-280.486 230.032-330.2 16.28-36.538 25.968-77.164 25.968-117.8 0-159.058 0-288-192-288s-192 128.942-192 288c0 99.060 57.502 198.104 128 237.832v52.78c-217.102 17.748-384 124.42-384 253.388h397.306c-8.664-30.53-13.306-62.732-13.306-96zM736 448c-159.058 0-288 128.942-288 288s128.942 288 288 288c159.056 0 288-128.942 288-288s-128.942-288-288-288zM896 768h-128v128h-64v-128h-128v-64h128v-128h64v128h128v64z"],"isMulticolor":false,"isMulticolor2":false,"tags":["register"],"defaultCode":59763,"grid":0,"attrs":[]},"attrs":[],"properties":{"id":3,"order":4,"ligatures":"","prevSize":32,"code":59763,"name":"register"},"setIdx":1,"setId":0,"iconIdx":2},{"icon":{"paths":["M933.79 610.25c-53.726-93.054-21.416-212.304 72.152-266.488l-100.626-174.292c-28.75 16.854-62.176 26.518-97.846 26.518-107.536 0-194.708-87.746-194.708-195.99h-201.258c0.266 33.41-8.074 67.282-25.958 98.252-53.724 93.056-173.156 124.702-266.862 70.758l-100.624 174.292c28.97 16.472 54.050 40.588 71.886 71.478 53.638 92.908 21.512 211.92-71.708 266.224l100.626 174.292c28.65-16.696 61.916-26.254 97.4-26.254 107.196 0 194.144 87.192 194.7 194.958h201.254c-0.086-33.074 8.272-66.57 25.966-97.218 53.636-92.906 172.776-124.594 266.414-71.012l100.626-174.29c-28.78-16.466-53.692-40.498-71.434-71.228zM512 719.332c-114.508 0-207.336-92.824-207.336-207.334 0-114.508 92.826-207.334 207.336-207.334 114.508 0 207.332 92.826 207.332 207.334-0.002 114.51-92.824 207.334-207.332 207.334z"],"isMulticolor":false,"isMulticolor2":false,"tags":["setting"],"defaultCode":59796,"grid":0,"attrs":[]},"attrs":[],"properties":{"id":4,"order":5,"ligatures":"","prevSize":32,"code":59796,"name":"setting"},"setIdx":1,"setId":0,"iconIdx":3},{"icon":{"paths":["M976 768h-16v-208c0-61.756-50.242-112-112-112h-272v-128h16c26.4 0 48-21.6 48-48v-160c0-26.4-21.6-48-48-48h-160c-26.4 0-48 21.6-48 48v160c0 26.4 21.6 48 48 48h16v128h-272c-61.756 0-112 50.244-112 112v208h-16c-26.4 0-48 21.6-48 48v160c0 26.4 21.6 48 48 48h160c26.4 0 48-21.6 48-48v-160c0-26.4-21.6-48-48-48h-16v-192h256v192h-16c-26.4 0-48 21.6-48 48v160c0 26.4 21.6 48 48 48h160c26.4 0 48-21.6 48-48v-160c0-26.4-21.6-48-48-48h-16v-192h256v192h-16c-26.4 0-48 21.6-48 48v160c0 26.4 21.6 48 48 48h160c26.4 0 48-21.6 48-48v-160c0-26.4-21.6-48-48-48zM192 960h-128v-128h128v128zM576 960h-128v-128h128v128zM448 256v-128h128v128h-128zM960 960h-128v-128h128v128z"],"isMulticolor":false,"isMulticolor2":false,"tags":["category"],"defaultCode":59836,"grid":0,"attrs":[]},"attrs":[],"properties":{"id":5,"order":6,"ligatures":"","prevSize":32,"code":59836,"name":"category"},"setIdx":1,"setId":0,"iconIdx":4},{"icon":{"paths":["M384 512h-320v-128h320v-128l192 192-192 192zM1024 0v832l-384 192v-192h-384v-256h64v192h320v-576l256-128h-576v256h-64v-320z"],"isMulticolor":false,"isMulticolor2":false,"tags":["login"],"defaultCode":59923,"grid":0,"attrs":[]},"attrs":[],"properties":{"id":6,"order":7,"ligatures":"","prevSize":32,"code":59923,"name":"login"},"setIdx":1,"setId":0,"iconIdx":5},{"icon":{"paths":["M768 640v-128h-320v-128h320v-128l192 192zM704 576v256h-320v192l-384-192v-832h704v320h-64v-256h-512l256 128v576h256v-192z"],"isMulticolor":false,"isMulticolor2":false,"tags":["logout"],"defaultCode":59924,"grid":0,"attrs":[]},"attrs":[],"properties":{"id":7,"order":8,"ligatures":"","prevSize":32,"code":59924,"name":"logout"},"setIdx":1,"setId":0,"iconIdx":6},{"icon":{"paths":["M658.286 484.572c0-141.143-114.857-256-256-256s-256 114.857-256 256 114.857 256 256 256 256-114.857 256-256zM950.857 960c0 40-33.143 73.143-73.143 73.143-19.429 0-38.286-8-51.429-21.714l-196-195.429c-66.857 46.286-146.857 70.857-228 70.857-222.286 0-402.286-180-402.286-402.286s180-402.286 402.286-402.286 402.286 180 402.286 402.286c0 81.143-24.571 161.143-70.857 228l196 196c13.143 13.143 21.143 32 21.143 51.429z"],"width":951,"isMulticolor":false,"isMulticolor2":false,"tags":["search"],"defaultCode":61442,"grid":0,"attrs":[]},"attrs":[],"properties":{"id":8,"order":9,"ligatures":"","prevSize":32,"code":61442,"name":"search"},"setIdx":1,"setId":0,"iconIdx":7},{"icon":{"paths":["M804.571 576v274.286c0 20-16.571 36.571-36.571 36.571h-219.429v-219.429h-146.286v219.429h-219.429c-20 0-36.571-16.571-36.571-36.571v-274.286c0-1.143 0.571-2.286 0.571-3.429l328.571-270.857 328.571 270.857c0.571 1.143 0.571 2.286 0.571 3.429zM932 536.572l-35.429 42.286c-2.857 3.429-7.429 5.714-12 6.286h-1.714c-4.571 0-8.571-1.143-12-4l-395.429-329.714-395.429 329.714c-4 2.857-8.571 4.571-13.714 4-4.571-0.571-9.143-2.857-12-6.286l-35.429-42.286c-6.286-7.429-5.143-19.429 2.286-25.714l410.857-342.286c24-20 62.857-20 86.857 0l139.429 116.571v-111.429c0-10.286 8-18.286 18.286-18.286h109.714c10.286 0 18.286 8 18.286 18.286v233.143l125.143 104c7.429 6.286 8.571 18.286 2.286 25.714z"],"width":951,"isMulticolor":false,"isMulticolor2":false,"tags":["home"],"defaultCode":61461,"grid":0,"attrs":[]},"attrs":[],"properties":{"id":9,"order":10,"ligatures":"","prevSize":32,"code":61461,"name":"home"},"setIdx":1,"setId":0,"iconIdx":8},{"icon":{"paths":["M584.571 557.714h180.571c-1.143-2.857-1.714-6.286-2.857-9.143l-121.143-283.429h-404.571l-121.143 283.429c-1.143 2.857-1.714 6.286-2.857 9.143h180.571l54.286 109.714h182.857zM877.714 574.857v275.429c0 20-16.571 36.571-36.571 36.571h-804.571c-20 0-36.571-16.571-36.571-36.571v-275.429c0-20.571 6.286-50.857 14.286-70.286l136-315.429c8-18.857 30.857-33.714 50.857-33.714h475.429c20 0 42.857 14.857 50.857 33.714l136 315.429c8 19.429 14.286 49.714 14.286 70.286z"],"width":878,"isMulticolor":false,"isMulticolor2":false,"tags":["inbox"],"defaultCode":61468,"grid":0,"attrs":[]},"attrs":[],"properties":{"id":10,"order":11,"ligatures":"","prevSize":32,"code":61468,"name":"inbox"},"setIdx":1,"setId":0,"iconIdx":9},{"icon":{"paths":["M863.429 612.572c0 1.143 0 2.857-0.571 4-48.571 202.286-215.429 343.429-426.286 343.429-111.429 0-219.429-44-300.571-121.143l-73.714 73.714c-6.857 6.857-16 10.857-25.714 10.857-20 0-36.571-16.571-36.571-36.571v-256c0-20 16.571-36.571 36.571-36.571h256c20 0 36.571 16.571 36.571 36.571 0 9.714-4 18.857-10.857 25.714l-78.286 78.286c53.714 50.286 125.143 78.857 198.857 78.857 101.714 0 196-52.571 249.143-139.429 13.714-22.286 20.571-44 30.286-66.857 2.857-8 8.571-13.143 17.143-13.143h109.714c10.286 0 18.286 8.571 18.286 18.286zM877.714 155.429v256c0 20-16.571 36.571-36.571 36.571h-256c-20 0-36.571-16.571-36.571-36.571 0-9.714 4-18.857 10.857-25.714l78.857-78.857c-54.286-50.286-125.714-78.286-199.429-78.286-101.714 0-196 52.571-249.143 139.429-13.714 22.286-20.571 44-30.286 66.857-2.857 8-8.571 13.143-17.143 13.143h-113.714c-10.286 0-18.286-8.571-18.286-18.286v-4c49.143-202.857 217.714-343.429 428.571-343.429 112 0 221.143 44.571 302.286 121.143l74.286-73.714c6.857-6.857 16-10.857 25.714-10.857 20 0 36.571 16.571 36.571 36.571z"],"width":878,"isMulticolor":false,"isMulticolor2":false,"tags":["refresh"],"defaultCode":61473,"grid":0,"attrs":[]},"attrs":[],"properties":{"id":11,"order":12,"ligatures":"","prevSize":32,"code":61473,"name":"refresh"},"setIdx":1,"setId":0,"iconIdx":10},{"icon":{"paths":["M256 265.143c0-40.571-32.571-73.143-73.143-73.143s-73.143 32.571-73.143 73.143 32.571 73.143 73.143 73.143 73.143-32.571 73.143-73.143zM865.714 594.286c0 19.429-8 38.286-21.143 51.429l-280.571 281.143c-13.714 13.143-32.571 21.143-52 21.143s-38.286-8-51.429-21.143l-408.571-409.143c-29.143-28.571-52-84-52-124.571v-237.714c0-40 33.143-73.143 73.143-73.143h237.714c40.571 0 96 22.857 125.143 52l408.571 408c13.143 13.714 21.143 32.571 21.143 52zM1085.143 594.286c0 19.429-8 38.286-21.143 51.429l-280.571 281.143c-13.714 13.143-32.571 21.143-52 21.143-29.714 0-44.571-13.714-64-33.714l268.571-268.571c13.143-13.143 21.143-32 21.143-51.429s-8-38.286-21.143-52l-408.571-408c-29.143-29.143-84.571-52-125.143-52h128c40.571 0 96 22.857 125.143 52l408.571 408c13.143 13.714 21.143 32.571 21.143 52z"],"width":1085,"isMulticolor":false,"isMulticolor2":false,"tags":["tags"],"defaultCode":61484,"grid":0,"attrs":[]},"attrs":[],"properties":{"id":12,"order":13,"ligatures":"","prevSize":32,"code":61484,"name":"tags"},"setIdx":1,"setId":0,"iconIdx":11},{"icon":{"paths":["M73.143 960h164.571v-164.571h-164.571v164.571zM274.286 960h182.857v-164.571h-182.857v164.571zM73.143 758.857h164.571v-182.857h-164.571v182.857zM274.286 758.857h182.857v-182.857h-182.857v182.857zM73.143 539.429h164.571v-164.571h-164.571v164.571zM493.714 960h182.857v-164.571h-182.857v164.571zM274.286 539.429h182.857v-164.571h-182.857v164.571zM713.143 960h164.571v-164.571h-164.571v164.571zM493.714 758.857h182.857v-182.857h-182.857v182.857zM292.571 265.143v-164.571c0-9.714-8.571-18.286-18.286-18.286h-36.571c-9.714 0-18.286 8.571-18.286 18.286v164.571c0 9.714 8.571 18.286 18.286 18.286h36.571c9.714 0 18.286-8.571 18.286-18.286zM713.143 758.857h164.571v-182.857h-164.571v182.857zM493.714 539.429h182.857v-164.571h-182.857v164.571zM713.143 539.429h164.571v-164.571h-164.571v164.571zM731.429 265.143v-164.571c0-9.714-8.571-18.286-18.286-18.286h-36.571c-9.714 0-18.286 8.571-18.286 18.286v164.571c0 9.714 8.571 18.286 18.286 18.286h36.571c9.714 0 18.286-8.571 18.286-18.286zM950.857 228.572v731.429c0 40-33.143 73.143-73.143 73.143h-804.571c-40 0-73.143-33.143-73.143-73.143v-731.429c0-40 33.143-73.143 73.143-73.143h73.143v-54.857c0-50.286 41.143-91.429 91.429-91.429h36.571c50.286 0 91.429 41.143 91.429 91.429v54.857h219.429v-54.857c0-50.286 41.143-91.429 91.429-91.429h36.571c50.286 0 91.429 41.143 91.429 91.429v54.857h73.143c40 0 73.143 33.143 73.143 73.143z"],"width":951,"isMulticolor":false,"isMulticolor2":false,"tags":["date"],"defaultCode":61555,"grid":0,"attrs":[]},"attrs":[],"properties":{"id":13,"order":14,"ligatures":"","prevSize":32,"code":61555,"name":"date"},"setIdx":1,"setId":0,"iconIdx":12},{"icon":{"paths":["M961.714 769.714l-94.857 94.286c-14.286 14.286-37.143 14.286-51.429 0l-303.429-303.429-303.429 303.429c-14.286 14.286-37.143 14.286-51.429 0l-94.857-94.286c-14.286-14.286-14.286-37.714 0-52l424-423.429c14.286-14.286 37.143-14.286 51.429 0l424 423.429c14.286 14.286 14.286 37.714 0 52z"],"isMulticolor":false,"isMulticolor2":false,"tags":["up"],"defaultCode":61559,"grid":0,"attrs":[]},"attrs":[],"properties":{"id":14,"order":15,"ligatures":"","prevSize":32,"code":61559,"name":"up"},"setIdx":1,"setId":0,"iconIdx":13},{"icon":{"paths":["M832 704c0-14.857-5.714-28.571-16-38.857l-118.857-118.857c-10.286-10.286-24.571-16-38.857-16-16.571 0-29.714 6.286-41.143 18.286 18.857 18.857 41.143 34.857 41.143 64 0 30.286-24.571 54.857-54.857 54.857-29.143 0-45.143-22.286-64-41.143-12 11.429-18.857 24.571-18.857 41.714 0 14.286 5.714 28.571 16 38.857l117.714 118.286c10.286 10.286 24.571 15.429 38.857 15.429s28.571-5.143 38.857-14.857l84-83.429c10.286-10.286 16-24 16-38.286zM430.286 301.143c0-14.286-5.714-28.571-16-38.857l-117.714-118.286c-10.286-10.286-24.571-16-38.857-16s-28.571 5.714-38.857 15.429l-84 83.429c-10.286 10.286-16 24-16 38.286 0 14.857 5.714 28.571 16 38.857l118.857 118.857c10.286 10.286 24.571 15.429 38.857 15.429 16.571 0 29.714-5.714 41.143-17.714-18.857-18.857-41.143-34.857-41.143-64 0-30.286 24.571-54.857 54.857-54.857 29.143 0 45.143 22.286 64 41.143 12-11.429 18.857-24.571 18.857-41.714zM941.714 704c0 43.429-17.714 85.714-48.571 116l-84 83.429c-30.857 30.857-72.571 47.429-116 47.429-44 0-85.714-17.143-116.571-48.571l-117.714-118.286c-30.857-30.857-47.429-72.571-47.429-116 0-45.143 18.286-88 50.286-119.429l-50.286-50.286c-31.429 32-73.714 50.286-118.857 50.286-43.429 0-85.714-17.143-116.571-48l-118.857-118.857c-31.429-31.429-48-72.571-48-116.571 0-43.429 17.714-85.714 48.571-116l84-83.429c30.857-30.857 72.571-47.429 116-47.429 44 0 85.714 17.143 116.571 48.571l117.714 118.286c30.857 30.857 47.429 72.571 47.429 116 0 45.143-18.286 88-50.286 119.429l50.286 50.286c31.429-32 73.714-50.286 118.857-50.286 43.429 0 85.714 17.143 116.571 48l118.857 118.857c31.429 31.429 48 72.571 48 116.571z"],"width":951,"isMulticolor":false,"isMulticolor2":false,"tags":["link"],"defaultCode":61633,"grid":0,"attrs":[]},"attrs":[],"properties":{"id":15,"order":16,"ligatures":"","prevSize":32,"code":61633,"name":"link"},"setIdx":1,"setId":0,"iconIdx":14},{"icon":{"paths":["M219.429 813.714c0 60.571-49.143 109.714-109.714 109.714s-109.714-49.143-109.714-109.714 49.143-109.714 109.714-109.714 109.714 49.143 109.714 109.714zM219.429 521.143c0 60.571-49.143 109.714-109.714 109.714s-109.714-49.143-109.714-109.714 49.143-109.714 109.714-109.714 109.714 49.143 109.714 109.714zM1024 758.857v109.714c0 9.714-8.571 18.286-18.286 18.286h-694.857c-9.714 0-18.286-8.571-18.286-18.286v-109.714c0-9.714 8.571-18.286 18.286-18.286h694.857c9.714 0 18.286 8.571 18.286 18.286zM219.429 228.572c0 60.571-49.143 109.714-109.714 109.714s-109.714-49.143-109.714-109.714 49.143-109.714 109.714-109.714 109.714 49.143 109.714 109.714zM1024 466.286v109.714c0 9.714-8.571 18.286-18.286 18.286h-694.857c-9.714 0-18.286-8.571-18.286-18.286v-109.714c0-9.714 8.571-18.286 18.286-18.286h694.857c9.714 0 18.286 8.571 18.286 18.286zM1024 173.714v109.714c0 9.714-8.571 18.286-18.286 18.286h-694.857c-9.714 0-18.286-8.571-18.286-18.286v-109.714c0-9.714 8.571-18.286 18.286-18.286h694.857c9.714 0 18.286 8.571 18.286 18.286z"],"isMulticolor":false,"isMulticolor2":false,"tags":["list"],"defaultCode":61642,"grid":0,"attrs":[]},"attrs":[],"properties":{"id":16,"order":17,"ligatures":"","prevSize":32,"code":61642,"name":"list1"},"setIdx":1,"setId":0,"iconIdx":15},{"icon":{"paths":["M402.286 228.572c-178.286 0-329.143 100.571-329.143 219.429 0 62.857 42.286 123.429 115.429 165.714l55.429 32-20 48c12-6.857 24-14.286 35.429-22.286l25.143-17.714 30.286 5.714c28.571 5.143 57.714 8 87.429 8 178.286 0 329.143-100.571 329.143-219.429s-150.857-219.429-329.143-219.429zM402.286 155.429c222.286 0 402.286 130.857 402.286 292.571s-180 292.571-402.286 292.571c-34.857 0-68.571-3.429-100.571-9.143-47.429 33.714-101.143 58.286-158.857 73.143-15.429 4-32 6.857-49.143 9.143h-1.714c-8.571 0-16.571-6.857-18.286-16.571v0c-2.286-10.857 5.143-17.714 11.429-25.143 22.286-25.143 47.429-47.429 66.857-94.857-92.571-53.714-152-136.571-152-229.143 0-161.714 180-292.571 402.286-292.571zM872 823.429c19.429 47.429 44.571 69.714 66.857 94.857 6.286 7.429 13.714 14.286 11.429 25.143v0c-2.286 10.286-10.857 17.714-20 16.571-17.143-2.286-33.714-5.143-49.143-9.143-57.714-14.857-111.429-39.429-158.857-73.143-32 5.714-65.714 9.143-100.571 9.143-103.429 0-198.286-28.571-269.714-75.429 16.571 1.143 33.714 2.286 50.286 2.286 122.857 0 238.857-35.429 327.429-99.429 95.429-69.714 148-164 148-266.286 0-29.714-4.571-58.857-13.143-86.857 96.571 53.143 159.429 137.714 159.429 233.143 0 93.143-59.429 175.429-152 229.143z"],"isMulticolor":false,"isMulticolor2":false,"tags":["comments"],"defaultCode":61670,"grid":0,"attrs":[]},"attrs":[],"properties":{"id":17,"order":18,"ligatures":"","prevSize":32,"code":61670,"name":"comments"},"setIdx":1,"setId":0,"iconIdx":16}],"height":1024,"metadata":{"name":"icomoon"},"preferences":{"showGlyphs":true,"showCodes":true,"showQuickUse":true,"showQuickUse2":true,"showSVGs":true,"fontPref":{"prefix":"icon-","metadata":{"fontFamily":"icomoon"},"metrics":{"emSize":1024,"baseline":6.25,"whitespace":50},"embed":false},"imagePref":{"prefix":"icon-","png":true,"useClassSelector":true,"color":0,"bgColor":16777215,"name":"icomoon","classSelector":".icon"},"historySize":50}} \ No newline at end of file diff --git a/Jane/dynamic.ftl b/Jane/dynamic.ftl deleted file mode 100644 index c4a5ab1..0000000 --- a/Jane/dynamic.ftl +++ /dev/null @@ -1,63 +0,0 @@ -<#-- - - Solo - A small and beautiful blogging system written in Java. - Copyright (c) 2010-2018, b3log.org & hacpai.com - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - ---> -<#include "macro-head.ftl"> - - - -<@head title="${blogTitle}"> - - - - - -<#include "header.ftl"> -
-
- <#if pjax> -
-
-
- - ${blogTitle} -   >   - ${dynamicLabel} -
-
- <#if 0 != recentComments?size> -
    - <#list recentComments as comment> - <#include "common-comment.ftl"/> - -
- -
- <#if pjax> -
-
-<#include "footer.ftl"> - - - diff --git a/Jane/footer.ftl b/Jane/footer.ftl index 3dc50fb..cf0b4ff 100644 --- a/Jane/footer.ftl +++ b/Jane/footer.ftl @@ -17,7 +17,7 @@ along with this program. If not, see . --> -