From 46fe58d05212514a44044bde487834e875ed9e77 Mon Sep 17 00:00:00 2001 From: Rui Date: Sat, 9 Jun 2018 14:16:38 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=B9=E3=82=BF=E3=82=A4=E3=83=AB=E3=81=AE?= =?UTF-8?q?=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _includes/details-map.md | 32 ++++++------ _includes/details-mod.md | 66 ++++++++++++------------ _includes/details-subgame.md | 32 ++++++------ _includes/details-texturepack.md | 32 ++++++------ _includes/details-tool.md | 38 +++++++------- _includes/style.scss | 19 ++++--- _sass/_article.scss | 6 +++ _sass/_mobile.scss | 7 --- _sass/_screenshot.scss | 2 +- _sass/_toc.scss | 17 ++++++ wiki/index.md | 8 +-- wiki/mod-manuals/mod-manual-pipeworks.md | 16 ++---- 12 files changed, 145 insertions(+), 130 deletions(-) create mode 100644 _sass/_toc.scss diff --git a/_includes/details-map.md b/_includes/details-map.md index 3e88b22..8e55f6b 100644 --- a/_includes/details-map.md +++ b/_includes/details-map.md @@ -7,6 +7,22 @@ {% endcomment %} {% assign details = "" | split: "|" %} +{% comment %} +製作者 +{% endcomment %} +{% assign author = "" | split: "|" %} +{% assign author = author | push: "製作者" %} +{% assign author = author | push: data.author %} +{% assign details = details | push: author %} + +{% comment %} +説明 +{% endcomment %} +{% assign description = "" | split: "|" %} +{% assign description = description | push: "説明" %} +{% assign description = description | push: data.description %} +{% assign details = details | push: description %} + {% comment %} リンク {% endcomment %} @@ -24,22 +40,6 @@ {% assign details = details | push: links %} {% endif %} -{% comment %} -製作者 -{% endcomment %} -{% assign author = "" | split: "|" %} -{% assign author = author | push: "製作者" %} -{% assign author = author | push: data.author %} -{% assign details = details | push: author %} - -{% comment %} -説明 -{% endcomment %} -{% assign description = "" | split: "|" %} -{% assign description = description | push: "説明" %} -{% assign description = description | push: data.description %} -{% assign details = details | push: description %} - {% comment %} テンプレートをインクルード {% endcomment %} diff --git a/_includes/details-mod.md b/_includes/details-mod.md index 7e5f32f..20e4d1d 100644 --- a/_includes/details-mod.md +++ b/_includes/details-mod.md @@ -7,39 +7,6 @@ {% endcomment %} {% assign details = "" | split: "|" %} -{% comment %} -リンク -{% endcomment %} -{% if data.links %} - {% capture link_list %} - {% for link_data in data.links %} - {% if forloop.first != true %}/{% endif %} - {{ link_data.text }} - {% endfor %} - {% endcapture %} - - {% assign links = "" | split: "|" %} - {% assign links = links | push: "リンク" %} - {% assign links = links | push: link_list %} - {% assign details = details | push: links %} -{% endif %} - -{% comment %} -開発者 -{% endcomment %} -{% assign author = "" | split: "|" %} -{% assign author = author | push: "開発者" %} -{% assign author = author | push: data.author %} -{% assign details = details | push: author %} - -{% comment %} -説明 -{% endcomment %} -{% assign description = "" | split: "|" %} -{% assign description = description | push: "説明" %} -{% assign description = description | push: data.description %} -{% assign details = details | push: description %} - {% comment %} 依存Mod {% endcomment %} @@ -80,6 +47,39 @@ {% assign details = details | push: depends_optional %} {% endif %} +{% comment %} +開発者 +{% endcomment %} +{% assign author = "" | split: "|" %} +{% assign author = author | push: "開発者" %} +{% assign author = author | push: data.author %} +{% assign details = details | push: author %} + +{% comment %} +説明 +{% endcomment %} +{% assign description = "" | split: "|" %} +{% assign description = description | push: "説明" %} +{% assign description = description | push: data.description %} +{% assign details = details | push: description %} + +{% comment %} +リンク +{% endcomment %} +{% if data.links %} + {% capture link_list %} + {% for link_data in data.links %} + {% if forloop.first != true %}/{% endif %} + {{ link_data.text }} + {% endfor %} + {% endcapture %} + + {% assign links = "" | split: "|" %} + {% assign links = links | push: "リンク" %} + {% assign links = links | push: link_list %} + {% assign details = details | push: links %} +{% endif %} + {% comment %} テンプレートをインクルード {% endcomment %} diff --git a/_includes/details-subgame.md b/_includes/details-subgame.md index c24dc4f..808c5cc 100644 --- a/_includes/details-subgame.md +++ b/_includes/details-subgame.md @@ -7,6 +7,22 @@ {% endcomment %} {% assign details = "" | split: "|" %} +{% comment %} +開発者 +{% endcomment %} +{% assign author = "" | split: "|" %} +{% assign author = author | push: "開発者" %} +{% assign author = author | push: data.author %} +{% assign details = details | push: author %} + +{% comment %} +説明 +{% endcomment %} +{% assign description = "" | split: "|" %} +{% assign description = description | push: "説明" %} +{% assign description = description | push: data.description %} +{% assign details = details | push: description %} + {% comment %} リンク {% endcomment %} @@ -24,22 +40,6 @@ {% assign details = details | push: links %} {% endif %} -{% comment %} -開発者 -{% endcomment %} -{% assign author = "" | split: "|" %} -{% assign author = author | push: "開発者" %} -{% assign author = author | push: data.author %} -{% assign details = details | push: author %} - -{% comment %} -説明 -{% endcomment %} -{% assign description = "" | split: "|" %} -{% assign description = description | push: "説明" %} -{% assign description = description | push: data.description %} -{% assign details = details | push: description %} - {% comment %} テンプレートをインクルード {% endcomment %} diff --git a/_includes/details-texturepack.md b/_includes/details-texturepack.md index 3e88b22..8e55f6b 100644 --- a/_includes/details-texturepack.md +++ b/_includes/details-texturepack.md @@ -7,6 +7,22 @@ {% endcomment %} {% assign details = "" | split: "|" %} +{% comment %} +製作者 +{% endcomment %} +{% assign author = "" | split: "|" %} +{% assign author = author | push: "製作者" %} +{% assign author = author | push: data.author %} +{% assign details = details | push: author %} + +{% comment %} +説明 +{% endcomment %} +{% assign description = "" | split: "|" %} +{% assign description = description | push: "説明" %} +{% assign description = description | push: data.description %} +{% assign details = details | push: description %} + {% comment %} リンク {% endcomment %} @@ -24,22 +40,6 @@ {% assign details = details | push: links %} {% endif %} -{% comment %} -製作者 -{% endcomment %} -{% assign author = "" | split: "|" %} -{% assign author = author | push: "製作者" %} -{% assign author = author | push: data.author %} -{% assign details = details | push: author %} - -{% comment %} -説明 -{% endcomment %} -{% assign description = "" | split: "|" %} -{% assign description = description | push: "説明" %} -{% assign description = description | push: data.description %} -{% assign details = details | push: description %} - {% comment %} テンプレートをインクルード {% endcomment %} diff --git a/_includes/details-tool.md b/_includes/details-tool.md index 677aab1..9be33fd 100644 --- a/_includes/details-tool.md +++ b/_includes/details-tool.md @@ -8,20 +8,13 @@ {% assign details = "" | split: "|" %} {% comment %} -リンク +プラットフォーム {% endcomment %} -{% if data.links %} - {% capture link_list %} - {% for link_data in data.links %} - {% if forloop.first != true %}/{% endif %} - {{ link_data.text }} - {% endfor %} - {% endcapture %} - - {% assign links = "" | split: "|" %} - {% assign links = links | push: "リンク" %} - {% assign links = links | push: link_list %} - {% assign details = details | push: links %} +{% if data.platform %} + {% assign platform = "" | split: "|" %} + {% assign platform = platform | push: "プラットフォーム" %} + {% assign platform = platform | push: data.platform %} + {% assign details = details | push: platform %} {% endif %} {% comment %} @@ -41,13 +34,20 @@ {% assign details = details | push: description %} {% comment %} -プラットフォーム +リンク {% endcomment %} -{% if data.platform %} - {% assign platform = "" | split: "|" %} - {% assign platform = platform | push: "プラットフォーム" %} - {% assign platform = platform | push: data.platform %} - {% assign details = details | push: platform %} +{% if data.links %} + {% capture link_list %} + {% for link_data in data.links %} + {% if forloop.first != true %}/{% endif %} + {{ link_data.text }} + {% endfor %} + {% endcapture %} + + {% assign links = "" | split: "|" %} + {% assign links = links | push: "リンク" %} + {% assign links = links | push: link_list %} + {% assign details = details | push: links %} {% endif %} {% comment %} diff --git a/_includes/style.scss b/_includes/style.scss index 38e198f..170d30e 100644 --- a/_includes/style.scss +++ b/_includes/style.scss @@ -19,14 +19,14 @@ $font-color: #333; $font-family: "Hiragino Kaku Gothic ProN", "Helvetica Neue", "meiryo", "arial", "sans-serif"; $font-size: 18px; $font-size-mobile: 16px; -$letter-spacing: 0.075em; -$line-height: 1.3; +$letter-spacing: 0.005em; +$line-height: 1.5; $selection-background: #659b4b; $selection-font-color: #fff; // コンテナ $container-box-shadow: 0 0 10px 0 #ddd; -$container-columns: 30% 70%; +$container-columns: 25% 75%; $container-padding-top-mobile: 1em; $container-max-width: 1024px; @@ -55,13 +55,18 @@ $article-h6-border-bottom: none; $article-h6-font-size: 1em; // 本文 - ソースコード -$article-code-background: #f5f5f5; +$article-code-background: #fcfcfc; $article-code-border: 1px solid #ccc; -$article-code-border-radius: 4px; +$article-code-border-radius: 10px; $article-code-color: #333; $article-code-font-family: Menlo, Monaco, Consolas, "Courier New", monospace; $article-pre-code-padding: 9.5px; +// 本文 - 目次 +$toc-background: #fcfcfc; +$toc-border: 1px solid #ccc; +$toc-border-radius: 10px; + // フッタ $footer-background: #333; $footer-text-color: #fff; @@ -69,10 +74,8 @@ $footer-text-color: #fff; // モバイルメニュー $mobile-menu-background: #555; $mobile-menu-text-color: #fff; -$mobile-menu-width: 70vw; // Modなどのスクリーンショット -$screenshot-background: #eee; $screenshot-max-height: 250px; $screenshot-max-width: 500px; @@ -85,4 +88,6 @@ $screenshot-max-width: 500px; @import "article"; @import "footer"; @import "mobile"; + +@import "toc"; @import "screenshot"; diff --git a/_sass/_article.scss b/_sass/_article.scss index 861d6cb..14c722b 100644 --- a/_sass/_article.scss +++ b/_sass/_article.scss @@ -125,5 +125,11 @@ display: block; padding: $article-pre-code-padding; } + + dl { + dt { + font-style: normal; + } + } } } diff --git a/_sass/_mobile.scss b/_sass/_mobile.scss index 2defb82..4e64745 100644 --- a/_sass/_mobile.scss +++ b/_sass/_mobile.scss @@ -3,8 +3,6 @@ amp-sidebar { background: $mobile-menu-background; color: $mobile-menu-text-color; padding: 1em; - text-align: center; - width: $mobile-menu-width; a { &:link, @@ -19,12 +17,7 @@ amp-sidebar { button { background: transparent; border: none; - display: block; - left: 0; object-fit: contain; - padding: 1em; - position: absolute; - top: 0; } h1, diff --git a/_sass/_screenshot.scss b/_sass/_screenshot.scss index 30ffdb6..8234f16 100644 --- a/_sass/_screenshot.scss +++ b/_sass/_screenshot.scss @@ -1,10 +1,10 @@ // スクリーンショット .screenshot { - background: $screenshot-background; max-height: $screenshot-max-height; max-width: $screenshot-max-width; img { object-fit: contain; + object-position: 0%; } } diff --git a/_sass/_toc.scss b/_sass/_toc.scss new file mode 100644 index 0000000..83ef513 --- /dev/null +++ b/_sass/_toc.scss @@ -0,0 +1,17 @@ +#markdown-toc { + background: $toc-background; + border: $toc-border; + border-radius: $toc-border-radius; + display: inline-block; + padding-top: 1em; + padding-right: 1em; + padding-bottom: 1em; + + &::before { + content: "目次"; + display: block; + font-weight: bold; + margin-left: calc(1em - 40px); + padding-bottom: 0.5em; + } +} diff --git a/wiki/index.md b/wiki/index.md index 2aff932..514d9fd 100644 --- a/wiki/index.md +++ b/wiki/index.md @@ -25,15 +25,15 @@ custom-head: >- # Minetestとは？ -[Minetest](http://www.minetest.net)は、InfiniMinerや[Minecraft](https://minecraft.net)に似たフリーゲームです。 +**Minetest** (マインテスト) は、InfiniMinerやMinecraftに似たフリーゲームです。 ソースコードは[GitHub](https://github.com/minetest/minetest)にあり、LGPLライセンスのもとで公開されています。 -Minetestは厳密にはゲームエンジンであり、Minetest Gameと呼ばれるゲームが同梱されています。 +Minetestは**厳密にはゲームエンジン**であり、**Minetest Game**と呼ばれるゲームが同梱されています。 Minetest Gameでは、ブロックで建築したり、洞窟を探検したり、作物を育てたりできます。 公式フォーラムではMinetest Game以外のゲームも配布されています。 -MinetestはModとテクスチャパックに対応しています。 +Minetestは**Modとテクスチャパックに対応**しています。 Modにはブロックを追加するものからワールド全体を変えるものまで様々です。 このWikiのModリストや、公式フォーラムから探してみましょう。 -現在のMinetestのバージョンは{{ site.minetest.latest_version }}です。アップデートの内容は[アップデート情報](changelog)をご覧ください。 +現在のMinetestのバージョンは**{{ site.minetest.latest_version }}**です。アップデートの内容は[アップデート情報](changelog)をご覧ください。 diff --git a/wiki/mod-manuals/mod-manual-pipeworks.md b/wiki/mod-manuals/mod-manual-pipeworks.md index cec3ebc..7f8866b 100644 --- a/wiki/mod-manuals/mod-manual-pipeworks.md +++ b/wiki/mod-manuals/mod-manual-pipeworks.md @@ -182,34 +182,28 @@ MeseconsとDigilinesに依存していますが、無い場合は必要な機能
単純な文字列による指定
- 

-"default:wood 2" -- default:woodが2個
-
+ 
"default:wood 2" -- default:woodが2個
テーブルによる指定その１
- 

-{
+        
{
   exmatch=false,      -- Exact matchがOFF
   "default:wood 2",   -- default:woodが2個
   "default:pine_wood" -- default:pine_woodが1個
-}
-          

+}
テーブルによる指定その２
- 

-{
+        
{
   slotseq="random",              -- Sequence slots Randomly
   nofire=false,                  -- nofireがtrueの場合、アイテムを搬出しない
   exmatch=true,                  -- Exact matchがON
   {name="default:wood",count=2}, -- default:woodが2個
   {name="default:pine_wood"},    -- default:pine_woodが1スタック全部
   {group="wood", count=3}        -- woodグループのものが3個
-}
-        

+}