diff --git a/targets/frontend/src/components/alerts/AlertTitle.js b/targets/frontend/src/components/alerts/AlertTitle.js index 5667b9ab1..055a88503 100644 --- a/targets/frontend/src/components/alerts/AlertTitle.js +++ b/targets/frontend/src/components/alerts/AlertTitle.js @@ -25,7 +25,7 @@ export function AlertTitle({ alertId, info, ...props }) { @@ -38,7 +38,7 @@ export function AlertTitle({ alertId, info, ...props }) { > {showComment && } diff --git a/targets/frontend/src/components/alerts/Status.js b/targets/frontend/src/components/alerts/Status.js index 37af6c05a..d62d7baee 100644 --- a/targets/frontend/src/components/alerts/Status.js +++ b/targets/frontend/src/components/alerts/Status.js @@ -33,10 +33,12 @@ export function AlertStatus({ alertId }) { En cours updateStatus("done")}> - Traité + {" "} + Traité updateStatus("rejected")}> - Rejeté + {" "} + Rejeté ); diff --git a/targets/frontend/src/components/forms/ContentPicker/SortableList.js b/targets/frontend/src/components/forms/ContentPicker/SortableList.js index 714bcbca2..874f41702 100644 --- a/targets/frontend/src/components/forms/ContentPicker/SortableList.js +++ b/targets/frontend/src/components/forms/ContentPicker/SortableList.js @@ -65,7 +65,7 @@ const SortableRow = SortableElement( onDeleteContent(cdtnId); }} > - + )} @@ -79,6 +79,6 @@ const SortHandle = SortableHandle(() => ( type="button" sx={{ cursor: "grab", flex: "0 0 auto", height: "auto", mr: "xsmall" }} > - + )); diff --git a/targets/frontend/src/components/forms/IconPicker.js b/targets/frontend/src/components/forms/IconPicker.js index a613a1005..b62177c45 100644 --- a/targets/frontend/src/components/forms/IconPicker.js +++ b/targets/frontend/src/components/forms/IconPicker.js @@ -78,18 +78,18 @@ function RootIconPicker({ disabled, value, onChange }) { }} sx={{ bg: "white", - height: "2rem", + height: "iconMedium", ml: "xsmall", position: "absolute", right: "-0.5rem", top: "-0.5rem", - width: "2rem", + width: "iconMedium", }} > diff --git a/targets/frontend/src/components/themes/List.js b/targets/frontend/src/components/themes/List.js index eb048e29f..4632cd75c 100644 --- a/targets/frontend/src/components/themes/List.js +++ b/targets/frontend/src/components/themes/List.js @@ -126,9 +126,9 @@ const ThemeRow = SortableElement(({ isAdmin, sortable, theme }) => ( @@ -142,6 +142,6 @@ const SortHandle = SortableHandle(() => ( variant="secondary" sx={{ cursor: "grab", height: "auto", mr: "xsmall" }} > - + )); diff --git a/targets/frontend/src/components/themes/MapModal.js b/targets/frontend/src/components/themes/MapModal.js index f5b572d46..4067bc224 100644 --- a/targets/frontend/src/components/themes/MapModal.js +++ b/targets/frontend/src/components/themes/MapModal.js @@ -15,7 +15,9 @@ export const MapModal = () => { <> diff --git a/targets/frontend/src/pages/themes/[[...id]].js b/targets/frontend/src/pages/themes/[[...id]].js index 128d64111..46b30c452 100644 --- a/targets/frontend/src/pages/themes/[[...id]].js +++ b/targets/frontend/src/pages/themes/[[...id]].js @@ -127,9 +127,9 @@ export function ThemePage() { Éditer @@ -139,9 +139,9 @@ export function ThemePage() { Consulter @@ -192,7 +192,9 @@ const AddAThemeButton = ({ themeId }) => ( passHref > @@ -221,9 +223,9 @@ const ParentLink = ({ id, ...props }) => (
diff --git a/targets/frontend/src/pages/themes/edit/[id].js b/targets/frontend/src/pages/themes/edit/[id].js index 2bb7e3c0f..67b9a43be 100644 --- a/targets/frontend/src/pages/themes/edit/[id].js +++ b/targets/frontend/src/pages/themes/edit/[id].js @@ -180,7 +180,11 @@ export function EditThemePage() { }} > Supprimer le thème diff --git a/targets/frontend/src/theme.js b/targets/frontend/src/theme.js index a82f62f28..e2c177b66 100644 --- a/targets/frontend/src/theme.js +++ b/targets/frontend/src/theme.js @@ -189,8 +189,9 @@ export const theme = { "0 0 4px 0px rgba(28,28,28,.1), 0 3px 18px -4px rgba(28,28,28,.1), 0 5px 30px -12px rgba(28,28,28,.2)", }, sizes: { - normal: "xsmall", - small: "xxsmall", + iconsXSmall: "1rem", + iconSmall: "1.5rem", + iconMedium: "2rem", container: 1440, }, space: { diff --git a/yarn.lock b/yarn.lock index 87fd75d48..ad3858bdb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5410,6 +5410,11 @@ csstype@^2.5.7: resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.13.tgz#a6893015b90e84dd6e85d0e3b442a1e84f2dbe0f" integrity sha512-ul26pfSQTZW8dcOnD2iiJssfXw0gdNVX9IJDH/X3K5DGPfj+fUYe3kB+swUY6BF3oZDxaID3AJt+9/ojSAE05A== +cuint@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b" + integrity sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs= + currently-unhandled@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" @@ -14346,6 +14351,13 @@ xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1: resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== +xxhashjs@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/xxhashjs/-/xxhashjs-0.2.2.tgz#8a6251567621a1c46a5ae204da0249c7f8caa9d8" + integrity sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw== + dependencies: + cuint "^0.2.2" + y18n@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"