Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Ecolyo
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

352fbc68

Commit 352fbc68 authored 4 years ago by Yoan VALLET

Downloads
- Plain Diff

Merge branch 'features/US142-random-ecogestures' into 'dev'

Features/us142 feedback design + rename

See merge request web-et-numerique/llle_project/ecolyo!9

parents 8715ec7c 6a1b0218

No related branches found

No related tags found

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

config.json 4 additions, 4 deletions

config.json
docker/cozy-app-dev-with-app.sh 12 additions, 12 deletions

docker/cozy-app-dev-with-app.sh
src/assets/icons/tabbar/parametre/off.svg 6 additions, 3 deletions

src/assets/icons/tabbar/parametre/off.svg
src/assets/icons/tabbar/parametre/on.svg 6 additions, 1 deletion

src/assets/icons/tabbar/parametre/on.svg
src/components/ContainerComponents/ViewContainer/FinishedChallengeDetailsViewContainer.tsx 8 additions, 4 deletions

...s/ViewContainer/FinishedChallengeDetailsViewContainer.tsx
src/components/ContentComponents/KonnectorViewer/KonnectorViewerCard.tsx 4 additions, 4 deletions

...ContentComponents/KonnectorViewer/KonnectorViewerCard.tsx
src/components/ContentComponents/KonnectorViewer/picto-failure.png 0 additions, 0 deletions

...nents/ContentComponents/KonnectorViewer/picto-failure.png
src/styles/base/_layout.scss 0 additions, 1 deletion

src/styles/base/_layout.scss
src/styles/components/_ecogesture.scss 5 additions, 3 deletions

src/styles/components/_ecogesture.scss
src/styles/components/_konnector.scss 4 additions, 2 deletions

src/styles/components/_konnector.scss
src/styles/components/_modal.scss 1 addition, 1 deletion

src/styles/components/_modal.scss

with 50 additions and 35 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment