Merge branch 'Develop_copy_to_implement_acessibility' into 'luis_accessibility'
# Conflicts: # src/Components/UploadPageComponents/PartThree.js # src/Components/UploadPageComponents/Stepper.js
Showing
- package.json 1 addition, 1 deletionpackage.json
- src/App.css 4 additions, 0 deletionssrc/App.css
- src/Components/Acessibility/ContrastBar.js 14 additions, 4 deletionssrc/Components/Acessibility/ContrastBar.js
- src/Components/ActivityListItem.js 0 additions, 1 deletionsrc/Components/ActivityListItem.js
- src/Components/Carousel.js 1 addition, 3 deletionssrc/Components/Carousel.js
- src/Components/ColCardOwnerOptions.js 3 additions, 0 deletionssrc/Components/ColCardOwnerOptions.js
- src/Components/ColCardPublicOptions.js 3 additions, 0 deletionssrc/Components/ColCardPublicOptions.js
- src/Components/Comment.js 3 additions, 0 deletionssrc/Components/Comment.js
- src/Components/ContactCardOptions.js 3 additions, 0 deletionssrc/Components/ContactCardOptions.js
- src/Components/CriarColecaoForm.js 4 additions, 8 deletionssrc/Components/CriarColecaoForm.js
- src/Components/Cropper.js 81 additions, 86 deletionssrc/Components/Cropper.js
- src/Components/Dropdown.js 58 additions, 58 deletionssrc/Components/Dropdown.js
- src/Components/EditarColecaoForm.js 6 additions, 6 deletionssrc/Components/EditarColecaoForm.js
- src/Components/ExpansionPanels.js 1 addition, 1 deletionsrc/Components/ExpansionPanels.js
- src/Components/GreyButton.js 3 additions, 6 deletionssrc/Components/GreyButton.js
- src/Components/GuardarModal.js 4 additions, 5 deletionssrc/Components/GuardarModal.js
- src/Components/Header.js 113 additions, 113 deletionssrc/Components/Header.js
- src/Components/HelpCenter/TabsManageAc/Forget.js 55 additions, 61 deletionssrc/Components/HelpCenter/TabsManageAc/Forget.js
- src/Components/HomeScreenSearchBar.js 3 additions, 0 deletionssrc/Components/HomeScreenSearchBar.js
- src/Components/LoadingSpinner.js 4 additions, 4 deletionssrc/Components/LoadingSpinner.js
Loading
Please register or sign in to comment