gitea/glitch-bird
1
0
Fork 2
mirror of https://github.com/glitchbirdnew/glitch-bird.git synced 2024-06-02 10:10:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pr/glitch/mastodon24247'

Browse source
This commit is contained in:
neatchee 2023-04-04 20:30:52 -07:00
parent fd176d9e7d 82778bb062
commit 4b9f8f7402
3 changed files with 50 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/javascript/flavours/glitch/components/account.jsx
View file

@ -10,9 +10,9 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { me } from 'flavours/glitch/initial_state';
import RelativeTimestamp from './relative_timestamp';
import Skeleton from 'flavours/glitch/components/skeleton';
import { counterRenderer } from 'mastodon/components/common_counter';
import ShortNumber from 'mastodon/components/short_number';
import Icon from 'mastodon/components/icon';
import { counterRenderer } from 'flavours/glitch/components/common_counter';
import ShortNumber from 'flavours/glitch/components/short_number';
import Icon from 'flavours/glitch/components/icon';
import classNames from 'classnames';
const messages = defineMessages({

23
app/javascript/flavours/glitch/styles/components/accounts.scss
View file

@ -12,10 +12,12 @@
text-decoration: none;
font-size: 14px;
&--with-note {
strong {
display: inline;
}
.display-name {
margin-bottom: 4px;
}
.display-name strong {
display: inline;
}
}
@ -772,6 +774,19 @@
}
}
.verified-badge {
display: inline-flex;
align-items: center;
color: $valid-value-color;
gap: 4px;
a {
color: inherit;
font-weight: 500;
text-decoration: none;
}
}
.moved-account-banner,
.follow-request-banner {
padding: 20px;

44
app/javascript/flavours/glitch/styles/components/status.scss
View file

@ -84,13 +84,13 @@
.emojione {
transition-property: transform, filter;
transition-duration:0.08s;
transition-duration: 0.08s;
}
&.status__content--zoom-emojis-on-hover .emojione:hover {
transform: scale(1.8);
filter: drop-shadow(0 0 3px #0c0c0c);
z-index:99;
z-index: 99;
}
& > ul,
@ -361,7 +361,9 @@
border-bottom-color: lighten($ui-base-color, 12%);
.status__collapse-button.active {
background-image: linear-gradient(rgba(lighten($ui-base-color, 16%), 255) 0 0);
background-image: linear-gradient(
rgba(lighten($ui-base-color, 16%), 255) 0 0
);
}
}
@ -446,7 +448,7 @@
);
pointer-events: none;
}
.media-gallery {
display: none;
}
@ -471,26 +473,34 @@
}
&.status-direct .status__collapse-button {
background-image: linear-gradient(rgba(lighten($ui-base-color, 12%), 255) 0 0);
background-image: linear-gradient(
rgba(lighten($ui-base-color, 12%), 255) 0 0
);
&:active,
&:hover,
&:focus {
background-image: linear-gradient(rgba(lighten($ui-base-color, 20%), 255) 0 0);
background-image: linear-gradient(
rgba(lighten($ui-base-color, 20%), 255) 0 0
);
}
}
.status__collapse-button {
background-image: linear-gradient(rgba(lighten($ui-base-color, 4%), 255) 0 0);
background-image: linear-gradient(
rgba(lighten($ui-base-color, 4%), 255) 0 0
);
&:active,
&:hover,
&:focus {
background-image: linear-gradient(rgba(lighten($ui-base-color, 12%), 255) 0 0);
background-image: linear-gradient(
rgba(lighten($ui-base-color, 12%), 255) 0 0
);
}
}
notification__message {
.notification__message {
margin-bottom: 0;
}
@ -568,7 +578,9 @@
}
.status__collapse-button.active {
background-image: linear-gradient(rgba(lighten($ui-base-color, 8%), 255) 0 0);
background-image: linear-gradient(
rgba(lighten($ui-base-color, 8%), 255) 0 0
);
}
.status__collapse-button.active > .fa-angle-double-up {
@ -767,7 +779,7 @@
.status__display-name,
.account__display-name {
strong {
.display-name strong {
color: $primary-text-color;
}
}
@ -782,12 +794,12 @@ a.status__display-name,
.reply-indicator__display-name,
.detailed-status__display-name,
.account__display-name {
&:hover strong {
&:hover .display-name strong {
text-decoration: underline;
}
}
.account__display-name strong {
.account__display-name .display-name strong {
display: block;
overflow: hidden;
text-overflow: ellipsis;