diff --git a/assets/images/illustrations/Illustration-rainbow-10.svg b/assets/images/illustrations/Illustration-rainbow-10.svg index 7d5f902a9..fdd3e04b9 100644 --- a/assets/images/illustrations/Illustration-rainbow-10.svg +++ b/assets/images/illustrations/Illustration-rainbow-10.svg @@ -1,10 +1,10 @@ - + Illustration-rainbow-10 Created with Sketch. - + @@ -48,41 +48,48 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/assets/images/illustrations/Illustration-rainbow-11.svg b/assets/images/illustrations/Illustration-rainbow-11.svg index 163094858..a1741bca1 100644 --- a/assets/images/illustrations/Illustration-rainbow-11.svg +++ b/assets/images/illustrations/Illustration-rainbow-11.svg @@ -1,63 +1,73 @@ - + Illustration-rainbow-11 Created with Sketch. - - - - - + + + + + - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + diff --git a/assets/images/illustrations/Illustration-rainbow-3.svg b/assets/images/illustrations/Illustration-rainbow-3.svg index 2683b79ea..3dc324568 100644 --- a/assets/images/illustrations/Illustration-rainbow-3.svg +++ b/assets/images/illustrations/Illustration-rainbow-3.svg @@ -1,101 +1,108 @@ - + - rainbow-background-2 + Illustration-rainbow-3 Created with Sketch. - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/assets/images/illustrations/Illustration-rainbow-4.svg b/assets/images/illustrations/Illustration-rainbow-4.svg index 845d99973..49e6d275c 100644 --- a/assets/images/illustrations/Illustration-rainbow-4.svg +++ b/assets/images/illustrations/Illustration-rainbow-4.svg @@ -1,1501 +1,1508 @@ - + - rainbows-background + Illustration-rainbow-4 Created with Sketch. - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/illustrations/Illustration-rainbow-5.svg b/assets/images/illustrations/Illustration-rainbow-5.svg index c74e1e172..7ae6ca5ef 100644 --- a/assets/images/illustrations/Illustration-rainbow-5.svg +++ b/assets/images/illustrations/Illustration-rainbow-5.svg @@ -1,322 +1,329 @@ - + - rainbows-background-3 + Illustration-rainbow-5 Created with Sketch. - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/illustrations/Illustration-rainbow-6.svg b/assets/images/illustrations/Illustration-rainbow-6.svg index 5be797025..19532be6e 100644 --- a/assets/images/illustrations/Illustration-rainbow-6.svg +++ b/assets/images/illustrations/Illustration-rainbow-6.svg @@ -1,120 +1,142 @@ - + Illustration-rainbow-6 Created with Sketch. - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + - + - - - - - + + + + + + + - - - - - + + + + + + + - - - - - + + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - - - - - + + + + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/assets/images/illustrations/Illustration-rainbow-7.svg b/assets/images/illustrations/Illustration-rainbow-7.svg index 322b3d4d4..4b7a6c474 100644 --- a/assets/images/illustrations/Illustration-rainbow-7.svg +++ b/assets/images/illustrations/Illustration-rainbow-7.svg @@ -1,363 +1,451 @@ - + Illustration-rainbow-7 Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + - - - - - + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - + + + + + + + - - - - - + + + + + + + - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + - - - - - + + + + + + + - - - - - + + + + + + + - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + diff --git a/assets/images/illustrations/Illustration-rainbow-8.svg b/assets/images/illustrations/Illustration-rainbow-8.svg index a6d90348d..8f2ace68c 100644 --- a/assets/images/illustrations/Illustration-rainbow-8.svg +++ b/assets/images/illustrations/Illustration-rainbow-8.svg @@ -1,339 +1,397 @@ - + Illustration-rainbow-8 Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + diff --git a/assets/images/illustrations/Illustration-rainbow-9.svg b/assets/images/illustrations/Illustration-rainbow-9.svg index 73945caa7..18d8dfda9 100644 --- a/assets/images/illustrations/Illustration-rainbow-9.svg +++ b/assets/images/illustrations/Illustration-rainbow-9.svg @@ -1,80 +1,80 @@ - + Illustration-rainbow-9 Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/library/styleguideComponents/ReactComponent/utilsTab.js b/library/styleguideComponents/ReactComponent/utilsTab.js index 93c2dab01..66df6f934 100644 --- a/library/styleguideComponents/ReactComponent/utilsTab.js +++ b/library/styleguideComponents/ReactComponent/utilsTab.js @@ -14,7 +14,11 @@ function TabItem({ response }) { } TabItem.propTypes = { - response: PropTypes.object.isRequired, + response: PropTypes.object, +}; + +TabItem.defaultProps = { + response: undefined, }; export default function UtilsTab({ name }) { diff --git a/src/components/AvatarMenu/styles.css b/src/components/AvatarMenu/styles.css index 349d0d88e..6f1dea411 100644 --- a/src/components/AvatarMenu/styles.css +++ b/src/components/AvatarMenu/styles.css @@ -13,7 +13,7 @@ transition: all 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; } .rainbow-avatar-menu_button:focus, .rainbow-avatar-menu_button:active { outline: 0; - box-shadow: 0 0 2px #01b6f5; } + box-shadow: 0 0 0 4px #e3e5ed; } .rainbow-avatar-menu_button:hover { box-shadow: 0 0 0 4px #e3e5ed; transition: all 150ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; } diff --git a/src/components/AvatarMenu/styles.scss b/src/components/AvatarMenu/styles.scss index e1b281ab6..8e1e99390 100644 --- a/src/components/AvatarMenu/styles.scss +++ b/src/components/AvatarMenu/styles.scss @@ -28,7 +28,7 @@ &:focus, &:active { outline: 0; - box-shadow: $shadow-outline; + box-shadow: 0 0 0 4px $color-gray-2; } &:hover { diff --git a/src/components/Card/styles.css b/src/components/Card/styles.css index c6b75671c..9e1fabf4d 100644 --- a/src/components/Card/styles.css +++ b/src/components/Card/styles.css @@ -38,8 +38,7 @@ color: inherit; text-align: center; border-top: 0.0625rem solid #e3e5ed; - padding: 0.75rem 1rem; - margin-top: 0.75rem; } + padding: 0.75rem 1rem; } .rainbow-card_header-link { font-size: inherit; diff --git a/src/components/Card/styles.scss b/src/components/Card/styles.scss index f17ebccac..d5153363f 100644 --- a/src/components/Card/styles.scss +++ b/src/components/Card/styles.scss @@ -61,7 +61,6 @@ text-align: center; border-top: 0.0625rem solid $color-gray-2; padding: $padding-small $padding-medium; - margin-top: $margin-small; } .rainbow-card_header-link { diff --git a/src/components/Pagination/__test__/pageButtons.spec.js b/src/components/Pagination/__test__/pageButtons.spec.js index 32bb2f9c5..0c3845b3d 100644 --- a/src/components/Pagination/__test__/pageButtons.spec.js +++ b/src/components/Pagination/__test__/pageButtons.spec.js @@ -16,7 +16,7 @@ describe('', () => { it('should set the right className to the active page button', () => { const component = mount( {}} activePage={3} />); const pageButtons = component.find('li.rainbow-pagination_button'); - expect(pageButtons.get(2).props.className).toBe('rainbow-pagination_button rainbow-pagination_button--active'); + expect(pageButtons.get(2).props.className).toBe('rainbow-pagination_button'); }); it('should set aria-current to "page" to the active anchor element', () => { const component = mount( {}} activePage={3} />); diff --git a/src/components/Pagination/index.js b/src/components/Pagination/index.js index d78254565..cb99899ff 100644 --- a/src/components/Pagination/index.js +++ b/src/components/Pagination/index.js @@ -1,6 +1,5 @@ import React from 'react'; import PropTypes from 'prop-types'; -import classnames from 'classnames'; import LeftArrow from './leftArrow'; import RightArrow from './rightArrow'; import NavigationButton from './navigationButton'; @@ -10,25 +9,27 @@ import './styles.css'; export default function Pagination(props) { const { pages, activePage, onChange, className, style } = props; - const getContainerClassNames = () => classnames('rainbow-pagination', className); - const isFirstItemSelected = activePage === 1; const isLastItemSelected = activePage === pages; return ( -