Add modpack page warning + Fix notifications nav titles

This commit is contained in:
venashial 2022-05-15 18:27:02 -07:00
parent 46d1537d8f
commit 720739e50a
6 changed files with 82 additions and 19 deletions

View File

@ -113,6 +113,7 @@
&:hover { &:hover {
color: var(--color-link-hover); color: var(--color-link-hover);
} }
&:active { &:active {
color: var(--color-link-active); color: var(--color-link-active);
} }
@ -125,6 +126,7 @@
&:hover { &:hover {
color: var(--color-heading); color: var(--color-heading);
} }
&:active { &:active {
color: var(--color-text-dark); color: var(--color-text-dark);
} }
@ -171,6 +173,7 @@
&:hover { &:hover {
color: var(--color-link-hover); color: var(--color-link-hover);
} }
&:active { &:active {
color: var(--color-link-active); color: var(--color-link-active);
} }
@ -242,6 +245,7 @@
padding: 0.5rem 0.8rem; padding: 0.5rem 0.8rem;
cursor: pointer; cursor: pointer;
background-color: var(--color-button-bg); background-color: var(--color-button-bg);
&:hover { &:hover {
background-color: var(--color-button-bg-hover); background-color: var(--color-button-bg-hover);
} }
@ -366,13 +370,16 @@
background-color: var(--color-button-bg); background-color: var(--color-button-bg);
font-weight: var(--font-weight-medium); font-weight: var(--font-weight-medium);
font-size: var(--font-size-nm); font-size: var(--font-size-nm);
&:focus-visible, &:focus-visible,
&:hover { &:hover {
background-color: var(--color-button-bg-hover); background-color: var(--color-button-bg-hover);
} }
&:active { &:active {
background-color: var(--color-button-bg-active); background-color: var(--color-button-bg-active);
} }
&:disabled, &:disabled,
&[disabled] { &[disabled] {
background-color: transparent; background-color: transparent;
@ -411,11 +418,13 @@
@extend .button; @extend .button;
color: var(--color-brand-inverted); color: var(--color-brand-inverted);
background-color: var(--color-brand); background-color: var(--color-brand);
&:focus-visible, &:focus-visible,
&:hover { &:hover {
background-color: var(--color-brand-hover); background-color: var(--color-brand-hover);
color: var(--color-brand-inverted); color: var(--color-brand-inverted);
} }
&:active { &:active {
background-color: var(--color-brand-active); background-color: var(--color-brand-active);
color: var(--color-brand-inverted); color: var(--color-brand-inverted);
@ -426,11 +435,13 @@
box-shadow: inset 0px -1px 1px rgba(0, 0, 0, 0.25); box-shadow: inset 0px -1px 1px rgba(0, 0, 0, 0.25);
color: var(--color-brand-inverted); color: var(--color-brand-inverted);
background-color: var(--color-brand); background-color: var(--color-brand);
&:focus-visible, &:focus-visible,
&:hover { &:hover {
background-color: var(--color-brand-hover); background-color: var(--color-brand-hover);
color: var(--color-brand-inverted); color: var(--color-brand-inverted);
} }
&:active { &:active {
background-color: var(--color-brand-active); background-color: var(--color-brand-active);
color: var(--color-brand-inverted); color: var(--color-brand-inverted);
@ -470,27 +481,33 @@
background: var(--color-button-bg-hover); background: var(--color-button-bg-hover);
} }
} }
.multiselect__single { .multiselect__single {
background: transparent; background: transparent;
} }
.multiselect__tag { .multiselect__tag {
border-radius: 2rem; border-radius: 2rem;
color: var(--color-text-dark); color: var(--color-text-dark);
background: transparent; background: transparent;
border: 2px solid var(--color-brand); border: 2px solid var(--color-brand);
} }
.multiselect__tag-icon { .multiselect__tag-icon {
background: transparent; background: transparent;
&:after { &:after {
color: var(--color-text-dark); color: var(--color-text-dark);
} }
} }
.multiselect__placeholder { .multiselect__placeholder {
color: var(--color-text); color: var(--color-text);
font-size: 16px; font-size: 16px;
line-height: 20px; line-height: 20px;
} }
} }
.multiselect__content-wrapper { .multiselect__content-wrapper {
background: var(--color-dropdown-bg); background: var(--color-dropdown-bg);
border: none; border: none;
@ -503,6 +520,7 @@
background: var(--color-button-bg-active); background: var(--color-button-bg-active);
color: var(--color-text-dark); color: var(--color-text-dark);
} }
.multiselect__option--selected { .multiselect__option--selected {
background: var(--color-brand); background: var(--color-brand);
font-weight: bold; font-weight: bold;
@ -510,6 +528,7 @@
} }
} }
} }
.multiselect__spinner { .multiselect__spinner {
background: var(--color-dropdown-bg); background: var(--color-dropdown-bg);
@ -557,6 +576,7 @@ label {
height: fit-content; height: fit-content;
flex: 1; flex: 1;
} }
input[type='button']:hover { input[type='button']:hover {
cursor: pointer; cursor: pointer;
} }
@ -566,6 +586,7 @@ label {
height: fit-content; height: fit-content;
flex: 1; flex: 1;
} }
div:hover { div:hover {
cursor: pointer; cursor: pointer;
} }
@ -586,6 +607,7 @@ label {
appearance: none; appearance: none;
-webkit-tap-highlight-color: transparent; -webkit-tap-highlight-color: transparent;
cursor: pointer; cursor: pointer;
&:focus { &:focus {
//outline: 0; Bad for accessibility //outline: 0; Bad for accessibility
} }
@ -616,17 +638,21 @@ label {
box-shadow: 0 1px 2px rgba(44, 44, 44, 0.2); box-shadow: 0 1px 2px rgba(44, 44, 44, 0.2);
transition: all 0.2s cubic-bezier(0.5, 0.1, 0.75, 1.35); transition: all 0.2s cubic-bezier(0.5, 0.1, 0.75, 1.35);
} }
&:checked { &:checked {
background: var(--color-brand); background: var(--color-brand);
border: 2px solid var(--color-brand); border: 2px solid var(--color-brand);
&:after { &:after {
transform: translatex(20px); transform: translatex(20px);
} }
} }
&:hover &:focus { &:hover &:focus {
background: var(--color-button-bg); background: var(--color-button-bg);
border: 2px solid var(--color-button-bg); border: 2px solid var(--color-button-bg);
} }
&:hover:checked &:focus:checked { &:hover:checked &:focus:checked {
background: var(--color-brand); background: var(--color-brand);
border: 2px solid var(--color-brand); border: 2px solid var(--color-brand);
@ -655,6 +681,7 @@ label {
width: 1.25rem; width: 1.25rem;
margin: auto; margin: auto;
} }
flex-shrink: 0; flex-shrink: 0;
} }
@ -743,16 +770,19 @@ label {
width: 100%; width: 100%;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.icon { .icon {
width: 8rem; width: 8rem;
height: 8rem; height: 8rem;
margin: 1.5rem 0; margin: 1.5rem 0;
} }
.text { .text {
margin-bottom: 2rem; margin-bottom: 2rem;
font-size: 1.25rem; font-size: 1.25rem;
text-align: center; text-align: center;
} }
.link { .link {
text-decoration: underline; text-decoration: underline;
} }
@ -768,6 +798,20 @@ label {
margin-bottom: var(--spacing-card-md); margin-bottom: var(--spacing-card-md);
// box-shadow: var(--shadow-card); // box-shadow: var(--shadow-card);
&.warning {
padding: 1.5rem;
line-height: 1.5;
background-color: var(--color-warning-bg);
color: var(--color-warning-text);
min-height: 0;
a {
/* Uses active color to increase contrast */
color: var(--color-link-active);
text-decoration: underline;
}
}
} }
.vue-notification-group { .vue-notification-group {

View File

@ -9,7 +9,11 @@
loading="lazy" loading="lazy"
/> />
</nuxt-link> </nuxt-link>
<Categories :categories="categories" class="left-categories" /> <Categories
:categories="categories"
:type="type"
class="left-categories"
/>
</div> </div>
<div class="card-content"> <div class="card-content">
<div class="info"> <div class="info">
@ -19,9 +23,9 @@
</h2> </h2>
<p v-if="author" class="author"> <p v-if="author" class="author">
by by
<nuxt-link class="title-link" :to="'/user/' + author">{{ <nuxt-link class="title-link" :to="'/user/' + author"
author >{{ author }}
}}</nuxt-link> </nuxt-link>
</p> </p>
</div> </div>
<div class="side-type"> <div class="side-type">

View File

@ -228,7 +228,7 @@ export default {
** See https://axios.nuxtjs.org/options ** See https://axios.nuxtjs.org/options
*/ */
axios: { axios: {
baseURL: 'https://api.modrinth.com/v2/', baseURL: 'https://staging-api.modrinth.com/v2/',
headers: { headers: {
common: { common: {
Accept: 'application/json', Accept: 'application/json',

View File

@ -433,6 +433,19 @@
/> />
<div class="content"> <div class="content">
<div class="project-main"> <div class="project-main">
<div v-if="project.project_type === 'modpack'" class="card warning">
To install this modpack, visit
<a
href="https://docs.modrinth.com/docs/modpacks/playing_modpacks/"
target="_blank"
>our documentation</a
>
which provides instructions on using
<a href="https://atlauncher.com/about" target="_blank"
>ATLauncher</a
>
and <a href="https://multimc.org/" target="_blank">MultiMC</a>.
</div>
<div class="card styled-tabs"> <div class="card styled-tabs">
<nuxt-link <nuxt-link
:to="`/${project.project_type}/${ :to="`/${project.project_type}/${
@ -833,6 +846,7 @@ export default {
font-size: var(--font-size-lg); font-size: var(--font-size-lg);
font-weight: bold; font-weight: bold;
} }
.label { .label {
margin-right: 0.125rem; margin-right: 0.125rem;
} }
@ -840,6 +854,7 @@ export default {
.dates { .dates {
margin: 0.75rem 0; margin: 0.75rem 0;
.date { .date {
color: var(--color-text-secondary); color: var(--color-text-secondary);
font-size: var(--font-size-nm); font-size: var(--font-size-nm);
@ -890,6 +905,7 @@ export default {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
margin-top: var(--spacing-card-md); margin-top: var(--spacing-card-md);
.download { .download {
display: flex; display: flex;
align-items: center; align-items: center;
@ -915,9 +931,11 @@ export default {
flex-shrink: 0; flex-shrink: 0;
} }
.info { .info {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.top { .top {
font-weight: bold; font-weight: bold;
} }
@ -950,6 +968,7 @@ export default {
color: var(--color-heading); color: var(--color-heading);
} }
} }
&:active { &:active {
svg, svg,
img, img,
@ -974,12 +993,15 @@ export default {
height: 50px; height: 50px;
width: 50px; width: 50px;
} }
.member-info { .member-info {
overflow: hidden; overflow: hidden;
margin: auto 0 auto 0.5rem; margin: auto 0 auto 0.5rem;
.name { .name {
font-weight: bold; font-weight: bold;
} }
p { p {
font-size: var(--font-size-sm); font-size: var(--font-size-sm);
margin: 0.2rem 0; margin: 0.2rem 0;
@ -997,6 +1019,7 @@ export default {
color: var(--color-text-secondary); color: var(--color-text-secondary);
width: 40%; width: 40%;
} }
.value { .value {
width: 50%; width: 50%;
text-transform: capitalize; text-transform: capitalize;
@ -1005,6 +1028,7 @@ export default {
text-transform: none; text-transform: none;
} }
} }
.uppercase { .uppercase {
text-transform: uppercase; text-transform: uppercase;
} }

View File

@ -104,7 +104,9 @@ export default {
notificationTypes() { notificationTypes() {
const obj = { all: true } const obj = { all: true }
for (const notification of this.$user.notifications) { for (const notification of this.$user.notifications.filter(
(it) => it.type !== null
)) {
obj[ obj[
Object.keys(NOTIFICATION_TYPES).find( Object.keys(NOTIFICATION_TYPES).find(
(key) => NOTIFICATION_TYPES[key] === notification.type (key) => NOTIFICATION_TYPES[key] === notification.type
@ -112,6 +114,8 @@ export default {
] = true ] = true
} }
console.log(obj)
return Object.keys(obj) return Object.keys(obj)
}, },
}, },

View File

@ -624,19 +624,6 @@ export default {
margin: 1.5rem 0 0.5rem 0; margin: 1.5rem 0 0.5rem 0;
} }
.warning {
padding: 1.5rem;
line-height: 1.5;
background-color: var(--color-warning-bg);
color: var(--color-warning-text);
a {
/* Uses active color to increase contrast */
color: var(--color-link-active);
text-decoration: underline;
}
}
.search-controls { .search-controls {
display: flex; display: flex;
flex-direction: row; flex-direction: row;