diff --git a/public/locales/de/translation.json b/public/locales/de/translation.json index d6b9155..93cda58 100644 --- a/public/locales/de/translation.json +++ b/public/locales/de/translation.json @@ -22,8 +22,13 @@ "remove_flavour": "Element entfernen", "remove_flavour_button": "Element und alle untergeordneten Elemente entfernen" }, + "reset": { + "content": "Durch das Zurücksetzen wird dein Smorgasbord erneut geladen - deine Änderungen gehen verloren. OK?", + "confirm": "Ja, zurücksetzen", + "cancel": "Nein, abbrechen" + }, "footer": { - "disclaimer": "Open Source; mit D3 hergestellt, basierend auf dem Sunburstdiagramm.
Keine Cookies, kein Tracking, keine Datenerhebung. Dein lokaler Speicher wird verwendet, damit du nicht jedes Mal von vorne anfangen musst, wenn du die Webseite neu lädst. Sweet.
Made by JayK / Shandalara / dzing", + "disclaimer": "Open Source; mit D3 hergestellt, basierend auf dem Sunburstdiagramm.
Keine Cookies, kein Tracking, keine Datenerhebung. Dein lokaler Speicher wird verwendet, damit du nicht jedes Mal von vorne anfangen musst, wenn du die Webseite neu lädst. Sweet.", "languages": "Verfügbar auf", "languages_german": "Deutsch", "languages_english": "Englisch" diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index 3c0fb60..133221c 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -22,8 +22,13 @@ "remove_flavour": "Flavour to remove", "remove_flavour_button": "Remove flavour and all descendants" }, - "footer": { - "disclaimer": "Open source; made with D3, based on their Sunburst diagram.
No cookies, no tracking, no data collected. Local storage used to make sure you don't have to start over every time you load the website. Sweet.
Made by JayK / Shandalara / dzing", + "reset": { + "content": "Resetting your Smorgasbord will load the default canvas - your changes will be lost. OK?", + "confirm": "Yes, reset", + "cancel": "No, cancel" + }, + "footer": { + "disclaimer": "Open source; made with D3, based on their Sunburst diagram.
No cookies, no tracking, no data collected. Local storage used to make sure you don't have to start over every time you load the website. Sweet.", "languages": "Available in", "languages_german": "German", "languages_english": "English" diff --git a/src/App.css b/src/App.css index 7c5693a..726e4eb 100644 --- a/src/App.css +++ b/src/App.css @@ -8,20 +8,25 @@ footer.footer { background: #1F1F1F; color: #fff; } +.modal { + color: #000; +} .sunburst-clickable { cursor: pointer; } -.button { +.button.is-primary { background-color: #4a1942; color: #fff; } -.button:hover { - color: #ccc; +.button.is-primary:hover { + background-color: #4a1942; + color: #aaa; } -.button[disabled] { +.button.is-primary[disabled] { + background-color: #fff; border-color: #4a1942; color: #333; } diff --git a/src/components/AddFlavourForm/AddFlavourForm.test.tsx b/src/components/AddFlavourForm/AddFlavourForm.test.tsx index 12158c7..443859b 100644 --- a/src/components/AddFlavourForm/AddFlavourForm.test.tsx +++ b/src/components/AddFlavourForm/AddFlavourForm.test.tsx @@ -1,4 +1,4 @@ -import { act, fireEvent, render, screen } from '@testing-library/react'; +import { fireEvent, render, screen } from '@testing-library/react'; import AddFlavourForm from './AddFlavourForm'; import * as d3 from 'd3'; import { I18nextProvider } from 'react-i18next'; diff --git a/src/components/AddFlavourForm/AddFlavourForm.tsx b/src/components/AddFlavourForm/AddFlavourForm.tsx index 963d343..b4331d5 100644 --- a/src/components/AddFlavourForm/AddFlavourForm.tsx +++ b/src/components/AddFlavourForm/AddFlavourForm.tsx @@ -41,7 +41,7 @@ const AddFlavourForm = ({ onAdd, hierarchicalFlavours } : AddFlavourFormProps) =
setNewFlavourName(e.target.value)} @@ -52,7 +52,7 @@ const AddFlavourForm = ({ onAdd, hierarchicalFlavours } : AddFlavourFormProps) =
) diff --git a/src/components/ExportAsImageButton/ExportAsImageButton.tsx b/src/components/ExportAsImageButton/ExportAsImageButton.tsx index deb1655..30c7abb 100644 --- a/src/components/ExportAsImageButton/ExportAsImageButton.tsx +++ b/src/components/ExportAsImageButton/ExportAsImageButton.tsx @@ -116,7 +116,7 @@ const ExportAsImageButton = () => { } return ( - ); diff --git a/src/components/ExportAsJsonButton/ExportAsJsonButton.tsx b/src/components/ExportAsJsonButton/ExportAsJsonButton.tsx index 8832582..38a39ca 100644 --- a/src/components/ExportAsJsonButton/ExportAsJsonButton.tsx +++ b/src/components/ExportAsJsonButton/ExportAsJsonButton.tsx @@ -14,7 +14,7 @@ const ExportAsJsonButton = ({ flavours } : ExportAsJsonButtonProps) => { } return ( - ); diff --git a/src/components/ImportJsonButton/ImportJsonButton.tsx b/src/components/ImportJsonButton/ImportJsonButton.tsx index 597e82e..ee7ce9e 100644 --- a/src/components/ImportJsonButton/ImportJsonButton.tsx +++ b/src/components/ImportJsonButton/ImportJsonButton.tsx @@ -27,7 +27,7 @@ const ImportJsonButton = ({ onUpload } : ImportJsonButtonProps) => { } return ( - +
+ +
+
{ setResetConfirmationvisible(false); }}>
+
+
+

+ {t('reset.content')} +

+
+ +
+
+
) }