Skip to content

Commit

Permalink
Merge pull request #148 from reactioncommerce/fix-147-mikemurray
Browse files Browse the repository at this point in the history
fix: Various component fixes
  • Loading branch information
willopez authored Feb 6, 2020
2 parents f220a04 + 84bb6b2 commit 51f42e6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 32 deletions.
8 changes: 3 additions & 5 deletions package/src/components/TextField/TextField.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const useInputStyles = makeStyles((theme) => ({
},
input: {
backgroundColor: theme.palette.colors.black02,
padding: "11.5px 6px",
padding: "11.5px 8px",
...theme.typography.body2
}
}));
Expand Down Expand Up @@ -116,9 +116,7 @@ const TextField = React.forwardRef(function TextField(props, ref) {
}}
InputProps={{
classes: inputClasses,
disableUnderline: true,
notched: false,
dense: true
notched: false
}}
InputLabelProps={{
shrink: true,
Expand Down Expand Up @@ -177,7 +175,7 @@ TextField.propTypes = {
/**
* If `true`, the label will be displayed in an error state.
*/
classes: PropTypes.object.isRequired,
classes: PropTypes.object,
/**
* Props applied to the [`FormHelperText`](/api/form-helper-text/) element.
*/
Expand Down
2 changes: 1 addition & 1 deletion package/src/theme/defaultTheme.js
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ export const rawMuiTheme = {
borderBottom: "none"
},
sizeSmall: {
"padding": "4x 16px 4px 16px",
"padding": "4px 16px 4px 16px",
"&:last-child": {
paddingRight: 16
},
Expand Down
26 changes: 0 additions & 26 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8805,7 +8805,6 @@ npm@^6.8.0:
cmd-shim "^3.0.3"
columnify "~1.5.4"
config-chain "^1.1.12"
debuglog "*"
detect-indent "~5.0.0"
detect-newline "^2.1.0"
dezalgo "~1.0.3"
Expand All @@ -8820,7 +8819,6 @@ npm@^6.8.0:
has-unicode "~2.0.1"
hosted-git-info "^2.8.5"
iferr "^1.0.2"
imurmurhash "*"
infer-owner "^1.0.4"
inflight "~1.0.6"
inherits "^2.0.4"
Expand All @@ -8839,14 +8837,8 @@ npm@^6.8.0:
libnpx "^10.2.0"
lock-verify "^2.1.0"
lockfile "^1.0.4"
lodash._baseindexof "*"
lodash._baseuniq "~4.6.0"
lodash._bindcallback "*"
lodash._cacheindexof "*"
lodash._createcache "*"
lodash._getnative "*"
lodash.clonedeep "~4.5.0"
lodash.restparam "*"
lodash.union "~4.6.0"
lodash.uniq "~4.5.0"
lodash.without "~4.4.0"
Expand Down Expand Up @@ -13350,24 +13342,6 @@ yargs@^3.19.0:
window-size "^0.1.4"
y18n "^3.2.0"

yargs@^6.6.0:
version "6.6.0"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
dependencies:
camelcase "^3.0.0"
cliui "^3.2.0"
decamelize "^1.1.1"
get-caller-file "^1.0.1"
os-locale "^1.4.0"
read-pkg-up "^1.0.1"
require-directory "^2.1.1"
require-main-filename "^1.0.1"
set-blocking "^2.0.0"
string-width "^1.0.2"
which-module "^1.0.0"
y18n "^3.2.1"
yargs-parser "^4.2.0"

yarn@~1.17.3:
version "1.17.3"
resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.17.3.tgz#60e0b77d079eb78e753bb616f7592b51b6a9adce"
Expand Down

0 comments on commit 51f42e6

Please sign in to comment.