hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'themes3' into shigusegubu-themes3

Browse source
This commit is contained in:
Henry Jameson 2024-03-04 23:03:09 +02:00
commit bcb12e417e
6 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/App.scss
View file

@ -3,6 +3,8 @@
@import "./panel"; @import "./panel";
:root { :root {
--font-size: 14px;
--status-margin: 0.75em;
--navbar-height: 3.5rem; --navbar-height: 3.5rem;
--post-line-height: 1.4; --post-line-height: 1.4;
// Z-Index stuff // Z-Index stuff
@ -15,7 +17,7 @@
} }
html { html {
font-size: 14px; font-size: var(--font-size);
// overflow-x: clip causes my browser's tab to crash with SIGILL lul // overflow-x: clip causes my browser's tab to crash with SIGILL lul
} }
@ -203,7 +205,6 @@ nav {
--miniColumn: 25rem; --miniColumn: 25rem;
--maxiColumn: 45rem; --maxiColumn: 45rem;
--columnGap: 1em; --columnGap: 1em;
--status-margin: 0.75em;
--effectiveSidebarColumnWidth: minmax(var(--miniColumn), var(--sidebarColumnWidth, var(--miniColumn))); --effectiveSidebarColumnWidth: minmax(var(--miniColumn), var(--sidebarColumnWidth, var(--miniColumn)));
--effectiveNotifsColumnWidth: minmax(var(--miniColumn), var(--notifsColumnWidth, var(--miniColumn))); --effectiveNotifsColumnWidth: minmax(var(--miniColumn), var(--notifsColumnWidth, var(--miniColumn)));
--effectiveContentColumnWidth: minmax(var(--miniColumn), var(--contentColumnWidth, var(--maxiColumn))); --effectiveContentColumnWidth: minmax(var(--miniColumn), var(--contentColumnWidth, var(--maxiColumn)));

6
src/components/chat_list_item/chat_list_item.scss
View file

@ -10,7 +10,7 @@
} }
&:hover { &:hover {
box-shadow: 0 0 3px 1px rgb(0 0 0 / 10%); box-shadow: var(--shadow);
} }
.chat-list-item-left { .chat-list-item-left {
@ -49,12 +49,12 @@
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
margin: 0.35em 0; margin: 0.35em 0;
color: var(--faintText); color: var(--textFaint);
width: 100%; width: 100%;
} }
a { a {
color: var(--faintLink); color: var(--linkFaint);
text-decoration: none; text-decoration: none;
pointer-events: none; pointer-events: none;
} }

2
src/components/conversation/conversation.vue
View file

@ -31,7 +31,7 @@
<div <div
class="conversation-body" class="conversation-body"
:class="{ 'panel-body': isExpanded }" :class="{ 'panel-body': isExpanded }"
> >
<div <div
v-if="isTreeView" v-if="isTreeView"
class="thread-body" class="thread-body"

6
src/components/poll/poll.vue
View file

@ -37,8 +37,8 @@
:role="poll.multiple ? 'checkbox' : 'radio'" :role="poll.multiple ? 'checkbox' : 'radio'"
:aria-labelledby="`option-vote-${randomSeed}-${index}`" :aria-labelledby="`option-vote-${randomSeed}-${index}`"
:aria-checked="choices[index]" :aria-checked="choices[index]"
@click="activateOption(index)"
class="input unstyled" class="input unstyled"
@click="activateOption(index)"
> >
<!-- TODO: USE CHECKBOX --> <!-- TODO: USE CHECKBOX -->
<input <input
@ -112,6 +112,10 @@
.poll-option { .poll-option {
margin: 0.75em 0.5em; margin: 0.75em 0.5em;
.input {
line-height: inherit;
}
} }
.option-result { .option-result {

2
src/components/settings_modal/tabs/theme_tab/preview.vue
View file

@ -81,7 +81,7 @@
class="faint" class="faint"
scope="global" scope="global"
> >
<a style="color: var(--faintLink);"> <a style="color: var(--linkFaint);">
{{ $t('settings.style.preview.faint_link') }} {{ $t('settings.style.preview.faint_link') }}
</a> </a>
</i18n-t> </i18n-t>

10
src/components/user_profile/user_profile.vue
View file

@ -77,7 +77,10 @@
:label="$t('user_card.followees')" :label="$t('user_card.followees')"
:disabled="!user.friends_count" :disabled="!user.friends_count"
> >
<FriendList :user-id="userId" :non-interactive="true"> <FriendList
:user-id="userId"
:non-interactive="true"
>
<template #item="{item}"> <template #item="{item}">
<FollowCard :user="item" /> <FollowCard :user="item" />
</template> </template>
@ -89,7 +92,10 @@
:label="$t('user_card.followers')" :label="$t('user_card.followers')"
:disabled="!user.followers_count" :disabled="!user.followers_count"
> >
<FollowerList :user-id="userId" :non-interactive="true"> <FollowerList
:user-id="userId"
:non-interactive="true"
>
<template #item="{item}"> <template #item="{item}">
<FollowCard <FollowCard
:user="item" :user="item"