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

Merge branch 'develop' of https://akkoma.dev/AkkomaGang/pleroma-fe into froth-akkoma
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
Sam Therapy 2023-05-23 00:01:22 +02:00
commit 70a085d82a
Signed by: sam
GPG key ID: 4D8B07C18F31ACBD
4 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/App.scss
View file

@ -469,7 +469,7 @@ textarea,
color: $fallback--lightText;
color: var(--inputText, $fallback--lightText);
font-family: sans-serif;
font-family: var(--inputFont, sans-serif);
font-family: var(--interfaceFont, sans-serif);
font-size: 1em;
margin: 0;
box-sizing: border-box;

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

@ -114,7 +114,7 @@
svg {
width: 22px;
margin-right: 0.75rem;
color: var(--menuPopoverIcon, $fallback--icon)
color: var(--popoverIcon, $fallback--icon)
}
}

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

@ -38,7 +38,7 @@ label.Select {
margin: 0;
padding: 0 2em 0 .2em;
font-family: sans-serif;
font-family: var(--inputFont, sans-serif);
font-family: var(--interfaceFont, sans-serif);
font-size: 1em;
width: 100%;
z-index: 1;

32
src/components/timeline_menu/timeline_menu_content.vue
View file

@ -16,22 +16,6 @@
>{{ $t("nav.home_timeline") }}</span>
</router-link>
</li>
<li v-if="bubbleTimelineVisible">
<router-link
class="menu-item"
:to="{ name: 'bubble-timeline' }"
>
<FAIcon
fixed-width
class="fa-scale-110 fa-old-padding "
icon="circle"
/>
<span
:title="$t('nav.bubble_timeline_description')"
:aria-label="$t('nav.bubble_timeline_description')"
>{{ $t("nav.bubble_timeline") }}</span>
</router-link>
</li>
<li v-if="publicTimelineVisible">
<router-link
class="menu-item"
@ -48,6 +32,22 @@
>{{ $t("nav.public_tl") }}</span>
</router-link>
</li>
<li v-if="bubbleTimelineVisible">
<router-link
class="menu-item"
:to="{ name: 'bubble-timeline' }"
>
<FAIcon
fixed-width
class="fa-scale-110 fa-old-padding "
icon="circle"
/>
<span
:title="$t('nav.bubble_timeline_description')"
:aria-label="$t('nav.bubble_timeline_description')"
>{{ $t("nav.bubble_timeline") }}</span>
</router-link>
</li>
<li v-if="federatedTimelineVisible">
<router-link
class="menu-item"