Skip to content

Commit

Permalink
Merge pull request #933 from naweidner/tooltips
Browse files Browse the repository at this point in the history
Tooltips
  • Loading branch information
LukasKalbertodt authored May 30, 2022
2 parents 4f6f771 + e211ab5 commit 0df3d04
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 4 deletions.
1 change: 0 additions & 1 deletion src/Tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ const Tooltip = ({ content, ...props }) => (
<Tippy
content = { <span> {content} </span> }
interactive={true}
delay={300}
theme='studio'

sx={{
Expand Down
5 changes: 4 additions & 1 deletion src/i18n/locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,5 +135,8 @@
"warning-recorder-safari-hint": "Falls Sie Safari nutzen, können Sie die experimentelle Funktion 'MediaRecorder' in den Einstellungen aktivieren. Wir empfehlen allerdings, auf macOS Firefox oder Chrome zu nutzen.",
"warning-missing-connection-settings": "Die Verbindung zum Opencast Server wurde noch nicht vollständig hergestellt. Bitte konfigurieren Sie die Verbindung in <1>den Einstellungen</1> (die Aufnahme geht nicht verloren).",

"settings-back-to-recording": "Zurück zur Aufnahme"
"settings-back-to-recording": "Zurück zur Aufnahme",

"video-settings-open": "Videoeinstellungen öffnen",
"video-settings-close": "Videoeinstellungen schließen"
}
1 change: 1 addition & 0 deletions src/i18n/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@
"warning-recorder-not-supported": "Your browser does not support recording media streams.",
"warning-recorder-safari-hint": "If you are using Safari, you can enable the experimental feature 'MediaRecorder' in settings. However, on macOS, we recommend switching to Chrome or Firefox.",
"warning-missing-connection-settings": "Connection to Opencast is not fully established: uploading is disabled. Please configure the connection in <1>the settings</1> (you won't lose your recording).",

"settings-back-to-recording": "Back to recording",

"video-settings-open": "Open video settings",
Expand Down
1 change: 0 additions & 1 deletion src/ui/studio/save-creation/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,6 @@ const UploadForm = ({ uploadState, handleUpload }) => {
/> }

<Button
title={t('save-creation-button-upload')}
disabled={recordings.length === 0}
onClick={handleSubmit(handleUpload)}
>
Expand Down
2 changes: 1 addition & 1 deletion src/ui/studio/video-setup/prefs.js
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ export const StreamSettings = ({ isDesktop, stream }) => {
justifyContent: 'flex-end',
}}>
<div sx={{ textAlign: 'right' }}>
<Tooltip content={isExpanded ? t('video-settings-close') : t('video-settings-open') }>
<Tooltip offset={[0, 25]} content={isExpanded ? t('video-settings-close') : t('video-settings-open') }>
<button
onClick={() => setIsExpanded(old => !old)}
sx={{
Expand Down

0 comments on commit 0df3d04

Please sign in to comment.