sjw
/
pleroma-fe
mirror of https://git.pleroma.social/sjw/pleroma-fe.git
1
0
Fork 0
Code Issues Releases Wiki Activity

more transparent panels fixes

This commit is contained in:
Henry Jameson 2024-03-07 00:28:16 +02:00
parent ce5552ae3c
commit 6d77bc2bd5
5 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/button.style.js
View File

@ -68,14 +68,14 @@ export default {
{ {
state: ['toggled'], state: ['toggled'],
directives: { directives: {
background: '--inheritedBackground,-24.2', background: '--inheritedBackground,-14.2',
shadow: ['--defaultButtonShadow', '--pressedButtonBevel'] shadow: ['--defaultButtonShadow', '--pressedButtonBevel']
} }
}, },
{ {
state: ['toggled', 'hover'], state: ['toggled', 'hover'],
directives: { directives: {
background: '--inheritedBackground,-24.2', background: '--inheritedBackground,-14.2',
shadow: ['--defaultButtonHoverGlow', '--pressedButtonBevel'] shadow: ['--defaultButtonHoverGlow', '--pressedButtonBevel']
} }
}, },

8
src/components/timeline/timeline.js
View File

@ -77,13 +77,13 @@ const Timeline = {
} }
}, },
classes () { classes () {
let rootClasses = !this.embedded ? ['panel', 'panel-default'] : ['-nonpanel'] let rootClasses = !this.embedded ? ['panel', 'panel-default'] : ['-embedded']
if (this.blockingClicks) rootClasses = rootClasses.concat(['-blocked', '_misclick-prevention']) if (this.blockingClicks) rootClasses = rootClasses.concat(['-blocked', '_misclick-prevention'])
return { return {
root: rootClasses, root: rootClasses,
header: ['timeline-heading'].concat(!this.embedded ? ['panel-heading', '-sticky'] : []), header: ['timeline-heading'].concat(!this.embedded ? ['panel-heading', '-sticky'] : ['panel-body']),
body: ['timeline-body'].concat(!this.embedded ? ['panel-body'] : []), body: ['timeline-body'].concat(!this.embedded ? ['panel-body'] : ['panel-body']),
footer: ['timeline-footer'].concat(!this.embedded ? ['panel-footer'] : []) footer: ['timeline-footer'].concat(!this.embedded ? ['panel-footer'] : ['panel-body'])
} }
}, },
// id map of statuses which need to be hidden in the main list due to pinning logic // id map of statuses which need to be hidden in the main list due to pinning logic

7
src/components/timeline/timeline.scss
View File

@ -29,12 +29,17 @@
z-index: 2; z-index: 2;
} }
&.-nonpanel { &.-embedded {
.timeline-heading { .timeline-heading {
text-align: center; text-align: center;
line-height: 2.75em; line-height: 2.75em;
padding: 0 0.5em; padding: 0 0.5em;
// Override the shrug empty filler
&:empty::before {
content: initial;
}
.button-default, .button-default,
.alert { .alert {
line-height: 2em; line-height: 2em;

2
src/components/user_profile/user_profile.vue
View File

@ -74,6 +74,7 @@
<div <div
v-if="followsTabVisible" v-if="followsTabVisible"
key="followees" key="followees"
class="panel-body"
:label="$t('user_card.followees')" :label="$t('user_card.followees')"
:disabled="!user.friends_count" :disabled="!user.friends_count"
> >
@ -88,6 +89,7 @@
</div> </div>
<div <div
v-if="followersTabVisible" v-if="followersTabVisible"
class="panel-body"
key="followers" key="followers"
:label="$t('user_card.followers')" :label="$t('user_card.followers')"
:disabled="!user.followers_count" :disabled="!user.followers_count"

2
src/panel.scss
View File

@ -37,7 +37,7 @@
&:empty::before { &:empty::before {
content: "¯\\_(ツ)_/¯"; // Could use words but it'd require translations content: "¯\\_(ツ)_/¯"; // Could use words but it'd require translations
display: block; display: block;
margin: 1em; padding: 1em;
text-align: center; text-align: center;
} }