bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'blurhash' into 'develop'

Browse source 
Replace repetitive blurhash code with component, add blurhash to upload form

Closes #661

See merge request soapbox-pub/soapbox-fe!571
This commit is contained in:
Alex Gleason 2021-07-02 03:20:37 +00:00
commit 5bf3601b5e
6 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/soapbox/components/blurhash.js Normal file
View file

Binary file not shown.

BIN
app/soapbox/components/media_gallery.js
View file

Binary file not shown.

BIN
app/soapbox/features/account_gallery/components/media_item.js
View file

Binary file not shown.

BIN
app/soapbox/features/compose/components/upload.js
View file

Binary file not shown.

BIN
app/soapbox/features/video/index.js
View file

Binary file not shown.

4
app/styles/components/compose-form.scss
View file

@ -219,6 +219,9 @@
flex: 1 1 0; flex: 1 1 0;
min-width: 40%; min-width: 40%;
margin: 5px; margin: 5px;
position: relative;
border-radius: 4px;
overflow: hidden;
&__actions { &__actions {
background: linear-gradient(180deg, rgba($base-shadow-color, 0.8) 0, rgba($base-shadow-color, 0.35) 80%, transparent); background: linear-gradient(180deg, rgba($base-shadow-color, 0.8) 0, rgba($base-shadow-color, 0.35) 80%, transparent);
@ -298,7 +301,6 @@
} }
.compose-form__upload-thumbnail { .compose-form__upload-thumbnail {
border-radius: 4px;
background-position: center; background-position: center;
background-size: contain; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;