From 594e1066123418f36430364def924d96f9b40e5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=93=E5=8F=91=E5=8F=97=E9=95=BF=E7=94=9F?= Date: Sun, 12 May 2019 10:16:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=B0=83=E6=95=B4=E5=B9=B6?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8F=8B=E9=93=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/yilia/_config.yml | 21 +++++++++---------- themes/yilia/languages/default.yml | 5 ++--- themes/yilia/languages/fr.yml | 5 ++--- themes/yilia/languages/ja.yml | 5 ++--- themes/yilia/languages/ru.yml | 5 ++--- themes/yilia/languages/zh-CN.yml | 5 ++--- themes/yilia/languages/zh-tw.yml | 5 ++--- themes/yilia/source-src/css/archive.scss | 2 +- .../yilia/source-src/css/core/_variables.scss | 1 + themes/yilia/source-src/css/grid.scss | 4 ++-- 10 files changed, 26 insertions(+), 32 deletions(-) diff --git a/themes/yilia/_config.yml b/themes/yilia/_config.yml index 409c523..c425226 100644 --- a/themes/yilia/_config.yml +++ b/themes/yilia/_config.yml @@ -4,10 +4,10 @@ menu: home: # 主页 name: home url: / - netdisc: # jenkins - name: jenkins - url: /jenkins/ - target: _blank + archives: # 归档 + name: archives + url: /archives/ + # target: _blank photo_wall: # 照片墙 name: photo_wall url: /photo_wall/ @@ -102,15 +102,14 @@ valine: # friends: false smart_menu: innerArchive: all_articles - friends: false #friends_link + friends: friends_link aboutme: about_me friends: - 友情链接1: http://localhost:6603/ - 友情链接2: http://localhost:6603/ - 友情链接3: http://localhost:6603/ - 友情链接4: http://localhost:6603/ - 友情链接5: http://localhost:6603/ - 友情链接6: http://localhost:6603/ + 十年饮冰，难凉热血: https://blog.colorfulsweet.site/ + †少女癌†: https://co5.me/ + 猫与向日葵 : https://imjad.cn/ + coderfun: https://www.gxg.red/ + JENKINS: https://www.colorfulsweet.site/jenkins/ aboutme: 愿你最终能接纳每一面每一种的自己
独自活着便是团圆 \ No newline at end of file diff --git a/themes/yilia/languages/default.yml b/themes/yilia/languages/default.yml index 5cd3079..a5b3c06 100644 --- a/themes/yilia/languages/default.yml +++ b/themes/yilia/languages/default.yml @@ -7,8 +7,6 @@ tags: Tags tag: Tag prev: Prev next: Next -archive_a: Archives -archive_b: "Archives: %s" page: Page %d recent_posts: Recent Posts newer: Newer @@ -18,6 +16,7 @@ show_full_text: Show Full Text home: Homepage informal_essay: Informal Essay photo_wall: Photo Wall -netdisc: Netdisc +archives: Archives all_articles: All Articles +friends_link: Friends Link about_me: About Me \ No newline at end of file diff --git a/themes/yilia/languages/fr.yml b/themes/yilia/languages/fr.yml index 4cc2da5..764b367 100644 --- a/themes/yilia/languages/fr.yml +++ b/themes/yilia/languages/fr.yml @@ -7,8 +7,6 @@ tags: Mot-clés tag: Mot-clé prev: Précédent next: Suivant -archive_a: Archives -archive_b: "Archives: %s" page: Page %d recent_posts: Articles récents newer: Récent @@ -18,6 +16,7 @@ show_full_text: Voir le texte intégral de la home: Homepage informal_essay: Essais photo_wall: Mur de photo -netdisc: Disque réseau +archives: Archives all_articles: Tous les articles +friends_link: Lien amical about_me: À propos de moi \ No newline at end of file diff --git a/themes/yilia/languages/ja.yml b/themes/yilia/languages/ja.yml index cf96066..6a8f369 100644 --- a/themes/yilia/languages/ja.yml +++ b/themes/yilia/languages/ja.yml @@ -7,8 +7,6 @@ tags: タグ tag: タグ prev: 前のページ next: 次のページ -archive_a: アーカイブ -archive_b: アーカイブ：%s page: ページ %d recent_posts: 最新の記事 newer: 新しい @@ -18,6 +16,7 @@ show_full_text: 記事全体を見る home: ホーム informal_essay: エッセイ photo_wall: フォトウォール -netdisc: ネットワークディスク +archives: アーカイブ all_articles: すべての記事 +friends_link: フレンドリーリンク about_me: 私について \ No newline at end of file diff --git a/themes/yilia/languages/ru.yml b/themes/yilia/languages/ru.yml index 0eeb1a8..c33b4ad 100644 --- a/themes/yilia/languages/ru.yml +++ b/themes/yilia/languages/ru.yml @@ -7,8 +7,6 @@ tags: Метки tag: Метка prev: Назад next: Вперед -archive_a: Архив -archive_b: "Архив: %s" page: Страница %d recent_posts: Недавние записи newer: Следующий @@ -18,6 +16,7 @@ show_full_text: просмотреть полный текст home: дома informal_essay: эссе photo_wall: Фото стена -netdisc: Сетевой диск +archives: Архив all_articles: Все статьи +friends_link: Дружеская ссылка about_me: Обо мне \ No newline at end of file diff --git a/themes/yilia/languages/zh-CN.yml b/themes/yilia/languages/zh-CN.yml index 832ed5e..30d32dc 100644 --- a/themes/yilia/languages/zh-CN.yml +++ b/themes/yilia/languages/zh-CN.yml @@ -7,8 +7,6 @@ tags: 标签 tag: 标签 prev: 上一页 next: 下一页 -archive_a: 归档 -archive_b: 归档：%s page: 第 %d 页 recent_posts: 最新文章 newer: 新的 @@ -18,6 +16,7 @@ show_full_text: 查看全文 home: 主页 informal_essay: 随笔 photo_wall: 照片墙 -netdisc: 网盘 +archives: 归档 all_articles: 所有文章 +friends_link: 友情链接 about_me: 关于我 \ No newline at end of file diff --git a/themes/yilia/languages/zh-tw.yml b/themes/yilia/languages/zh-tw.yml index d041dc7..212cfdc 100644 --- a/themes/yilia/languages/zh-tw.yml +++ b/themes/yilia/languages/zh-tw.yml @@ -7,8 +7,6 @@ tags: 標籤 tag: 標籤 prev: 上一頁 next: 下一頁 -archive_a: 彙整 -archive_b: 彙整：%s page: 第 %d 頁 recent_posts: 最新文章 newer: 新的 @@ -18,6 +16,7 @@ show_full_text: 查看全文 home: 主頁 informal_essay: 隨筆 photo_wall: 照片墻 -netdisc: 網盤 +archives: 彙整 all_articles: 所有文章 +friends_link: 友情鏈接 about_me: 關於我 \ No newline at end of file diff --git a/themes/yilia/source-src/css/archive.scss b/themes/yilia/source-src/css/archive.scss index adcdbd2..76077b5 100644 --- a/themes/yilia/source-src/css/archive.scss +++ b/themes/yilia/source-src/css/archive.scss @@ -3,7 +3,7 @@ margin: 0 30px; padding-right: 60px; border-bottom: 1px solid #eee; - background: #fff; + background: $colorBg; &:first-child{ margin-top: 30px; } diff --git a/themes/yilia/source-src/css/core/_variables.scss b/themes/yilia/source-src/css/core/_variables.scss index d360992..89cc600 100644 --- a/themes/yilia/source-src/css/core/_variables.scss +++ b/themes/yilia/source-src/css/core/_variables.scss @@ -19,6 +19,7 @@ $fontEn: "Helvetica Neue", Helvetica, Roboto, "Droid San // 背景色，文本色，边框色，链接色 //----------------------------------------------------- $colorText: #333 !default; +$colorBodyBg: #e3d8cc !default; $colorBg: #f0eae3 !default; $colorBorder: #dbdbdb !default; $colorLink: #08c !default; diff --git a/themes/yilia/source-src/css/grid.scss b/themes/yilia/source-src/css/grid.scss index 7b84995..72be606 100644 --- a/themes/yilia/source-src/css/grid.scss +++ b/themes/yilia/source-src/css/grid.scss @@ -7,7 +7,7 @@ body, button, input, select, textarea { } body { overflow-y: hidden; - background:#eaeaea; + background:$colorBodyBg; } html, body, #container { height: 100%; @@ -38,7 +38,7 @@ html, body, #container { position:absolute; right:0; min-height:100%; - background:#e3d8cc; + background:$colorBodyBg; left: 300px; width: auto; @extend %trans;