matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into sensitive-video-fix

Browse Source
This commit is contained in:
Alex Gleason
2022-11-23 11:49:27 -06:00
parent 15ec4c8830 41dd2bfcef
commit ea0146400c
37 changed files with 280 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/styles/accounts.scss
View File

@ -72,10 +72,6 @@ a .account__avatar {
bottom: 0;
right: 0;
z-index: 1;
&.still-image {
position: absolute;
}
}
}

1
app/styles/application.scss
View File

@ -44,7 +44,6 @@
@import 'components/columns';
@import 'components/search';
@import 'components/react-toggle';
@import 'components/still-image';
@import 'components/video-player';
@import 'components/audio-player';
@import 'components/profile-hover-card';

5
app/styles/chats.scss
View File

@ -352,11 +352,6 @@
&__preview {
background-color: transparent;
}
&__item-thumbnail img,
&__item-thumbnail .still-image img {
object-fit: contain;
}
}
.chat-messages__divider {

57
app/styles/components/media-gallery.scss
View File

@ -57,33 +57,8 @@
line-height: 0;
position: relative;
z-index: 1;
&,
.still-image {
height: 100%;
width: 100%;
img {
@apply object-cover rounded-lg;
}
}
.still-image--play-on-hover::before {
content: 'GIF';
position: absolute;
color: var(--primary-text-color);
background: var(--foreground-color);
bottom: 6px;
left: 6px;
padding: 2px 6px;
border-radius: 2px;
font-size: 11px;
font-weight: 600;
pointer-events: none;
opacity: 0.9;
transition: opacity 0.1s ease;
line-height: 18px;
}
height: 100%;
width: 100%;
video {
width: 100%;
@ -92,17 +67,6 @@
}
}
.status__wrapper {
.media-gallery__item-thumbnail.letterboxed {
&,
.still-image {
img {
object-fit: contain;
}
}
}
}
.media-gallery__preview {
@apply bg-gray-200 dark:bg-gray-900 rounded-lg;
width: 100%;
@ -113,23 +77,6 @@
left: 0;
z-index: 0;
.still-image--play-on-hover::before {
content: 'GIF';
position: absolute;
color: var(--primary-text-color);
background: var(--foreground-color);
bottom: 6px;
left: 6px;
padding: 2px 6px;
border-radius: 2px;
font-size: 11px;
font-weight: 600;
pointer-events: none;
opacity: 0.9;
transition: opacity 0.1s ease;
line-height: 18px;
}
&--hidden {
display: none;
}

28
app/styles/components/still-image.scss
View File

@ -1,28 +0,0 @@
.still-image {
position: relative;
overflow: hidden;
img,
canvas {
width: 100%;
height: 100%;
display: block;
object-fit: cover;
font-family: inherit;
}
&--play-on-hover {
img {
position: absolute;
visibility: hidden;
}
&:hover img {
visibility: visible;
}
&:hover canvas {
visibility: hidden;
}
}
}

2
app/styles/emoji-picker.scss
View File

@ -9,7 +9,7 @@
}
.emoji-mart .emoji-mart-emoji {
@apply p-1.5;
@apply p-1.5 align-middle;
}
.emoji-mart-bar {

22
app/styles/fonts.scss
View File

@ -58,25 +58,3 @@
line-height: #{$px + "px"};
line-height: #{$rem + "rem"};
}
// Soapbox icon font
@font-face {
font-family: 'soapbox';
src: url('../assets/fonts/soapbox/soapbox.eot?pryg6i');
src: url('../assets/fonts/soapbox/soapbox.eot?pryg6i#iefix') format('embedded-opentype'),
url('../assets/fonts/soapbox/soapbox.ttf?pryg6i') format('truetype'),
url('../assets/fonts/soapbox/soapbox.woff?pryg6i') format('woff'),
url('../assets/fonts/soapbox/soapbox.svg?pryg6i#soapbox') format('svg');
font-weight: normal;
font-style: normal;
}
.fa-fediverse::before {
font-family: 'soapbox';
content: "\e901";
}
.fa-spinster::before {
font-family: 'soapbox';
content: "\e900";
}