diff --git a/.eslintrc.js b/.eslintrc.js index fbbf2ac8395a85..1310d353f50149 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -39,6 +39,7 @@ module.exports = { // Airbnb use error 'no-param-reassign': 'off', 'no-prototype-builtins': 'off', + 'nonblock-statement-body-position': 'error', // Airbnb restricts isNaN and isFinite which are necessary for IE 11 // we have to be disciplined about the usage and ensure the Number type for its // arguments diff --git a/docs/pages/api/divider.md b/docs/pages/api/divider.md index d351e37865c7b4..71d46c4a76be24 100644 --- a/docs/pages/api/divider.md +++ b/docs/pages/api/divider.md @@ -27,7 +27,7 @@ You can learn more about the difference by [reading this guide](/guides/minimizi | absolute | bool | false | Absolutely position the element. | | classes | object | | Override or extend the styles applied to the component. See [CSS API](#css) below for more details. | | component | elementType | 'hr' | The component used for the root node. Either a string to use a DOM element or a component. | -| flexItem | bool | false | If `true`, the divider will apply adapt to a parent flex container. | +| flexItem | bool | false | If `true`, the divider will adapt to a parent flex container. | | light | bool | false | If `true`, the divider will have a lighter color. | | orientation | 'horizontal'
| 'vertical' | 'horizontal' | The divider orientation. | | variant | 'fullWidth'
| 'inset'
| 'middle' | 'fullWidth' | The variant to use. | diff --git a/docs/src/modules/components/HomeUsers.js b/docs/src/modules/components/HomeUsers.js index 65d9aaf1c02c67..4663ff2af4353a 100644 --- a/docs/src/modules/components/HomeUsers.js +++ b/docs/src/modules/components/HomeUsers.js @@ -19,8 +19,8 @@ const users = [ }, { logo: 'walmart-labs.svg', - logoWidth: 274, - logoHeight: 52, + logoWidth: 205, + logoHeight: 39, caption: 'Walmart Labs', class: 'walmart', }, @@ -112,7 +112,7 @@ const styles = theme => ({ margin: theme.spacing(0.5, 3, 1.5), }, walmart: { - margin: theme.spacing(0.9, 3, 1.5), + margin: '13px 4px 12px', }, button: { margin: theme.spacing(2, 0, 0), diff --git a/docs/src/pages/components/dividers/dividers.md b/docs/src/pages/components/dividers/dividers.md index 84a6f6d8ea558c..f8e3aae3c35716 100644 --- a/docs/src/pages/components/dividers/dividers.md +++ b/docs/src/pages/components/dividers/dividers.md @@ -36,6 +36,6 @@ The examples below show two ways of achieving this. ## Vertical Dividers You can also render a divider vertically using the `orientation` prop. -Note the usage of the `flexItem` prop to accommodate for the flex container. +Note the use of the `flexItem` prop to accommodate for the flex container. {{"demo": "pages/components/dividers/VerticalDividers.js", "bg": true}} diff --git a/docs/src/pages/discover-more/showcase/appList.js b/docs/src/pages/discover-more/showcase/appList.js index 0b273f4f3803a8..ce890372fba876 100644 --- a/docs/src/pages/discover-more/showcase/appList.js +++ b/docs/src/pages/discover-more/showcase/appList.js @@ -19,7 +19,7 @@ const appList = [ 'design to simplify the rental of residential real estate.', image: 'quintoandar.png', link: 'https://www.quintoandar.com.br/', - similarWebVisits: 3000, + similarWebVisits: 6000, dateAdded: '2019-05-08', }, { @@ -29,7 +29,7 @@ const appList = [ 'Skyrim, Wolfenstein, The Elder Scrolls, more. Your source for news, features & community.', image: 'bethesda.jpg', link: 'https://bethesda.net/', - similarWebVisits: 18600, + similarWebVisits: 4000, dateAdded: '2019-01-01', }, { @@ -39,7 +39,7 @@ const appList = [ 'education-to-employment programs and career coaching services for students worldwide. ', image: 'openclassrooms.jpg', link: 'https://openclassrooms.com/en/', - similarWebVisits: 10190, + similarWebVisits: 6000, dateAdded: '2018-01-34', }, { @@ -51,7 +51,7 @@ const appList = [ 'idraulica… Ritira in negozio o ricevi comodamente a casa. 🇮🇹', image: 'leroymerlin.jpg', link: 'https://www.leroymerlin.it/', - similarWebVisits: 4400, + similarWebVisits: 5700, dateAdded: '2019-01-01', }, { @@ -62,7 +62,7 @@ const appList = [ 'and read programming tutorials from our community of developers.', image: 'codementor.jpg', link: 'https://www.codementor.io/', - similarWebVisits: 2980, + similarWebVisits: 1500, dateAdded: '2018-01-34', }, { @@ -70,7 +70,7 @@ const appList = [ description: 'Japan Music Network. 🇯🇵', image: 'barks.jpg', link: 'https://www.barks.jp/', - similarWebVisits: 2700, + similarWebVisits: 3000, dateAdded: '2019-01-01', }, { @@ -90,7 +90,7 @@ const appList = [ 'magazines and real time streams, personalized for you. 🇫🇷', image: 'sfrpresse.jpg', link: 'https://sfrpresse.sfr.fr/', - similarWebVisits: 710, + similarWebVisits: 800, dateAdded: '2018-01-25', }, { @@ -111,7 +111,7 @@ const appList = [ 'Join the global community of readers and writers!', image: 'sweek.jpg', link: 'https://sweek.com/', - similarWebVisits: 383, + similarWebVisits: 200, dateAdded: '2019-01-01', }, { @@ -137,7 +137,7 @@ const appList = [ description: 'NEO blockchain explorer and wallet.', image: 'neotracker.jpg', link: 'https://neotracker.io/', - similarWebVisits: 350, + similarWebVisits: 30, dateAdded: '2019-01-01', }, { @@ -156,7 +156,7 @@ const appList = [ 'online. The marketing website is also built with Material-UI: https://www.housecallpro.com/', image: 'housecall.jpg', link: 'https://pro.housecall.io/pro/log_in', - similarWebVisits: 214, + similarWebVisits: 750, dateAdded: '2019-01-01', }, { @@ -166,7 +166,7 @@ const appList = [ 'de forma direta e segura no Brasil. 🇧🇷', image: 'bitcambio.jpg', link: 'https://bitcambio.com.br/', - similarWebVisits: 148, + similarWebVisits: 50, dateAdded: '2019-01-01', }, { @@ -209,7 +209,7 @@ const appList = [ 'with more than 200K advertising options, and more than 1M satisfied customers.', image: 'themediaant.jpg', link: 'https://www.themediaant.com/', - similarWebVisits: 112, + similarWebVisits: 90, dateAdded: '2019-01-01', }, { @@ -458,16 +458,6 @@ const appList = [ link: 'https://slidesup.com/', dateAdded: '2018-01-03', }, - { - title: 'Trafikito', - description: - 'Free servers monitoring solution which can track any output of any command and do ' + - 'automated action. By default it tracks average load, CPU, HDD, RAM and sends email when ' + - 'something is going wrong.', - image: 'trafikito-monitoring.jpg', - link: 'https://trafikito.com/', - dateAdded: '2018-01-20', - }, { title: 'Hokan', description: @@ -539,13 +529,6 @@ const appList = [ link: 'https://www.planalyze.io/', dateAdded: '2018-01-10', }, - { - title: 'PhotoUtils', - description: 'Online photo editor. 6 simple and free image editing tools.', - image: 'photoutils.jpg', - link: 'https://photoutils.com/', - dateAdded: '2018-01-32', - }, { title: 'npm registry browser', description: @@ -579,13 +562,6 @@ const appList = [ stars: 24, dateAdded: '2018-01-35', }, - { - title: 'Persona', - description: 'Zero knowledge digital identity management system built on blockchain.', - link: 'https://persona.im/', - image: 'persona.jpg', - dateAdded: '2019-01-27', - }, { title: 'MQTT Explorer', description: @@ -598,16 +574,6 @@ const appList = [ stars: 510, dateAdded: '2019-03-25', }, - { - title: 'Learnseeker', - description: - 'A data driven 1-1 tuition matching platform. ' + - 'Incubated at the National University of Singapore. ' + - "It's based on one of our premium theme.", - link: 'https://learnseeker.sg/', - image: 'learnseeker.jpg', - dateAdded: '2019-03-26', - }, { title: 'TagSpaces', description: @@ -631,7 +597,7 @@ const appList = [ description: 'NBA trade machine and social analysis tools for the basketball community.', image: 'tradenba.jpg', link: 'https://tradenba.com/', - similarWebVisits: 145, + similarWebVisits: 160, dateAdded: '2020-01-20', }, { diff --git a/docs/static/images/showcase/learnseeker.jpg b/docs/static/images/showcase/learnseeker.jpg deleted file mode 100644 index 7b26bae1986db8..00000000000000 Binary files a/docs/static/images/showcase/learnseeker.jpg and /dev/null differ diff --git a/docs/static/images/showcase/persona.jpg b/docs/static/images/showcase/persona.jpg deleted file mode 100644 index 55b92697af7000..00000000000000 Binary files a/docs/static/images/showcase/persona.jpg and /dev/null differ diff --git a/docs/static/images/showcase/photoutils.jpg b/docs/static/images/showcase/photoutils.jpg deleted file mode 100644 index c1188c0a3a2559..00000000000000 Binary files a/docs/static/images/showcase/photoutils.jpg and /dev/null differ diff --git a/docs/static/images/showcase/trafikito-monitoring.jpg b/docs/static/images/showcase/trafikito-monitoring.jpg deleted file mode 100644 index 480d354a9c69b0..00000000000000 Binary files a/docs/static/images/showcase/trafikito-monitoring.jpg and /dev/null differ diff --git a/packages/material-ui-lab/src/Skeleton/Skeleton.js b/packages/material-ui-lab/src/Skeleton/Skeleton.js index bbadef73177756..e9dbc6f04023ae 100644 --- a/packages/material-ui-lab/src/Skeleton/Skeleton.js +++ b/packages/material-ui-lab/src/Skeleton/Skeleton.js @@ -49,7 +49,7 @@ export const styles = theme => ({ overflow: 'hidden', '&::after': { animation: '$wave 1.6s linear 0.5s infinite', - background: 'linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.6), transparent)', + background: 'linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.7), transparent)', content: '""', position: 'absolute', transform: 'translateX(-100%)', // Avoid flash during server-side hydration diff --git a/packages/material-ui/src/Divider/Divider.js b/packages/material-ui/src/Divider/Divider.js index 43fdb19561e431..e97b5086dd404e 100644 --- a/packages/material-ui/src/Divider/Divider.js +++ b/packages/material-ui/src/Divider/Divider.js @@ -99,7 +99,7 @@ Divider.propTypes = { */ component: PropTypes.elementType, /** - * If `true`, the divider will apply adapt to a parent flex container. + * If `true`, the divider will adapt to a parent flex container. */ flexItem: PropTypes.bool, /** diff --git a/packages/material-ui/src/Select/SelectInput.js b/packages/material-ui/src/Select/SelectInput.js index c4c230aa393e81..b58b259f0ac023 100644 --- a/packages/material-ui/src/Select/SelectInput.js +++ b/packages/material-ui/src/Select/SelectInput.js @@ -105,9 +105,10 @@ const SelectInput = React.forwardRef(function SelectInput(props, ref) { }; const handleMouseDown = event => { - if (event.button !== 0) - // ignore everything but left-click + // Ignore everything but left-click + if (event.button !== 0) { return; + } // Hijack the default focus behavior. event.preventDefault(); displayNode.focus();