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

Audio player work (change of sensitive content handling)

Browse source
This commit is contained in:
Sean King 2020-06-28 19:51:10 -06:00 committed by Alex Gleason
parent 01d042f80d
commit 1a7cbb21a7
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
9 changed files with 35 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
app/soapbox/features/report/components/status_check_box.js
View file

Binary file not shown.

BIN
app/soapbox/features/ui/components/audio_modal.js
View file

Binary file not shown.

2
app/soapbox/locales/defaultMessages.json
View file

@ -1217,7 +1217,7 @@
{ {
"descriptors": [ "descriptors": [
{ {
"defaultMessage": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)", "defaultMessage": "Add media attachment",
"id": "upload_button.label" "id": "upload_button.label"
} }
], ],

2
app/soapbox/locales/en.json
View file

@ -450,7 +450,7 @@
"unauthorized_modal.text": "You need to be logged in to do that.", "unauthorized_modal.text": "You need to be logged in to do that.",
"unauthorized_modal.title": "Sign up for {site_title}", "unauthorized_modal.title": "Sign up for {site_title}",
"upload_area.title": "Drag & drop to upload", "upload_area.title": "Drag & drop to upload",
"upload_button.label": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)", "upload_button.label": "Add media attachment",
"upload_error.limit": "File upload limit exceeded.", "upload_error.limit": "File upload limit exceeded.",
"upload_error.poll": "File upload not allowed with polls.", "upload_error.poll": "File upload not allowed with polls.",
"upload_form.description": "Describe for the visually impaired", "upload_form.description": "Describe for the visually impaired",

BIN
app/soapbox/reducers/media_attachments.js
View file

Binary file not shown.

53
app/styles/components/audio-player.scss
View file

@ -41,20 +41,6 @@
text-shadow: 0 1px 1px $base-shadow-color, 1px 0 1px $base-shadow-color; text-shadow: 0 1px 1px $base-shadow-color, 1px 0 1px $base-shadow-color;
} }
.status__audio-player-spoiler {
display: none;
color: var(--primary-text-color);
left: 4px;
position: absolute;
text-shadow: 0 1px 1px $base-shadow-color, 1px 0 1px $base-shadow-color;
top: 4px;
z-index: 100;
&.status__audio-player-spoiler--visible {
display: block;
}
}
.status__audio-player-expand { .status__audio-player-expand {
bottom: 4px; bottom: 4px;
z-index: 100; z-index: 100;
@ -86,6 +72,10 @@
border-radius: 4px; border-radius: 4px;
height: 57px; height: 57px;
&.warning_visible {
height: 92px;
}
&:focus { &:focus {
outline: 0; outline: 0;
} }
@ -178,6 +168,35 @@
padding-bottom: 10px; padding-bottom: 10px;
} }
&__spoiler-warning {
font-size: 16px;
white-space: nowrap;
overlow: hidden;
text-overflow: ellipsis;
background: hsl( var(--brand-color_h), var(--brand-color_s), 20% );
padding: 5px;
button {
background: transparent;
font-size: 16px;
border: 0;
color: rgba(#ffffff, 0.75);
position: absolute;
right: 0;
padding-right: 5px;
i {
margin-right: 0;
}
&:active,
&:hover,
&:focus {
color: #ffffff;
}
}
}
&__buttons { &__buttons {
font-size: 16px; font-size: 16px;
white-space: nowrap; white-space: nowrap;
@ -190,12 +209,6 @@
} }
} }
&.right {
button {
padding-right: 0;
}
}
button { button {
background: transparent; background: transparent;
padding: 2px 10px; padding: 2px 10px;