From 34ce510fbd8a684b70af8480ca408255d697c623 Mon Sep 17 00:00:00 2001 From: Jai A Date: Tue, 20 Oct 2020 22:33:49 -0700 Subject: [PATCH] Mod pages base --- assets/images/utils/download.svg | 5 + assets/images/utils/external.svg | 1 + assets/images/utils/info.svg | 1 + assets/images/utils/save.svg | 1 + assets/images/utils/version.svg | 1 + assets/styles/components.scss | 53 +++++ assets/styles/global.scss | 6 +- components/ModResult.vue | 19 +- layouts/default.vue | 1 + pages/mod/_id.vue | 74 ------ pages/mod/_id/index.vue | 394 +++++++++++++++++++++++++++++++ pages/mod/_id/versions.vue | 0 pages/mod/create.vue | 6 +- pages/user/_id.vue | 8 +- 14 files changed, 474 insertions(+), 96 deletions(-) create mode 100644 assets/images/utils/download.svg create mode 100644 assets/images/utils/external.svg create mode 100644 assets/images/utils/info.svg create mode 100644 assets/images/utils/save.svg create mode 100644 assets/images/utils/version.svg delete mode 100644 pages/mod/_id.vue create mode 100644 pages/mod/_id/index.vue create mode 100644 pages/mod/_id/versions.vue diff --git a/assets/images/utils/download.svg b/assets/images/utils/download.svg new file mode 100644 index 000000000..ea67b61ce --- /dev/null +++ b/assets/images/utils/download.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/images/utils/external.svg b/assets/images/utils/external.svg new file mode 100644 index 000000000..0520b0f94 --- /dev/null +++ b/assets/images/utils/external.svg @@ -0,0 +1 @@ + diff --git a/assets/images/utils/info.svg b/assets/images/utils/info.svg new file mode 100644 index 000000000..79010d768 --- /dev/null +++ b/assets/images/utils/info.svg @@ -0,0 +1 @@ + diff --git a/assets/images/utils/save.svg b/assets/images/utils/save.svg new file mode 100644 index 000000000..a7be5d637 --- /dev/null +++ b/assets/images/utils/save.svg @@ -0,0 +1 @@ + diff --git a/assets/images/utils/version.svg b/assets/images/utils/version.svg new file mode 100644 index 000000000..92c6a2e61 --- /dev/null +++ b/assets/images/utils/version.svg @@ -0,0 +1 @@ + diff --git a/assets/styles/components.scss b/assets/styles/components.scss index 6065a199f..76f401d92 100644 --- a/assets/styles/components.scss +++ b/assets/styles/components.scss @@ -54,3 +54,56 @@ color: #675027; } } + +.markdown-body { + p { + padding: 0; + margin: 0; + line-height: 1.5; + word-wrap: break-word; + } + + h1, h2 { + padding: 10px 0 5px; + border-bottom: 1px solid var(--color-grey-3); + } + + blockquote { + margin: 15px 0; + padding: 0 1em; + color: var(--color-grey-5); + border-left: .25em solid var(--color-grey-3); + } + + a { + color: var(--color-link); + } + + img { + max-width: 100%; + } + + pre { + padding: 15px 10px; + border-radius: var(--size-rounded-sm); + background-color: var(--color-grey-1); + + code { + font-size: 80%; + padding: 0; + border-radius: 0; + } + } + + code { + padding: .2em .4em; + font-size: 60%; + border-radius: var(--size-rounded-sm); + background-color: var(--color-grey-1) + } + + hr { + margin: 20px 0; + color: var(--color-grey-2); + } +} diff --git a/assets/styles/global.scss b/assets/styles/global.scss index 8f645020c..e9874032c 100644 --- a/assets/styles/global.scss +++ b/assets/styles/global.scss @@ -15,6 +15,8 @@ --color-grey-5: #718096; --color-grey-6: #4a5568; --color-grey-7: #2d3748; + + --color-link: #2089ff; } .dark-mode { @@ -29,11 +31,13 @@ --color-grey-7: #f7faf0; --color-grey-6: #f7f2eb; --color-grey-5: #ede9e4; - --color-grey-4: #dadcd5; + --color-grey-4: #b3b3b3; --color-grey-3: #797b76; --color-grey-2: #3b3937; --color-grey-1: #3a3b38; --color-grey-0: #1d1e1b; + + --color-link: #4793d9; } body { diff --git a/components/ModResult.vue b/components/ModResult.vue index 17d1181b8..b4791f7f0 100644 --- a/components/ModResult.vue +++ b/components/ModResult.vue @@ -18,20 +18,7 @@

- - - - - +

{{ formatNumber(downloads) }}

@@ -133,6 +120,7 @@ - - diff --git a/pages/mod/_id/index.vue b/pages/mod/_id/index.vue new file mode 100644 index 000000000..d590f36cd --- /dev/null +++ b/pages/mod/_id/index.vue @@ -0,0 +1,394 @@ + + + + + diff --git a/pages/mod/_id/versions.vue b/pages/mod/_id/versions.vue new file mode 100644 index 000000000..e69de29bb diff --git a/pages/mod/create.vue b/pages/mod/create.vue index 5020ee1d7..414ccd2af 100644 --- a/pages/mod/create.vue +++ b/pages/mod/create.vue @@ -114,7 +114,7 @@
@@ -286,7 +286,7 @@ import Multiselect from 'vue-multiselect' import xss from 'xss' import marked from 'marked' -import ExitIcon from '~/assets/images/utils/exit.svg?inline' +import SaveIcon from '~/assets/images/utils/save.svg?inline' import TrashIcon from '~/assets/images/utils/trash.svg?inline' import EditIcon from '~/assets/images/utils/edit.svg?inline' import PlusIcon from '~/assets/images/utils/plus.svg?inline' @@ -297,7 +297,7 @@ export default { TrashIcon, EditIcon, PlusIcon, - ExitIcon, + SaveIcon, }, async asyncData() { let res = await axios.get(`https://api.modrinth.com/api/v1/tag/category`) diff --git a/pages/user/_id.vue b/pages/user/_id.vue index e041bbed6..f6999c7d6 100644 --- a/pages/user/_id.vue +++ b/pages/user/_id.vue @@ -5,7 +5,7 @@

{{ user.username }}

Joined {{ $dayjs(user.created).fromNow() }}

-

{{ user.bio }}

+

{{ user.bio }}

Admin

Moderator

Developer

@@ -83,7 +83,9 @@ export default { } .info { - margin-left: 15px; + @media screen and (min-width: 900px) { + margin-left: 15px; + } h1 { margin-bottom: 0; @@ -91,7 +93,7 @@ export default { .joined-text { margin-top: 5px; - color: var(--color-grey-3); + color: var(--color-grey-4); } .bio {