From 4328bb9ea6052052bcda69584ace3ebc94a5cb2d Mon Sep 17 00:00:00 2001 From: Soitora Date: Fri, 2 Oct 2020 17:32:08 +0200 Subject: [PATCH] Final part of long PR chain (#377) --- src/.vuepress/components/Navigation.vue | 2 +- src/.vuepress/components/VersionTag.vue | 2 +- src/.vuepress/styles/index.styl | 48 +++++++++++++-------- src/help/guides/getting-started.md | 2 +- src/help/guides/source-migration.md | 30 ++++++------- src/help/guides/troubleshooting-problems.md | 2 +- 6 files changed, 49 insertions(+), 37 deletions(-) diff --git a/src/.vuepress/components/Navigation.vue b/src/.vuepress/components/Navigation.vue index cd52c6c9..bc0a3d00 100644 --- a/src/.vuepress/components/Navigation.vue +++ b/src/.vuepress/components/Navigation.vue @@ -100,7 +100,7 @@ export default { font-size 0 .app-icon, .app-label - color $accentColorSecondary + color darken($accentColor, 25%) font-weight 500 font-size 1rem .app-icon diff --git a/src/.vuepress/components/VersionTag.vue b/src/.vuepress/components/VersionTag.vue index 87930843..f2394889 100644 --- a/src/.vuepress/components/VersionTag.vue +++ b/src/.vuepress/components/VersionTag.vue @@ -67,7 +67,7 @@ export default { white-space nowrap .fileNameIcon, .fileName - color $accentColorSecondary + color #23638f font-weight 500 font-size 1em .fileNameIcon diff --git a/src/.vuepress/styles/index.styl b/src/.vuepress/styles/index.styl index bc5111b0..30d8fd55 100644 --- a/src/.vuepress/styles/index.styl +++ b/src/.vuepress/styles/index.styl @@ -12,11 +12,21 @@ font-feature-settings() font-feature-settings arguments // Background color +html + overflow-y scroll + +body + font-family $fontMain + font-size 16px + html, body, .theme-container background-color $backgroundColor +a + color #4a7cf6 + .navbar background-color $backgroundColor .links @@ -26,6 +36,25 @@ body, background-color $backgroundColorSecondary // Custom block containers +.theme-default-content + h1 + font-size 2.25rem + font-weight 500 + h2 + font-size 1.5rem + font-weight 500 + padding-top 0rem !important + padding-bottom .25rem !important + margin-top 2rem !important + margin-bottom 1rem !important + code + padding .25rem .5rem + margin 0 + border-radius .25rem + font-size .8rem + background-color $containerBackground + color $accentColorSecondary + .videolink background-color transparent !important border none !important @@ -37,6 +66,7 @@ body, a, .material-holder color #4a7cf6 + .custom-block padding-left 1.25rem padding-right 1rem @@ -128,18 +158,6 @@ body, .videolink margin-top -1rem -// Expander container -.expander - background-color $containerBackground - border-radius $containerBorderRadius - margin 1rem 0 - padding 1rem 1.5rem - .expansion - user-select none - font-weight bold - &:focus - outline none - // File tree .file-tree font-family $fontCode @@ -287,12 +305,6 @@ body, .sidebar .dropdown-wrapper .dropdown-title pointer-events auto -// Fix weird header spacing -.theme-default-content:not(.custom) > - h2, - h3 - margin-bottom .2rem !important - .el-collapse, .el-tabs, .el-alert, diff --git a/src/help/guides/getting-started.md b/src/help/guides/getting-started.md index 82b753e7..70ea6b99 100644 --- a/src/help/guides/getting-started.md +++ b/src/help/guides/getting-started.md @@ -47,7 +47,7 @@ Check your spelling and try again, there's also the chance that your used source * Some sources use different spellings. > For example **Bungo Stray Dogs** instead of **Bungou Stray Dogs**. * Some sources use different wordings - > For example **3-gatsu no Lion** instead of **Sangatsu no Lion**. + > For example **3-gatsu no Lion** instead of **Sangatsu no Lion**. ::: note Find more potential answers to your questions [here](/help/faq/#why-can-t-i-find-x-manga). ::: diff --git a/src/help/guides/source-migration.md b/src/help/guides/source-migration.md index 0125a879..bd9c967e 100644 --- a/src/help/guides/source-migration.md +++ b/src/help/guides/source-migration.md @@ -20,7 +20,7 @@ Always make sure to have a [backup](/help/guides/creating-backups/) in case anyt ::: 1. Tap into a **Manga** you would like to migrate. -2. Go to and tap . +1. Go to and tap . > **Tachiyomi** will do a global search of all the sources you have installed and enabled. 1. Select the **Source** that you'd like to migrate *to* by tapping the **Manga** thumbnail. 1. Choose which data you want to transfer over, and you're done. @@ -32,9 +32,9 @@ Always make sure to have a [backup](/help/guides/creating-backups/) in case anyt ::: 1. Tap into on the bottom navbar. -2. Press the tab at the top next to . -3. Select the **Source** that you'd like to migrate *from*. -4. Tap the **Manga** you'd like to migrate *from* the **Source**. +1. Press the tab at the top next to . +1. Select the **Source** that you'd like to migrate *from*. +1. Tap the **Manga** you'd like to migrate *from* the **Source**. > **Tachiyomi** will do a global search of all the sources you have installed and enabled. 1. Select the **Source** you'd like to migrate *to* by tapping the **Manga** thumbnail. 1. Choose which data you want to transfer over, and you're done. @@ -97,11 +97,11 @@ Pin sources in using the . -2. Tap → **Source migration**. -3. Select the **Source** you'd like to migrate *from* and select **All**. -4. Select the **Sources** that you'd like to migrate *to* and search by and tap the arrow labeled . at the bottom right. -5. Choose which data you want to transfer over. -6. Wait until all your **Manga** is found and hit the at the top and you're done. +1. Tap → **Source migration**. +1. Select the **Source** you'd like to migrate *from* and select **All**. +1. Select the **Sources** that you'd like to migrate *to* and search by and tap the arrow labeled . at the bottom right. +1. Choose which data you want to transfer over. +1. Wait until all your **Manga** is found and hit the at the top and you're done. > If a manga is not found, or is wrong you can manually search it by pressing → **Search manually**. :::: @@ -111,11 +111,11 @@ Pin sources in using the on the bottom navbar. -2. Press the tab at the top next to . -3. Select the **Source** that you'd like to migrate *from*. -4. Select the **Source** you'd like to migrate *from* and select **All**. -5. Select the **Sources** that you'd like to migrate *to* and search by and tap the arrow labeled . at the bottom right. -6. Choose which data you want to transfer over. -7. Wait until all your **Manga** is found and hit the at the top and you're done. +1. Press the tab at the top next to . +1. Select the **Source** that you'd like to migrate *from*. +1. Select the **Source** you'd like to migrate *from* and select **All**. +1. Select the **Sources** that you'd like to migrate *to* and search by and tap the arrow labeled . at the bottom right. +1. Choose which data you want to transfer over. +1. Wait until all your **Manga** is found and hit the at the top and you're done. > If a manga is not found, or is wrong you can manually search it by pressing → **Search manually**. :::: diff --git a/src/help/guides/troubleshooting-problems.md b/src/help/guides/troubleshooting-problems.md index c0be5523..09680ad0 100644 --- a/src/help/guides/troubleshooting-problems.md +++ b/src/help/guides/troubleshooting-problems.md @@ -6,7 +6,7 @@ lang: en-US # Troubleshooting problems -**This page is for when you encounter a problem with a source extension.** +This page is for when you encounter a problem with a source extension. ::: c-danger Common error messages - HTTP Error 4xx