Skip to content

Commit

Permalink
[core] Batch small changes (mui#19639)
Browse files Browse the repository at this point in the history
  • Loading branch information
oliviertassinari authored and EsoterikStare committed Feb 13, 2020
1 parent 58766d4 commit fdc947c
Show file tree
Hide file tree
Showing 12 changed files with 24 additions and 56 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/api/divider.md
Expand Up @@ -27,7 +27,7 @@ You can learn more about the difference by [reading this guide](/guides/minimizi
| <span class="prop-name">absolute</span> | <span class="prop-type">bool</span> | <span class="prop-default">false</span> | Absolutely position the element. |
| <span class="prop-name">classes</span> | <span class="prop-type">object</span> | | Override or extend the styles applied to the component. See [CSS API](#css) below for more details. |
| <span class="prop-name">component</span> | <span class="prop-type">elementType</span> | <span class="prop-default">'hr'</span> | The component used for the root node. Either a string to use a DOM element or a component. |
| <span class="prop-name">flexItem</span> | <span class="prop-type">bool</span> | <span class="prop-default">false</span> | If `true`, the divider will apply adapt to a parent flex container. |
| <span class="prop-name">flexItem</span> | <span class="prop-type">bool</span> | <span class="prop-default">false</span> | If `true`, the divider will adapt to a parent flex container. |
| <span class="prop-name">light</span> | <span class="prop-type">bool</span> | <span class="prop-default">false</span> | If `true`, the divider will have a lighter color. |
| <span class="prop-name">orientation</span> | <span class="prop-type">'horizontal'<br>&#124;&nbsp;'vertical'</span> | <span class="prop-default">'horizontal'</span> | The divider orientation. |
| <span class="prop-name">variant</span> | <span class="prop-type">'fullWidth'<br>&#124;&nbsp;'inset'<br>&#124;&nbsp;'middle'</span> | <span class="prop-default">'fullWidth'</span> | The variant to use. |
Expand Down
6 changes: 3 additions & 3 deletions docs/src/modules/components/HomeUsers.js
Expand Up @@ -19,8 +19,8 @@ const users = [
},
{
logo: 'walmart-labs.svg',
logoWidth: 274,
logoHeight: 52,
logoWidth: 205,
logoHeight: 39,
caption: 'Walmart Labs',
class: 'walmart',
},
Expand Down Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/components/dividers/dividers.md
Expand Up @@ -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}}
60 changes: 13 additions & 47 deletions docs/src/pages/discover-more/showcase/appList.js
Expand Up @@ -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',
},
{
Expand All @@ -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',
},
{
Expand All @@ -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',
},
{
Expand All @@ -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',
},
{
Expand All @@ -62,15 +62,15 @@ 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',
},
{
title: 'BARKS',
description: 'Japan Music Network. 🇯🇵',
image: 'barks.jpg',
link: 'https://www.barks.jp/',
similarWebVisits: 2700,
similarWebVisits: 3000,
dateAdded: '2019-01-01',
},
{
Expand All @@ -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',
},
{
Expand All @@ -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',
},
{
Expand All @@ -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',
},
{
Expand All @@ -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',
},
{
Expand All @@ -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',
},
{
Expand Down Expand Up @@ -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',
},
{
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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',
},
{
Expand Down
Binary file removed docs/static/images/showcase/learnseeker.jpg
Binary file not shown.
Binary file removed docs/static/images/showcase/persona.jpg
Binary file not shown.
Binary file removed docs/static/images/showcase/photoutils.jpg
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/material-ui-lab/src/Skeleton/Skeleton.js
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/material-ui/src/Divider/Divider.js
Expand Up @@ -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,
/**
Expand Down
5 changes: 3 additions & 2 deletions packages/material-ui/src/Select/SelectInput.js
Expand Up @@ -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();
Expand Down

0 comments on commit fdc947c

Please sign in to comment.