Skip to content

GitLab

G
Genesys Website
Commit 8321c1aa authored by Viacheslav Pavlov's avatar Viacheslav Pavlov
Browse files
Options

several material ui fixes

parent 6fa45134
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 184 deletions
package-lock.json
View file @ 8321c1aa
......@@ -2574,12 +2574,6 @@
}
}
},
"brcast": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/brcast/-/brcast-3.0.1.tgz",
"integrity": "sha512-eI3yqf9YEqyGl9PCNTR46MGvDylGtaHjalcz6Q3fAPnP/PhpKkkve52vFdfGpwp4VUvK6LUr4TQN+2stCrEwTg==",
"dev": true
},
"brorand": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
......@@ -3035,6 +3029,11 @@
"supports-color": "^2.0.0"
}
},
"change-emitter": {
"version": "0.1.6",
"resolved": "https://registry.npmjs.org/change-emitter/-/change-emitter-0.1.6.tgz",
"integrity": "sha1-6LL+PX8at9aaMhma/5HqaTFAlRU="
},
"character-entities": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.1.tgz",
......@@ -4286,15 +4285,6 @@
"integrity": "sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY=",
"dev": true
},
"css-vendor": {
"version": "0.3.8",
"resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-0.3.8.tgz",
"integrity": "sha1-ZCHP0wNM5mT+dnOXL9ARn8KJQfo=",
"dev": true,
"requires": {
"is-in-browser": "^1.0.2"
}
},
"css-what": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz",
......@@ -7329,12 +7319,6 @@
"integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
"dev": true
},
"hyphenate-style-name": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz",
"integrity": "sha1-MRYKNpMK2vH8BMYHT360FGXU7Es=",
"dev": true
},
"i18next": {
"version": "17.0.18",
"resolved": "https://registry.npmjs.org/i18next/-/i18next-17.0.18.tgz",
......@@ -7746,7 +7730,6 @@
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
"integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
"dev": true,
"requires": {
"loose-envify": "^1.0.0"
}
......@@ -8371,79 +8354,6 @@
"verror": "1.10.0"
}
},
"jss": {
"version": "9.8.7",
"resolved": "https://registry.npmjs.org/jss/-/jss-9.8.7.tgz",
"integrity": "sha512-awj3XRZYxbrmmrx9LUSj5pXSUfm12m8xzi/VKeqI1ZwWBtQ0kVPTs3vYs32t4rFw83CgFDukA8wKzOE9sMQnoQ==",
"dev": true,
"requires": {
"is-in-browser": "^1.1.3",
"symbol-observable": "^1.1.0",
"warning": "^3.0.0"
},
"dependencies": {
"symbol-observable": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
"integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
"dev": true
}
}
},
"jss-camel-case": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/jss-camel-case/-/jss-camel-case-6.1.0.tgz",
"integrity": "sha512-HPF2Q7wmNW1t79mCqSeU2vdd/vFFGpkazwvfHMOhPlMgXrJDzdj9viA2SaHk9ZbD5pfL63a8ylp4++irYbbzMQ==",
"dev": true,
"requires": {
"hyphenate-style-name": "^1.0.2"
}
},
"jss-compose": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/jss-compose/-/jss-compose-5.0.0.tgz",
"integrity": "sha512-YofRYuiA0+VbeOw0VjgkyO380sA4+TWDrW52nSluD9n+1FWOlDzNbgpZ/Sb3Y46+DcAbOS21W5jo6SAqUEiuwA==",
"dev": true,
"requires": {
"warning": "^3.0.0"
}
},
"jss-default-unit": {
"version": "8.0.2",
"resolved": "https://registry.npmjs.org/jss-default-unit/-/jss-default-unit-8.0.2.tgz",
"integrity": "sha512-WxNHrF/18CdoAGw2H0FqOEvJdREXVXLazn7PQYU7V6/BWkCV0GkmWsppNiExdw8dP4TU1ma1dT9zBNJ95feLmg==",
"dev": true
},
"jss-expand": {
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/jss-expand/-/jss-expand-5.3.0.tgz",
"integrity": "sha512-NiM4TbDVE0ykXSAw6dfFmB1LIqXP/jdd0ZMnlvlGgEMkMt+weJIl8Ynq1DsuBY9WwkNyzWktdqcEW2VN0RAtQg==",
"dev": true
},
"jss-extend": {
"version": "6.2.0",
"resolved": "https://registry.npmjs.org/jss-extend/-/jss-extend-6.2.0.tgz",
"integrity": "sha512-YszrmcB6o9HOsKPszK7NeDBNNjVyiW864jfoiHoMlgMIg2qlxKw70axZHqgczXHDcoyi/0/ikP1XaHDPRvYtEA==",
"dev": true,
"requires": {
"warning": "^3.0.0"
}
},
"jss-global": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/jss-global/-/jss-global-3.0.0.tgz",
"integrity": "sha512-wxYn7vL+TImyQYGAfdplg7yaxnPQ9RaXY/cIA8hawaVnmmWxDHzBK32u1y+RAvWboa3lW83ya3nVZ/C+jyjZ5Q==",
"dev": true
},
"jss-nested": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/jss-nested/-/jss-nested-6.0.1.tgz",
"integrity": "sha512-rn964TralHOZxoyEgeq3hXY8hyuCElnvQoVrQwKHVmu55VRDd6IqExAx9be5HgK0yN/+hQdgAXQl/GUrBbbSTA==",
"dev": true,
"requires": {
"warning": "^3.0.0"
}
},
"jss-plugin-camel-case": {
"version": "10.0.0",
"resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.0.0.tgz",
......@@ -8747,40 +8657,13 @@
"integrity": "sha512-GgIeSf+0SrR84azME+1fsrmcxvFX8iHqPCqXM8F5Rmg4OwCmGTAVIVPRhdDi3hawqGG47pNd6UkvK0kYb76KpQ==",
"dev": true,
"requires": {
"jss-camel-case": "^6.1.0",
"jss-compose": "^5.0.0",
"jss-default-unit": "^8.0.2",
"jss-expand": "^5.3.0",
"jss-extend": "^6.2.0",
"jss-global": "^3.0.0",
"jss-nested": "^6.0.1",
"jss-props-sort": "^6.0.0",
"jss-template": "^1.0.1",
"jss-vendor-prefixer": "^7.0.0"
}
},
"jss-props-sort": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/jss-props-sort/-/jss-props-sort-6.0.0.tgz",
"integrity": "sha512-E89UDcrphmI0LzmvYk25Hp4aE5ZBsXqMWlkFXS0EtPkunJkRr+WXdCNYbXbksIPnKlBenGB9OxzQY+mVc70S+g==",
"dev": true
},
"jss-template": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/jss-template/-/jss-template-1.0.1.tgz",
"integrity": "sha512-m5BqEWha17fmIVXm1z8xbJhY6GFJxNB9H68GVnCWPyGYfxiAgY9WTQyvDAVj+pYRgrXSOfN5V1T4+SzN1sJTeg==",
"dev": true,
"requires": {
"warning": "^3.0.0"
}
},
"jss-vendor-prefixer": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/jss-vendor-prefixer/-/jss-vendor-prefixer-7.0.0.tgz",
"integrity": "sha512-Agd+FKmvsI0HLcYXkvy8GYOw3AAASBUpsmIRvVQheps+JWaN892uFOInTr0DRydwaD91vSSUCU4NssschvF7MA==",
"dev": true,
"requires": {
"css-vendor": "^0.3.8"
"jss-plugin-camel-case": "10.0.0",
"jss-plugin-default-unit": "10.0.0",
"jss-plugin-global": "10.0.0",
"jss-plugin-nested": "10.0.0",
"jss-plugin-props-sort": "10.0.0",
"jss-plugin-rule-value-function": "10.0.0",
"jss-plugin-vendor-prefixer": "10.0.0"
}
},
"jwa": {
......@@ -8940,6 +8823,11 @@
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
},
"lodash-es": {
"version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz",
"integrity": "sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ=="
},
"lodash._reinterpolate": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
......@@ -15467,39 +15355,6 @@
"scheduler": "^0.16.2"
}
},
"react-event-listener": {
"version": "0.6.6",
"resolved": "https://registry.npmjs.org/react-event-listener/-/react-event-listener-0.6.6.tgz",
"integrity": "sha512-+hCNqfy7o9wvO6UgjqFmBzARJS7qrNoda0VqzvOuioEpoEXKutiKuv92dSz6kP7rYLmyHPyYNLesi5t/aH1gfw==",
"requires": {
"@babel/runtime": "^7.2.0",
"prop-types": "^15.6.0",
"warning": "^4.0.1"
},
"dependencies": {
"@babel/runtime": {
"version": "7.6.2",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.6.2.tgz",
"integrity": "sha512-EXxN64agfUqqIGeEjI5dL5z0Sw0ZwWo1mLTi4mQowCZ42O59b7DRpZAnTC6OqdF28wMBMFKNb/4uFGrVaigSpg==",
"requires": {
"regenerator-runtime": "^0.13.2"
}
},
"regenerator-runtime": {
"version": "0.13.3",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
"integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="
},
"warning": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
"integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
"requires": {
"loose-envify": "^1.0.0"
}
}
}
},
"react-fontawesome": {
"version": "1.6.1",
"resolved": "https://registry.npmjs.org/react-fontawesome/-/react-fontawesome-1.6.1.tgz",
......@@ -16072,6 +15927,26 @@
"integrity": "sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw==",
"dev": true
},
"recompose": {
"version": "0.30.0",
"resolved": "https://registry.npmjs.org/recompose/-/recompose-0.30.0.tgz",
"integrity": "sha512-ZTrzzUDa9AqUIhRk4KmVFihH0rapdCSMFXjhHbNrjAWxBuUD/guYlyysMnuHjlZC/KRiOKRtB4jf96yYSkKE8w==",
"requires": {
"@babel/runtime": "^7.0.0",
"change-emitter": "^0.1.2",
"fbjs": "^0.8.1",
"hoist-non-react-statics": "^2.3.1",
"react-lifecycles-compat": "^3.0.2",
"symbol-observable": "^1.0.4"
},
"dependencies": {
"hoist-non-react-statics": {
"version": "2.5.5",
"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
"integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
}
}
},
"redent": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
......@@ -18695,6 +18570,11 @@
}
}
},
"symbol-observable": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
"integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
},
"table": {
"version": "5.4.6",
"resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
......
src/accessions/ui/c/BioClimateDisplay.tsx
View file @ 8321c1aa
......@@ -31,7 +31,10 @@ const styles = (theme) => ({
'& > div:first-of-type': {
display: 'none',
}
}
},
descriptionSection: {
marginTop: '1em',
},
/*tslint:enable*/
});
......@@ -58,14 +61,14 @@ const BioClimateDisplay = ({climateData, t, extraFilters, applyClimateFilters, i
</div>
</PageSection>
<PageSection title={ t('accessions.public.p.display.additionalInfo') }>
<Properties spacing={ 8 }>
<Properties spacing={ 2 }>
{ [...Array(19).keys()].map((i) => (
<PropertiesItem md numeric key={ `month-${i}` } title={ t(`accessions.climate.bio${i + 1}`) } className="pt-0 pb-0">
{ climateData[`bio${i + 1}`] && Number(climateData[`bio${i + 1}`]).toFixed(1) }
</PropertiesItem>
)) }
</Properties>
<div style={ { marginTop: '1em' } }>
<div className={ classes.descriptionSection }>
<h4>{ t('accessions.public.p.display.climateSimilar.title') }</h4>
<p>{ t('accessions.public.p.display.climateSimilar.intro') }</p>
<ActionButton action={ doFilters } title={ t('accessions.public.p.display.climateSimilar.view') } />
......
src/crop/ui/c/CropChips.tsx
View file @ 8321c1aa
......@@ -20,10 +20,10 @@ const styles = (theme) => ({
chip: {
display: 'inline-block',
'html[dir="ltr"] &' : {
marginRight: theme.spacing.unit,
marginRight: theme.spacing(1),
},
'html[dir="rtl"] &' : {
marginLeft: theme.spacing.unit,
marginLeft: theme.spacing(1),
},
padding: '.2em .5em',
position: 'relative' as 'relative',
......
src/subsets/ui/dashboard/c/CreateSubsetButton.tsx
View file @ 8321c1aa
......@@ -15,8 +15,8 @@ import navigateTo from 'actions/navigation';
const styles = (theme) => ({
speedDial: {
position: 'fixed' as 'fixed',
bottom: theme.spacing.unit * 2,
right: theme.spacing.unit * 3,
bottom: theme.spacing(2),
right: theme.spacing(3),
},
tooltipText: {
fontSize: '18px',
......
src/ui/catalog/dashboard/c/DashboardActionsButton.tsx
View file @ 8321c1aa
......@@ -26,12 +26,12 @@ const styles = (theme) => ({
/* tslint:disable */
speedDial: {
position: 'fixed' as 'fixed',
bottom: theme.spacing.unit * 2,
bottom: theme.spacing(2),
'html[dir="ltr"] &' : {
right: theme.spacing.unit * 3,
right: theme.spacing(3),
},
'html[dir="rtl"] &' : {
left: theme.spacing.unit * 3,
left: theme.spacing(3),
},
},
tooltipText: {
......
src/ui/common/buttons/CreateNewButton.tsx
View file @ 8321c1aa
......@@ -18,12 +18,12 @@ const styles = (theme) => ({
/*tslint:disable*/
speedDial: {
position: 'fixed' as 'fixed',
bottom: theme.spacing.unit * 2,
bottom: theme.spacing(2),
'html[dir="ltr"] &' : {
right: theme.spacing.unit * 3,
right: theme.spacing(3),
},
'html[dir="rtl"] &' : {
left: theme.spacing.unit * 3,
left: theme.spacing(3),
},
},
tooltipText: {
......
src/ui/common/filter/PrettyFilters.tsx
View file @ 8321c1aa
......@@ -72,7 +72,7 @@ const styles = (theme) => ({
},
},
chip: {
margin: theme.spacing.unit / 2,
margin: theme.spacing(1/2),
'& > span:first-child': {
maxWidth: '18vh',
display: 'inline-block' as 'inline-block',
......@@ -91,7 +91,7 @@ const styles = (theme) => ({
flexGrow: 2,
display: 'flex',
flexWrap: 'wrap' as 'wrap',
padding: theme.spacing.unit / 2,
padding: theme.spacing(1/2),
},
chipAreaWithPagination: {
[theme.breakpoints.down('sm')]: {
......@@ -333,7 +333,7 @@ class PrettyFilters extends React.Component<IPrettyFiltersProps, any> {
const isMobile = mobile.indexOf(width) !== -1;
return (dataArr.length > 0 || withAmount) ? (
<Paper square className={ classes.root }>
<Paper elevation={ 2 } square className={ classes.root }>
<Collapse
in={ expanded }
timeout="auto"
......
src/ui/common/material-autosuggest/index.tsx
View file @ 8321c1aa
......@@ -16,8 +16,8 @@ const styles = (theme) => ({
},
suggestionsContainerOpen: {
position: 'absolute',
marginTop: theme.spacing.unit,
marginBottom: theme.spacing.unit * 3,
marginTop: theme.spacing(1),
marginBottom: theme.spacing(3),
left: 0,
right: 0,
zIndex: 1,
......
src/ui/layout/sidebar/SidebarWrapper.tsx
View file @ 8321c1aa
......@@ -106,12 +106,12 @@ const styles = (theme) => ({
duration: theme.transitions.duration.leavingScreen,
}),
cursor: 'e-resize',
minWidth: theme.spacing.unit * 3,
minWidth: theme.spacing(3),
'html[dir="rtl"] &' : {
minWidth: theme.spacing.unit * 3,
minWidth: theme.spacing(3),
},
[theme.breakpoints.up('sm')]: {
maxWidth: theme.spacing.unit * 9,
maxWidth: theme.spacing(9),
},
[theme.breakpoints.up('md')]: {
height: '100%',
......
src/ui/theme.ts
View file @ 8321c1aa
......@@ -38,6 +38,9 @@ const theme = (dir) => createMuiTheme({
fontWeight: 600,
fontSize: '24px',
},
a: {
color: '#006db4',
},
},
MuiCheckbox: {
colorSecondary: {
......@@ -72,6 +75,8 @@ const theme = (dir) => createMuiTheme({
},
MuiFormLabel: {
root: {
fontSize: '1em',
color: 'rgba(0, 0, 0, 0.54);',
'html[dir="rtl"] &': {
// position: 'relative',
right: 0,
......@@ -267,7 +272,6 @@ const theme = (dir) => createMuiTheme({
typography: {
// https://material-ui.com/style/typography/#migration-to-typography-v2
// Switch to V2
useNextVariants: true,
fontFamily: HEADING_FONT_FAMILY,
fontSize: 14,
fontWeightLight: 300,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment