diff --git a/manifest.webapp b/manifest.webapp index d1e383f95a977bbe24d49c0432af22b6a44a5c9b..55e584ba7eecccf1cdc3a5fbb57b8e17dc2b4b58 100644 --- a/manifest.webapp +++ b/manifest.webapp @@ -3,7 +3,7 @@ "slug": "ecolyo", "icon": "icon.svg", "categories": [], - "version": "0.1.1", + "version": "0.1.2", "licence": "AGPL-3.0", "editor": "Grand Lyon", "routes": { diff --git a/package.json b/package.json index 7f5b29f9195561db58952dc7df269e9ea54cf51a..58a9068f8429cb305238c3bf3804f76e18d6d5f8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ecolyo", - "version": "0.1.1", + "version": "0.1.2", "scripts": { "tx": "tx pull --all || true", "lint": "yarn lint:js && yarn lint:styles", diff --git a/src/components/CommonKit/Button/StyledButton.tsx b/src/components/CommonKit/Button/StyledButton.tsx index f5c2c0e7bb6e2f0816440f98e9508d63854c2396..a460cc4f76c47539cd0f81538bfea522450211ed 100644 --- a/src/components/CommonKit/Button/StyledButton.tsx +++ b/src/components/CommonKit/Button/StyledButton.tsx @@ -36,6 +36,9 @@ const BaseButton = withStyles({ fontSize: '1rem', lineHeight: '120%', }, + disabled: { + opacity: '0.6', + }, })(MuiButton) const PrimaryButton = withStyles({ @@ -48,7 +51,6 @@ const PrimaryButton = withStyles({ }, disabled: { background: 'var(--multiColorRadialGradient) !important', - opacity: '0.6', }, })(BaseButton) diff --git a/src/components/CommonKit/Button/StyledOauthButton.tsx b/src/components/CommonKit/Button/StyledOauthButton.tsx index b4b23ea1f97bb6dd60fa6644b1a8cdd0cc2c4b9f..8c641eba80c12d96e8de5d2fb3a3d6c6748d743e 100644 --- a/src/components/CommonKit/Button/StyledOauthButton.tsx +++ b/src/components/CommonKit/Button/StyledOauthButton.tsx @@ -36,20 +36,22 @@ const BaseButton = withStyles({ fontSize: '1rem', lineHeight: '120%', }, + disabled: { + opacity: '0.6', + }, })(MuiButton) const PrimaryButton = withStyles({ root: { background: 'var(--multiColorRadialGradient)', }, - disabled: { - background: 'var(--multiColorRadialGradient) !important', - opacity: '0.6', - }, label: { color: '#000000', fontWeight: 'bold', }, + disabled: { + background: 'var(--multiColorRadialGradient) !important', + }, })(BaseButton) const SecondaryButton = withStyles({ diff --git a/src/components/ContentComponents/EcogestureList/EcogestureList.tsx b/src/components/ContentComponents/EcogestureList/EcogestureList.tsx index f81a02ff2f55d6c8e97ea6b993b5595e09b5acd4..9b7b21f4d1800e772c7b87db9b192cc1bfc053d0 100644 --- a/src/components/ContentComponents/EcogestureList/EcogestureList.tsx +++ b/src/components/ContentComponents/EcogestureList/EcogestureList.tsx @@ -102,11 +102,13 @@ const EcogesturesList: React.FC<EcogesturesListProps> = ({ </div> </> )} - <EcogestureModal - opened={openEcogestureModal} - ecogesture={selectedEcogesture} - handleCloseClick={handleCloseClick} - /> + {openEcogestureModal && ( + <EcogestureModal + opened={openEcogestureModal} + ecogesture={selectedEcogesture} + handleCloseClick={handleCloseClick} + /> + )} </div> ) } diff --git a/src/components/ContentComponents/EcogestureModal/EcogestureModal.tsx b/src/components/ContentComponents/EcogestureModal/EcogestureModal.tsx index 86d485e802b72313ed921a960f98150068780fa2..6e9c2496fd3e5d807afbd8e7691fd9882c747c08 100644 --- a/src/components/ContentComponents/EcogestureModal/EcogestureModal.tsx +++ b/src/components/ContentComponents/EcogestureModal/EcogestureModal.tsx @@ -44,7 +44,7 @@ const EcogestureModal: React.FC<EcogestureModalProps> = ({ return ( <> - {!ecogesture ? null : ( + {ecogesture && ( <Modal open={opened} border={ecogesture.unlocked} @@ -56,7 +56,7 @@ const EcogestureModal: React.FC<EcogestureModalProps> = ({ <div className="em-content-box"> <div className="em-content-box-text"> <div className="em-content-box-text-header"> - {ecogesture.unlocked && ( + {ecogesture.unlocked && ecogestureIcon && ( <div> <Icon className="icon" icon={ecogestureIcon} size={100} /> </div> diff --git a/src/styles/components/_ecogesture.scss b/src/styles/components/_ecogesture.scss index b36fb496e6ded9b15d7bedc4089839f310b02f61..4006d837fec8ee9bfc8498019a9be97b59fb0f6f 100644 --- a/src/styles/components/_ecogesture.scss +++ b/src/styles/components/_ecogesture.scss @@ -158,6 +158,9 @@ flex-direction: column; justify-content: center; align-items: center; + .icon { + margin-bottom: 1rem; + } } .em-description { padding-bottom: 2.5rem;